Changeset 23315 in vbox for trunk

Timestamp:

Sep 25, 2009 1:40:08 AM (15 years ago)

Author:

vboxsync

Message:

VBox/hgcmsvc.h,GuestProperties/service.cpp: gcc 4.0.1 warnings.

Location:

trunk

Files:

• include/VBox/hgcmsvc.h (modified) (1 diff)
• src/VBox/HostServices/GuestProperties/service.cpp (modified) (5 diffs)

trunk/include/VBox/hgcmsvc.h

@@ -202 +202 @@
         int rc = getBuffer((void **)&pch, &cb);
         if (RT_FAILURE(rc))
+        {
+            *ppch = NULL;
+            *pcb = 0;
             return rc;
+        }
         rc = RTStrValidateEncodingEx(pch, cb,
                                      RTSTR_VALIDATE_ENCODING_ZERO_TERMINATED);

trunk/src/VBox/HostServices/GuestProperties/service.cpp

@@ -509 +509 @@
 {
     int rc = VINF_SUCCESS;
-    const char *pcszName;
+    const char *pcszName = NULL;        /* shut up gcc */
     char *pchBuf;
     uint32_t cchName, cchBuf;
@@ -585 +585 @@
 {
     int rc = VINF_SUCCESS;
-    const char *pcszName, *pcszValue, *pcszFlags = NULL;
+    const char *pcszName = NULL;        /* shut up gcc */
+    const char *pcszValue = NULL;       /* ditto */
+    const char *pcszFlags = NULL;
     uint32_t cchName, cchValue, cchFlags = 0;
     uint32_t fFlags = NILFLAG;
@@ -687 +689 @@
 {
     int rc = VINF_SUCCESS;
-    const char *pcszName;
+    const char *pcszName = NULL;        /* shut up gcc */
     uint32_t cbName;
 
@@ -695 +697 @@
      * Check the user-supplied parameters.
      */
-    if (   (cParms != 1)  /* Hardcoded value as the next lines depend on it. */
-        || RT_FAILURE(paParms[0].getString(&pcszName, &cbName))  /* name */
+    if (   (cParms == 1)  /* Hardcoded value as the next lines depend on it. */
+        && RT_SUCCESS(paParms[0].getString(&pcszName, &cbName))  /* name */
        )
+        rc = validateName(pcszName, cbName);
+    else
         rc = VERR_INVALID_PARAMETER;
-    if (RT_SUCCESS(rc))
-        rc = validateName(pcszName, cbName);
 
     /*
@@ -901 +903 @@
 {
     int rc = VINF_SUCCESS;
-    char *pszPatterns, *pchBuf;
-    uint32_t cchPatterns = 0, cchBuf = 0;
+    char *pszPatterns = NULL;           /* shut up gcc */
+    char *pchBuf;
+    uint32_t cchPatterns = 0;
+    uint32_t cchBuf = 0;
     uint64_t u64Timestamp;