Changeset 58019 in vbox

Timestamp:

Oct 3, 2015 7:31:41 PM (9 years ago)

Author:

vboxsync

Message:

USBIdDatabase*: A couple of fixes, One yielding 109 bytes extra saving.

Location:

trunk/src/VBox/Main

Files:

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

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

@@ -158 +158 @@
     static uint32_t lookupVendor(uint16_t idVendor)
     {
-        size_t iStart = 0;
         size_t iEnd   = s_cVendors;
-        for (;;)
-        {
-            size_t idx = iStart + (iEnd - iStart) / 2;
-            if (s_aVendors[idx].idVendor < idVendor)
-            {
-                idx++;
-                if (idx < iEnd)
-                    iStart = idx;
+        if (iEnd)
+        {
+            size_t iStart = 0;
+            for (;;)
+            {
+                size_t idx = iStart + (iEnd - iStart) / 2;
+                if (s_aVendors[idx].idVendor < idVendor)
+                {
+                    idx++;
+                    if (idx < iEnd)
+                        iStart = idx;
+                    else
+                        break;
+                }
+                else if (s_aVendors[idx].idVendor > idVendor)
+                {
+                    if (idx != iStart)
+                        iEnd = idx;
+                    else
+                        break;
+                }
                 else
-                    return UINT32_MAX;
-            }
-            else if (s_aVendors[idx].idVendor > idVendor)
-            {
-                if (idx != iStart)
-                    iEnd = idx;
-                else
-                    return UINT32_MAX;
-            }
-            else
-                return (uint32_t)idx;
-        }
+                    return (uint32_t)idx;
+            }
+        }
+        return UINT32_MAX;
     }
 
@@ -193 +197 @@
     static uint32_t lookupProduct(uint16_t idProduct, size_t iStart, size_t iEnd)
     {
-        for (;;)
-        {
-            size_t idx = iStart + (iEnd - iStart) / 2;
-            if (s_aProducts[idx].idProduct < idProduct)
-            {
-                idx++;
-                if (idx < iEnd)
-                    iStart = idx;
+        if (iStart < iEnd)
+        {
+            for (;;)
+            {
+                size_t idx = iStart + (iEnd - iStart) / 2;
+                if (s_aProducts[idx].idProduct < idProduct)
+                {
+                    idx++;
+                    if (idx < iEnd)
+                        iStart = idx;
+                    else
+                        break;
+                }
+                else if (s_aProducts[idx].idProduct > idProduct)
+                {
+                    if (idx != iStart)
+                        iEnd = idx;
+                    else
+                        break;
+                }
                 else
-                    return UINT32_MAX;
-            }
-            else if (s_aProducts[idx].idProduct > idProduct)
-            {
-                if (idx != iStart)
-                    iEnd = idx;
-                else
-                    return UINT32_MAX;
-            }
-            else
-                return (uint32_t)idx;
-        }
+                    return (uint32_t)idx;
+            }
+        }
+        return UINT32_MAX;
     }
 

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

@@ -581 +581 @@
 {
     size_t iIdx;
-    size_t iStart = 0;
-    size_t iEnd   = g_cSortedStrings;
-    for (;;)
-    {
-        iIdx = iStart + (iEnd - iStart) / 2;
-        if (g_papSortedStrings[iIdx]->StrRef.cch < pStr->StrRef.cch)
-        {
-            if (iIdx <= iStart)
+    size_t iEnd = g_cSortedStrings;
+    if (iEnd)
+    {
+        size_t iStart = 0;
+        for (;;)
+        {
+            iIdx = iStart + (iEnd - iStart) / 2;
+            if (g_papSortedStrings[iIdx]->StrRef.cch < pStr->StrRef.cch)
+            {
+                if (iIdx <= iStart)
+                    break;
+                iEnd = iIdx;
+            }
+            else if (g_papSortedStrings[iIdx]->StrRef.cch > pStr->StrRef.cch)
+            {
+                if (++iIdx >= iEnd)
+                    break;
+                iStart = iIdx;
+            }
+            else
                 break;
-            iEnd = iIdx;
-        }
-        else if (g_papSortedStrings[iIdx]->StrRef.cch > pStr->StrRef.cch)
-        {
-            if (++iIdx >= g_cSortedStrings)
-                break;
-            iStart = iIdx;
-        }
-        else
-            break;
-    }
-
-    if (iIdx != g_cSortedStrings)
-        memmove(&g_papSortedStrings[iIdx + 1], &g_papSortedStrings[iIdx],
-                (g_cSortedStrings - iIdx) * sizeof(g_papSortedStrings[iIdx]));
+        }
+
+        if (iIdx != g_cSortedStrings)
+            memmove(&g_papSortedStrings[iIdx + 1], &g_papSortedStrings[iIdx],
+                    (g_cSortedStrings - iIdx) * sizeof(g_papSortedStrings[iIdx]));
+    }
+    else
+        iIdx = 0;
+
     g_papSortedStrings[iIdx] = pStr;
     g_cSortedStrings++;
@@ -704 +710 @@
             /*
              * See if the start of the string overlaps the end of the string table.
-             * (Currently saves 1 byte...)
              */
             if (g_cchStrTab && cchCur > 1)
@@ -715 +720 @@
                     if (!pchCandidate)
                         break;
-                    if (memcmp(pchCandidate, pszCur, cchLeft) == 0)
+                    cchLeft -= pchCandidate - pchLeft;
+                    pchLeft  = pchCandidate;
+                    if (memcmp(pchLeft, pszCur, cchLeft) == 0)
                     {
                         size_t cchToCopy = cchCur - cchLeft;
@@ -723 +730 @@
                         break;
                     }
-
-                    cchLeft -= pchCandidate + 1 - pchLeft;
-                    pchLeft  = pchCandidate + 1;
+                    cchLeft--;
+                    pchLeft++;
                 }
             }
@@ -966 +972 @@
                             }
                             product.key = RT_MAKE_U32(product.productID, product.vendorID);
-                            Assert(product.vendorID != 0);
+                            Assert(product.vendorID == vendor.vendorID);
                             g_products.push_back(product);
                         }
@@ -1085 +1091 @@
                 do
                     iProduct++;
-                while (g_products[iProduct].vendorID == idVendor);
+                while (   iProduct < g_products.size()
+                       && g_products[iProduct].vendorID == idVendor);
             else
             {