Changeset 36119 in vbox

Timestamp:

Mar 1, 2011 2:47:48 PM (14 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

70283

Message:

RDP/client: fix some warnings

File:

• trunk/src/VBox/RDP/client/vrdp/rdpusb.c (modified) (2 diffs)

trunk/src/VBox/RDP/client/vrdp/rdpusb.c

@@ -238 +238 @@
         unsigned i, cZeros;
 
-        AssertReturnVoidStmt(iCurrent + DEV_ENTRY_SIZE + 2 <= cbBuf,
-                             free(pBuf));
+        AssertReturnStmt(iCurrent + DEV_ENTRY_SIZE + 2 <= cbBuf,
+                         free(pBuf), NULL);
         fillWireListEntry(pBuf + iCurrent, pCurrent, &iNext);
             DevListEntry *pEntry = (DevListEntry *)(pBuf + iCurrent);
@@ -247 +247 @@
              if (pBuf[i] == 0)
                  ++cZeros;
-        AssertReturnVoidStmt(cZeros ==   RT_BOOL(pEntry->oManufacturer)
-                                       + RT_BOOL(pEntry->oProduct)
-                                       + RT_BOOL(pEntry->oSerialNumber),
-                             free(pBuf));
-        AssertReturnVoidStmt(   pEntry->oManufacturer == 0
-                             || pBuf[pEntry->oManufacturer] != '\0',
-                             free(pBuf));
-        AssertReturnVoidStmt(   pEntry->oProduct == 0
-                             || pBuf[pEntry->oProduct] != '\0',
-                             free(pBuf));
-        AssertReturnVoidStmt(   pEntry->oSerialNumber == 0
-                             || pBuf[pEntry->oSerialNumber] != '\0',
-                             free(pBuf));
-        AssertReturnVoidStmt(cZeros == 0 || pBuf[iCurrent + iNext - 1] == '\0',
-                             free(pBuf));
+        AssertReturnStmt(cZeros ==   RT_BOOL(pEntry->oManufacturer)
+                                   + RT_BOOL(pEntry->oProduct)
+                                   + RT_BOOL(pEntry->oSerialNumber),
+                         free(pBuf), NULL);
+        AssertReturnStmt(   pEntry->oManufacturer == 0
+                         || pBuf[pEntry->oManufacturer] != '\0',
+                         free(pBuf), NULL);
+        AssertReturnStmt(   pEntry->oProduct == 0
+                         || pBuf[pEntry->oProduct] != '\0',
+                         free(pBuf), NULL);
+        AssertReturnStmt(   pEntry->oSerialNumber == 0
+                         || pBuf[pEntry->oSerialNumber] != '\0',
+                         free(pBuf), NULL);
+        AssertReturnStmt(cZeros == 0 || pBuf[iCurrent + iNext - 1] == '\0',
+                         free(pBuf), NULL);
     }
     *pLen = iCurrent + iNext + 2;