Changeset 62849 in vbox for trunk/src/VBox

Timestamp:

Aug 1, 2016 9:52:45 PM (8 years ago)

Author:

vboxsync

Message:

GAs/common: warnings

Location:

trunk/src/VBox/Additions/common/VBoxControl

Files:

• VBoxControl.cpp (modified) (53 diffs)
• testcase/tstVBoxControl.cpp (modified) (5 diffs)

trunk/src/VBox/Additions/common/VBoxControl/VBoxControl.cpp

@@ -241 +241 @@
 LONG (WINAPI * gpfnChangeDisplaySettingsEx)(LPCTSTR lpszDeviceName, LPDEVMODE lpDevMode, HWND hwnd, DWORD dwflags, LPVOID lParam);
 
-static unsigned nextAdjacentRectXP (RECTL *paRects, unsigned nRects, unsigned iRect)
-{
-    unsigned i;
-    for (i = 0; i < nRects; i++)
-    {
+static unsigned nextAdjacentRectXP(RECTL const *paRects, unsigned cRects, unsigned iRect)
+{
+    for (unsigned i = 0; i < cRects; i++)
         if (paRects[iRect].right == paRects[i].left)
-        {
             return i;
-        }
-    }
-    return ~0;
-}
-
-static unsigned nextAdjacentRectXN (RECTL *paRects, unsigned nRects, unsigned iRect)
-{
-    unsigned i;
-    for (i = 0; i < nRects; i++)
-    {
+    return ~0U;
+}
+
+static unsigned nextAdjacentRectXN(RECTL const *paRects, unsigned cRects, unsigned iRect)
+{
+    for (unsigned i = 0; i < cRects; i++)
         if (paRects[iRect].left == paRects[i].right)
-        {
             return i;
-        }
-    }
-    return ~0;
-}
-
-static unsigned nextAdjacentRectYP (RECTL *paRects, unsigned nRects, unsigned iRect)
-{
-    unsigned i;
-    for (i = 0; i < nRects; i++)
-    {
+    return ~0U;
+}
+
+static unsigned nextAdjacentRectYP(RECTL const *paRects, unsigned cRects, unsigned iRect)
+{
+    for (unsigned i = 0; i < cRects; i++)
         if (paRects[iRect].bottom == paRects[i].top)
-        {
             return i;
-        }
-    }
-    return ~0;
-}
-
-unsigned nextAdjacentRectYN (RECTL *paRects, unsigned nRects, unsigned iRect)
-{
-    unsigned i;
-    for (i = 0; i < nRects; i++)
-    {
+    return ~0U;
+}
+
+unsigned nextAdjacentRectYN(RECTL const *paRects, unsigned cRects, unsigned iRect)
+{
+    for (unsigned i = 0; i < cRects; i++)
         if (paRects[iRect].top == paRects[i].bottom)
-        {
             return i;
-        }
-    }
-    return ~0;
-}
-
-void resizeRect(RECTL *paRects, unsigned nRects, unsigned iPrimary, unsigned iResized, int NewWidth, int NewHeight)
-{
-    RECTL *paNewRects = (RECTL *)alloca (sizeof (RECTL) * nRects);
-    memcpy (paNewRects, paRects, sizeof (RECTL) * nRects);
-    paNewRects[iResized].right += NewWidth - (paNewRects[iResized].right - paNewRects[iResized].left);
+    return ~0U;
+}
+
+void resizeRect(RECTL *paRects, unsigned cRects, unsigned iPrimary, unsigned iResized, int NewWidth, int NewHeight)
+{
+    RECTL *paNewRects = (RECTL *)alloca(sizeof (RECTL) * cRects);
+    memcpy (paNewRects, paRects, sizeof(RECTL) * cRects);
+    paNewRects[iResized].right  += NewWidth - (paNewRects[iResized].right - paNewRects[iResized].left);
     paNewRects[iResized].bottom += NewHeight - (paNewRects[iResized].bottom - paNewRects[iResized].top);
 
@@ -308 +288 @@
     /* X positive. */
     unsigned iRect;
-    for (iRect = 0; iRect < nRects; iRect++)
+    for (iRect = 0; iRect < cRects; iRect++)
     {
         /* Find the next adjacent original rect in x positive direction. */
-        unsigned iNextRect = nextAdjacentRectXP (paRects, nRects, iRect);
+        unsigned iNextRect = nextAdjacentRectXP (paRects, cRects, iRect);
         Log(("next %d -> %d\n", iRect, iNextRect));
 
@@ -336 +316 @@
 
     /* X negative. */
-    for (iRect = 0; iRect < nRects; iRect++)
+    for (iRect = 0; iRect < cRects; iRect++)
     {
         /* Find the next adjacent original rect in x negative direction. */
-        unsigned iNextRect = nextAdjacentRectXN (paRects, nRects, iRect);
+        unsigned iNextRect = nextAdjacentRectXN (paRects, cRects, iRect);
         Log(("next %d -> %d\n", iRect, iNextRect));
 
@@ -364 +344 @@
 
     /* Y positive (in the computer sense, top->down). */
-    for (iRect = 0; iRect < nRects; iRect++)
+    for (iRect = 0; iRect < cRects; iRect++)
     {
         /* Find the next adjacent original rect in y positive direction. */
-        unsigned iNextRect = nextAdjacentRectYP (paRects, nRects, iRect);
+        unsigned iNextRect = nextAdjacentRectYP (paRects, cRects, iRect);
         Log(("next %d -> %d\n", iRect, iNextRect));
 
@@ -392 +372 @@
 
     /* Y negative (in the computer sense, down->top). */
-    for (iRect = 0; iRect < nRects; iRect++)
+    for (iRect = 0; iRect < cRects; iRect++)
     {
         /* Find the next adjacent original rect in x negative direction. */
-        unsigned iNextRect = nextAdjacentRectYN (paRects, nRects, iRect);
+        unsigned iNextRect = nextAdjacentRectYN (paRects, cRects, iRect);
         Log(("next %d -> %d\n", iRect, iNextRect));
 
@@ -419 +399 @@
     }
 
-    memcpy (paRects, paNewRects, sizeof (RECTL) * nRects);
+    memcpy (paRects, paNewRects, sizeof (RECTL) * cRects);
     return;
 }
@@ -429 +409 @@
 
     DISPLAY_DEVICE DisplayDevice;
-
-    ZeroMemory(&DisplayDevice, sizeof(DisplayDevice));
+    RT_ZERO(DisplayDevice);
     DisplayDevice.cb = sizeof(DisplayDevice);
 
@@ -436 +415 @@
     DWORD NumDevices = 0;
     DWORD i = 0;
-    while (EnumDisplayDevices (NULL, i, &DisplayDevice, 0))
+    while (EnumDisplayDevices(NULL, i, &DisplayDevice, 0))
     {
         Log(("[%d] %s\n", i, DisplayDevice.DeviceName));
@@ -442 +421 @@
         if (DisplayDevice.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE)
         {
-            Log(("Found primary device. err %d\n", GetLastError ()));
+            Log(("Found primary device. err %d\n", GetLastError()));
             NumDevices++;
         }
@@ -448 +427 @@
         {
 
-            Log(("Found secondary device. err %d\n", GetLastError ()));
+            Log(("Found secondary device. err %d\n", GetLastError()));
             NumDevices++;
         }
 
-        ZeroMemory(&DisplayDevice, sizeof(DisplayDevice));
+        RT_ZERO(DisplayDevice);
         DisplayDevice.cb = sizeof(DisplayDevice);
         i++;
     }
 
-    Log(("Found total %d devices. err %d\n", NumDevices, GetLastError ()));
+    Log(("Found total %d devices. err %d\n", NumDevices, GetLastError()));
 
     if (NumDevices == 0 || Id >= NumDevices)
     {
-        Log(("Requested identifier %d is invalid. err %d\n", Id, GetLastError ()));
+        Log(("Requested identifier %d is invalid. err %d\n", Id, GetLastError()));
         return FALSE;
     }
 
-    DISPLAY_DEVICE *paDisplayDevices = (DISPLAY_DEVICE *)alloca (sizeof (DISPLAY_DEVICE) * NumDevices);
-    DEVMODE *paDeviceModes = (DEVMODE *)alloca (sizeof (DEVMODE) * NumDevices);
-    RECTL *paRects = (RECTL *)alloca (sizeof (RECTL) * NumDevices);
+    DISPLAY_DEVICE *paDisplayDevices = (DISPLAY_DEVICE *)alloca(sizeof (DISPLAY_DEVICE) * NumDevices);
+    DEVMODE *paDeviceModes = (DEVMODE *)alloca(sizeof (DEVMODE) * NumDevices);
+    RECTL *paRects = (RECTL *)alloca(sizeof (RECTL) * NumDevices);
 
     /* Fetch information about current devices and modes. */
@@ -473 +452 @@
     DWORD DevPrimaryNum = 0;
 
-    ZeroMemory(&DisplayDevice, sizeof(DISPLAY_DEVICE));
+    RT_ZERO(DisplayDevice);
     DisplayDevice.cb = sizeof(DISPLAY_DEVICE);
 
@@ -481 +460 @@
         Log(("[%d(%d)] %s\n", i, DevNum, DisplayDevice.DeviceName));
 
-        BOOL bFetchDevice = FALSE;
+        BOOL fFetchDevice = FALSE;
 
         if (DisplayDevice.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE)
         {
-            Log(("Found primary device. err %d\n", GetLastError ()));
+            Log(("Found primary device. err %d\n", GetLastError()));
             DevPrimaryNum = DevNum;
-            bFetchDevice = TRUE;
+            fFetchDevice = TRUE;
         }
         else if (!(DisplayDevice.StateFlags & DISPLAY_DEVICE_MIRRORING_DRIVER))
         {
 
-            Log(("Found secondary device. err %d\n", GetLastError ()));
-            bFetchDevice = TRUE;
-        }
-
-        if (bFetchDevice)
+            Log(("Found secondary device. err %d\n", GetLastError()));
+            fFetchDevice = TRUE;
+        }
+
+        if (fFetchDevice)
         {
             if (DevNum >= NumDevices)
@@ -506 +485 @@
             paDisplayDevices[DevNum] = DisplayDevice;
 
-            ZeroMemory(&paDeviceModes[DevNum], sizeof(DEVMODE));
+            RT_BZERO(&paDeviceModes[DevNum], sizeof(DEVMODE));
             paDeviceModes[DevNum].dmSize = sizeof(DEVMODE);
-            if (!EnumDisplaySettings((LPSTR)DisplayDevice.DeviceName,
-                 ENUM_REGISTRY_SETTINGS, &paDeviceModes[DevNum]))
+            if (!EnumDisplaySettings((LPSTR)DisplayDevice.DeviceName, ENUM_REGISTRY_SETTINGS, &paDeviceModes[DevNum]))
             {
-                Log(("EnumDisplaySettings err %d\n", GetLastError ()));
+                Log(("EnumDisplaySettings err %d\n", GetLastError()));
                 return FALSE;
             }
@@ -528 +506 @@
         }
 
-        ZeroMemory(&DisplayDevice, sizeof(DISPLAY_DEVICE));
+        RT_ZERO(DisplayDevice);
         DisplayDevice.cb = sizeof(DISPLAY_DEVICE);
         i++;
@@ -534 +512 @@
 
     if (Width == 0)
-    {
         Width = paRects[Id].right - paRects[Id].left;
-    }
 
     if (Height == 0)
-    {
         Height = paRects[Id].bottom - paRects[Id].top;
-    }
 
     /* Check whether a mode reset or a change is requested. */
     if (   !fModeReset
-        && paRects[Id].right - paRects[Id].left == Width
-        && paRects[Id].bottom - paRects[Id].top == Height
+        && paRects[Id].right - paRects[Id].left == (LONG)Width
+        && paRects[Id].bottom - paRects[Id].top == (LONG)Height
         && paDeviceModes[Id].dmBitsPerPel == BitsPerPixel)
     {
@@ -554 +528 @@
 
     resizeRect(paRects, NumDevices, DevPrimaryNum, Id, Width, Height);
-#ifdef Log
+#ifdef LOG_ENABLED
     for (i = 0; i < NumDevices; i++)
-    {
         Log(("[%d]: %d,%d %dx%d\n",
-                i, paRects[i].left, paRects[i].top,
-                paRects[i].right - paRects[i].left,
-                paRects[i].bottom - paRects[i].top));
-    }
+             i, paRects[i].left, paRects[i].top,
+             paRects[i].right - paRects[i].left,
+             paRects[i].bottom - paRects[i].top));
 #endif /* Log */
 
@@ -568 +540 @@
      */
     DEVMODE tempDevMode;
-    ZeroMemory (&tempDevMode, sizeof (tempDevMode));
+    RT_ZERO(tempDevMode);
     tempDevMode.dmSize = sizeof(DEVMODE);
     EnumDisplaySettings(NULL, 0xffffff, &tempDevMode);
@@ -591 +563 @@
         gpfnChangeDisplaySettingsEx((LPSTR)paDisplayDevices[i].DeviceName,
                  &paDeviceModes[i], NULL, CDS_NORESET | CDS_UPDATEREGISTRY, NULL);
-        Log(("ChangeDisplaySettings position err %d\n", GetLastError ()));
+        Log(("ChangeDisplaySettings position err %d\n", GetLastError()));
     }
 
@@ -619 +591 @@
     DWORD bpp  = atoi(argv[2]);
     DWORD scr  = 0;
-
     if (argc == 4)
-    {
         scr = atoi(argv[3]);
-    }
 
     HMODULE hUser = GetModuleHandle("user32.dll");
-
     if (hUser)
     {
@@ -635 +603 @@
         {
             /* The screen index is 0 based in the ResizeDisplayDevice call. */
-            scr = scr > 0? scr - 1: 0;
+            scr = scr > 0 ? scr - 1 : 0;
 
             /* Horizontal resolution must be a multiple of 8, round down. */
@@ -655 +623 @@
 static int checkVBoxVideoKey(HKEY hkeyVideo)
 {
-    char szValue[128];
-    DWORD len = sizeof(szValue);
-    DWORD dwKeyType;
-    LONG status = RegQueryValueExA(hkeyVideo, "Device Description", NULL, &dwKeyType,
-                                   (LPBYTE)szValue, &len);
-
+    RTUTF16 wszValue[128];
+    DWORD   cbValue = sizeof(wszValue);
+    DWORD   dwKeyType;
+    LONG status = RegQueryValueExW(hkeyVideo, L"Device Description", NULL, &dwKeyType, (LPBYTE)wszValue, &cbValue);
     if (status == ERROR_SUCCESS)
     {
         /* WDDM has additional chars after "Adapter" */
-        static char sszDeviceDescription[] = "VirtualBox Graphics Adapter";
-        if (_strnicmp(szValue, sszDeviceDescription, sizeof(sszDeviceDescription) - sizeof(char)) == 0)
-        {
+        static char s_szDeviceDescription[] = "VirtualBox Graphics Adapter";
+        wszValue[sizeof(s_szDeviceDescription) - 1] = '\0';
+        if (RTUtf16ICmpAscii(wszValue, s_szDeviceDescription) == 0)
             return VINF_SUCCESS;
-        }
     }
 
@@ -694 +659 @@
 
     /* Get the 'ObjectNumberList' */
-    ULONG numDevices = 0;
+    ULONG cDevices = 0;
     DWORD adwObjectNumberList[256];
-    DWORD len = sizeof(adwObjectNumberList);
-    status = RegQueryValueExA(hkeyDeviceMap, "ObjectNumberList", NULL, &dwKeyType, (LPBYTE)&adwObjectNumberList[0], &len);
+    DWORD cbValue = sizeof(adwObjectNumberList);
+    status = RegQueryValueExA(hkeyDeviceMap, "ObjectNumberList", NULL, &dwKeyType, (LPBYTE)&adwObjectNumberList[0], &cbValue);
 
     if (   status == ERROR_SUCCESS
         && dwKeyType == REG_BINARY)
-    {
-        numDevices = len / sizeof(DWORD);
-    }
+        cDevices = cbValue / sizeof(DWORD);
     else
     {
        /* The list might not exists. Use 'MaxObjectNumber' REG_DWORD and build a list. */
        DWORD dwMaxObjectNumber = 0;
-       len = sizeof(dwMaxObjectNumber);
-       status = RegQueryValueExA(hkeyDeviceMap, "MaxObjectNumber", NULL, &dwKeyType, (LPBYTE)&dwMaxObjectNumber, &len);
-
+       cbValue = sizeof(dwMaxObjectNumber);
+       status = RegQueryValueExA(hkeyDeviceMap, "MaxObjectNumber", NULL, &dwKeyType, (LPBYTE)&dwMaxObjectNumber, &cbValue);
        if (   status == ERROR_SUCCESS
            && dwKeyType == REG_DWORD)
        {
            /* 'MaxObjectNumber' is inclusive. */
-           numDevices = RT_MIN(dwMaxObjectNumber + 1, RT_ELEMENTS(adwObjectNumberList));
-           for (iDevice = 0; iDevice < numDevices; iDevice++)
-           {
+           cDevices = RT_MIN(dwMaxObjectNumber + 1, RT_ELEMENTS(adwObjectNumberList));
+           for (iDevice = 0; iDevice < cDevices; iDevice++)
                adwObjectNumberList[iDevice] = iDevice;
-           }
        }
     }
 
-    if (numDevices == 0)
+    if (cDevices == 0)
     {
         /* Always try '\Device\Video0' as the old code did. Enum can be used in this case in principle. */
         adwObjectNumberList[0] = 0;
-        numDevices = 1;
+        cDevices = 1;
     }
 
     /* Scan device entries */
-    for (iDevice = 0; iDevice < numDevices; iDevice++)
+    for (iDevice = 0; iDevice < cDevices; iDevice++)
     {
         char szValueName[64];
@@ -737 +697 @@
 
         char szVideoLocation[256];
-        len = sizeof(szVideoLocation);
-        status = RegQueryValueExA(hkeyDeviceMap, szValueName, NULL, &dwKeyType, (LPBYTE)&szVideoLocation[0], &len);
+        cbValue = sizeof(szVideoLocation);
+        status = RegQueryValueExA(hkeyDeviceMap, szValueName, NULL, &dwKeyType, (LPBYTE)&szVideoLocation[0], &cbValue);
 
         /* This value starts with '\REGISTRY\Machine' */
@@ -773 +733 @@
 static DECLCALLBACK(RTEXITCODE) handleGetVideoAcceleration(int argc, char *argv[])
 {
+    RT_NOREF2(argc, argv);
     ULONG status;
     HKEY hkeyVideo = getVideoKey(false);
@@ -780 +741 @@
         /* query the actual value */
         DWORD fAcceleration = 1;
-        DWORD len = sizeof(fAcceleration);
+        DWORD cbValue = sizeof(fAcceleration);
         DWORD dwKeyType;
-        status = RegQueryValueExA(hkeyVideo, "EnableVideoAccel", NULL, &dwKeyType, (LPBYTE)&fAcceleration, &len);
+        status = RegQueryValueExA(hkeyVideo, "EnableVideoAccel", NULL, &dwKeyType, (LPBYTE)&fAcceleration, &cbValue);
         if (status != ERROR_SUCCESS)
             RTPrintf("Video acceleration: default\n");
@@ -831 +792 @@
     {
         DWORD dwFlags = 0;
-        DWORD len = sizeof(dwFlags);
+        DWORD cbValue = sizeof(dwFlags);
         DWORD dwKeyType;
-        ULONG status = RegQueryValueExA(hkeyVideo, "VBoxVideoFlags", NULL, &dwKeyType, (LPBYTE)&dwFlags, &len);
+        ULONG status = RegQueryValueExA(hkeyVideo, "VBoxVideoFlags", NULL, &dwKeyType, (LPBYTE)&dwFlags, &cbValue);
         if (status != ERROR_SUCCESS)
             RTPrintf("Video flags: default\n");
@@ -883 +844 @@
     {
         DWORD dwFlags = 0;
-        DWORD len = sizeof(dwFlags);
+        DWORD cbValue = sizeof(dwFlags);
         DWORD dwKeyType;
-        ULONG status = RegQueryValueExA(hkeyVideo, "VBoxVideoFlags", NULL, &dwKeyType, (LPBYTE)&dwFlags, &len);
+        ULONG status = RegQueryValueExA(hkeyVideo, "VBoxVideoFlags", NULL, &dwKeyType, (LPBYTE)&dwFlags, &cbValue);
         if (status != ERROR_SUCCESS)
-        {
             dwFlags = 0;
-        }
-
-        dwFlags = fSet? (dwFlags | u32Mask):
-                        (dwFlags & ~u32Mask);
+
+        dwFlags = fSet ? dwFlags | u32Mask : dwFlags & ~u32Mask;
 
         status = RegSetValueExA(hkeyVideo, "VBoxVideoFlags", 0, REG_DWORD, (LPBYTE)&dwFlags, sizeof(dwFlags));
@@ -1064 +1022 @@
 static DECLCALLBACK(RTEXITCODE) handleListCustomModes(int argc, char *argv[])
 {
+    RT_NOREF1(argv);
     if (argc != 0)
     {
@@ -1202 +1161 @@
 
     bool fVerbose = false;
-    if (   2 == argc
+    if (   argc == 2
         && (   strcmp(argv[1], "-verbose")  == 0
             || strcmp(argv[1], "--verbose") == 0)
@@ -1237 +1196 @@
          * hope.  Actually this should never go wrong, as we are generous
          * enough with buffer space. */
-        bool finish = false;
-        for (unsigned i = 0; (i < 10) && !finish; ++i)
+        bool fFinished = false;
+        for (unsigned i = 0; i < 10 && !fFinished; ++i)
         {
             void *pvTmpBuf = RTMemRealloc(pvBuf, cbBuf);
@@ -1257 +1216 @@
                 cbBuf += 1024;
             else
-                finish = true;
+                fFinished = true;
         }
         if (VERR_TOO_MUCH_DATA == rc)
@@ -1300 +1259 @@
      * arguments.
      */
-    bool usageOK = true;
+    bool fUsageOK = true;
     const char *pszName = NULL;
     const char *pszValue = NULL;
@@ -1309 +1268 @@
     }
     else if (3 == argc)
-        usageOK = false;
+        fUsageOK = false;
     else if (4 == argc)
     {
@@ -1315 +1274 @@
         if (   strcmp(argv[2], "-flags") != 0
             && strcmp(argv[2], "--flags") != 0)
-            usageOK = false;
+            fUsageOK = false;
         pszFlags = argv[3];
     }
     else if (argc != 1)
-        usageOK = false;
-    if (!usageOK)
+        fUsageOK = false;
+    if (!fUsageOK)
     {
         usage(GUEST_PROP);
@@ -1365 +1324 @@
      * arguments.
      */
-    bool usageOK = true;
+    bool fUsageOK = true;
     const char *pszName = NULL;
     if (argc < 1)
-        usageOK = false;
-    if (!usageOK)
+        fUsageOK = false;
+    if (!fUsageOK)
     {
         usage(GUEST_PROP);
@@ -1481 +1440 @@
     uint64_t u64TimestampIn = 0;
     uint32_t u32Timeout = RT_INDEFINITE_WAIT;
-    bool usageOK = true;
+    bool fUsageOK = true;
     if (argc < 1)
-        usageOK = false;
+        fUsageOK = false;
     pszPatterns = argv[0];
-    for (int i = 1; usageOK && i < argc; ++i)
+    for (int i = 1; fUsageOK && i < argc; ++i)
     {
         if (   strcmp(argv[i], "-timeout")  == 0
@@ -1494 +1453 @@
                        != VINF_SUCCESS
                )
-                usageOK = false;
+                fUsageOK = false;
             else
                 ++i;
@@ -1505 +1464 @@
                        != VINF_SUCCESS
                )
-                usageOK = false;
+                fUsageOK = false;
             else
                 ++i;
         }
         else
-            usageOK = false;
-    }
-    if (!usageOK)
+            fUsageOK = false;
+    }
+    if (!fUsageOK)
     {
         usage(GUEST_PROP);
@@ -1543 +1502 @@
      * hope.  Actually this should never go wrong, as we are generous
      * enough with buffer space. */
-    bool finish = false;
-    for (unsigned i = 0;
-         (RT_SUCCESS(rc) || rc == VERR_BUFFER_OVERFLOW) && !finish && (i < 10);
-         ++i)
+    bool fFinished = false;
+    for (unsigned i = 0; (RT_SUCCESS(rc) || rc == VERR_BUFFER_OVERFLOW) && !fFinished && i < 10; i++)
     {
         void *pvTmpBuf = RTMemRealloc(pvBuf, cbBuf);
@@ -1566 +1523 @@
             cbBuf += 1024;
         else
-            finish = true;
+            fFinished = true;
         if (rc == VERR_TOO_MUCH_DATA)
             VBoxControlError("Temporarily unable to get a notification\n");
@@ -1608 +1565 @@
 static DECLCALLBACK(RTEXITCODE) handleGuestProperty(int argc, char *argv[])
 {
-    if (0 == argc)
+    if (argc == 0)
     {
         usage(GUEST_PROP);
@@ -1615 +1572 @@
     if (!strcmp(argv[0], "get"))
         return getGuestProperty(argc - 1, argv + 1);
-    else if (!strcmp(argv[0], "set"))
+    if (!strcmp(argv[0], "set"))
         return setGuestProperty(argc - 1, argv + 1);
-    else if (!strcmp(argv[0], "delete") || !strcmp(argv[0], "unset"))
+    if (!strcmp(argv[0], "delete") || !strcmp(argv[0], "unset"))
         return deleteGuestProperty(argc - 1, argv + 1);
-    else if (!strcmp(argv[0], "enumerate"))
+    if (!strcmp(argv[0], "enumerate"))
         return enumGuestProperty(argc - 1, argv + 1);
-    else if (!strcmp(argv[0], "wait"))
+    if (!strcmp(argv[0], "wait"))
         return waitGuestProperty(argc - 1, argv + 1);
-    /* else */
+    /* unknown cmd */
     usage(GUEST_PROP);
     return RTEXITCODE_FAILURE;
@@ -1635 +1592 @@
 static RTEXITCODE listSharedFolders(int argc, char **argv)
 {
-    bool usageOK = true;
+    bool fUsageOK = true;
     bool fOnlyShowAutoMount = false;
     if (argc == 1)
@@ -1643 +1600 @@
             fOnlyShowAutoMount = true;
         else
-            usageOK = false;
+            fUsageOK = false;
     }
     else if (argc > 1)
-        usageOK = false;
-
-    if (!usageOK)
+        fUsageOK = false;
+    if (!fUsageOK)
     {
         usage(GUEST_SHAREDFOLDERS);
@@ -1662 +1618 @@
         PVBGLR3SHAREDFOLDERMAPPING paMappings;
         uint32_t cMappings;
-        rc = VbglR3SharedFolderGetMappings(u32ClientId, fOnlyShowAutoMount,
-                                           &paMappings, &cMappings);
+        rc = VbglR3SharedFolderGetMappings(u32ClientId, fOnlyShowAutoMount, &paMappings, &cMappings);
         if (RT_SUCCESS(rc))
         {
@@ -1704 +1659 @@
 static DECLCALLBACK(RTEXITCODE) handleSharedFolder(int argc, char *argv[])
 {
-    if (0 == argc)
+    if (argc == 0)
     {
         usage(GUEST_SHAREDFOLDERS);
@@ -1723 +1678 @@
 static DECLCALLBACK(RTEXITCODE) handleWriteCoreDump(int argc, char *argv[])
 {
+    RT_NOREF2(argc, argv);
     int rc = VbglR3WriteCoreDump();
     if (RT_SUCCESS(rc))
@@ -1831 +1787 @@
 static DECLCALLBACK(RTEXITCODE) handleTakeSnapshot(int argc, char *argv[])
 {
-    //VbglR3VmTakeSnapshot(argv[0], argv[1]);
+    RT_NOREF2(argc, argv); //VbglR3VmTakeSnapshot(argv[0], argv[1]);
     return VBoxControlError("not implemented");
 }
@@ -1840 +1796 @@
 static DECLCALLBACK(RTEXITCODE) handleSaveState(int argc, char *argv[])
 {
-    //VbglR3VmSaveState();
+    RT_NOREF2(argc, argv); //VbglR3VmSaveState();
     return VBoxControlError("not implemented");
 }
@@ -1849 +1805 @@
 static DECLCALLBACK(RTEXITCODE) handleSuspend(int argc, char *argv[])
 {
-    //VbglR3VmSuspend();
+    RT_NOREF2(argc, argv); //VbglR3VmSuspend();
     return VBoxControlError("not implemented");
 }
@@ -1858 +1814 @@
 static DECLCALLBACK(RTEXITCODE) handlePowerOff(int argc, char *argv[])
 {
-    //VbglR3VmPowerOff();
+    RT_NOREF2(argc, argv); //VbglR3VmPowerOff();
     return VBoxControlError("not implemented");
 }
@@ -1867 +1823 @@
 static DECLCALLBACK(RTEXITCODE) handleVersion(int argc, char *argv[])
 {
+    RT_NOREF1(argv);
     if (argc)
         return VBoxControlSyntaxError("getversion does not take any arguments");
@@ -1877 +1834 @@
 static DECLCALLBACK(RTEXITCODE) handleHelp(int argc, char *argv[])
 {
-    /* ignore arguments for now. */
+    RT_NOREF2(argc, argv); /* ignore arguments for now. */
     usage();
     return RTEXITCODE_SUCCESS;

trunk/src/VBox/Additions/common/VBoxControl/testcase/tstVBoxControl.cpp

@@ -83 +83 @@
                                         uint32_t *pcbBufActual)
 {
+    RT_NOREF2(pvBuf, cbBuf);
     RTPrintf("Called GET_PROP, client %d, name %s...\n",
              idClient, pszName);
@@ -120 +121 @@
                                         char const **ppszFlags)
 {
+    RT_NOREF2(ppaszPatterns, cPatterns);
     RTPrintf("Called ENUM_PROPS, client %d...\n", idClient);
     AssertPtrReturn(ppHandle, VERR_INVALID_POINTER);
@@ -144 +146 @@
                                             char const **ppszFlags)
 {
+    RT_NOREF1(pHandle);
     RTPrintf("Called enumerate next...\n");
     AssertReturn(VALID_PTR(ppszName) || VALID_PTR(ppszValue) || VALID_PTR(ppszFlags),
@@ -160 +163 @@
 VBGLR3DECL(void)    VbglR3GuestPropEnumFree(PVBGLR3GUESTPROPENUM pHandle)
 {
+    RT_NOREF1(pHandle);
     RTPrintf("Called enumerate free...\n");
 }
@@ -175 +179 @@
                                         uint32_t *pcbBufActual)
 {
+    RT_NOREF2(pvBuf, cbBuf);
     if (u32Timeout == RT_INDEFINITE_WAIT)
         RTPrintf("Called GET_NOTIFICATION, client %d, patterns %s, timestamp %llu,\n"