Changeset 58017 in vbox

Timestamp:

Oct 3, 2015 6:53:14 PM (9 years ago)

Author:

vboxsync

Message:

USBIdDatabase.*: Warnings.

Location:

trunk/src/VBox/Main

Files:

• include/USBIdDatabase.h (modified) (2 diffs)
• src-server/USBIdDatabaseGenerator.cpp (modified) (1 diff)

trunk/src/VBox/Main/include/USBIdDatabase.h

@@ -105 +105 @@
         Assert(pStr->cch < s_cchStrTab);
         Assert(pStr->off < s_cchStrTab);
-        Assert(pStr->off + pStr->cch < s_cchStrTab);
+        Assert(pStr->off + (size_t)pStr->cch < s_cchStrTab);
 
 #ifdef USB_ID_DATABASE_WITH_COMPRESSION
@@ -136 +136 @@
                 Assert(pStr2->cch < s_cchStrTab);
                 Assert(pStr2->off < s_cchStrTab);
-                Assert(pStr2->off + pStr->cch < s_cchStrTab);
+                Assert(pStr2->off + (size_t)pStr->cch < s_cchStrTab);
                 Assert((uintptr_t)(&pchDst[pStr2->cch] - &szTmp[0]) < USB_ID_DATABASE_MAX_STRING);
                 memcpy(pchDst, &s_achStrTab[pStr2->off], pStr2->cch);

trunk/src/VBox/Main/src-server/USBIdDatabaseGenerator.cpp

@@ -453 +453 @@
         FixupString(&it->vendor.str, &cchOld, &cchNew);
 
-    for (unsigned i = 0; i < RT_ELEMENTS(g_aCompDict); i++)
+    for (i = 0; i < RT_ELEMENTS(g_aCompDict); i++)
         cchNew += g_aCompDict[i].str.length() + 1;