Changeset 58001 in vbox for trunk

Timestamp:

Oct 2, 2015 10:15:58 AM (9 years ago)

Author:

vboxsync

Message:

USBIdDatabase*: The product and vendor arrays should be const, just like the counts. If you're using hungarian for the element counts, use it for the arrays too. RT_ELEMENTS is a handy macro.

Location:

trunk/src/VBox/Main

Files:

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

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

@@ -76 +76 @@
 {
 protected:
-    static Product productArray[];
-    static const size_t cProducts;
-    static Vendor vendorArray[];
-    static const size_t cVendors;
+    static Product const aProducts[];
+    static const size_t  cProducts;
+    static Vendor const  aVendors[];
+    static const size_t  cVendors;
 
 public:
@@ -85 +85 @@
     {
         Product lookFor = { USBKEY(vendorId, productId) };
-        Product* it = std::lower_bound(productArray, productArray + cProducts, lookFor, ProductLess());
+        Product const *it = std::lower_bound(aProducts, aProducts + cProducts, lookFor, ProductLess());
         return lookFor.key == it->key ? it->product : NULL;
     }
@@ -92 +92 @@
     {
         Vendor lookFor = { vendorID };
-        Vendor* it = std::lower_bound(vendorArray, vendorArray + cVendors, lookFor, VendorLess());
+        Vendor const *it = std::lower_bound(aVendors, aVendors + cVendors, lookFor, VendorLess());
         return lookFor.vendorID == it->vendorID ? it->vendor : NULL;
     }

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

@@ -56 +56 @@
     " * The source of the list is http://www.linux-usb.org/usb.ids\n"
     " */\n"
-    "Product AliasDictionary::productArray[] =\n"
+    "Product const AliasDictionary::aProducts[] =\n"
     "{\n";
 
@@ -62 +62 @@
     "};\n"
     "\n"
-    "const size_t AliasDictionary::cProducts = sizeof(AliasDictionary::productArray) / sizeof(Product);\n";
+    "const size_t AliasDictionary::cProducts = RT_ELEMENTS(AliasDictionary::aProducts);\n";
 
 const char *vendor_header =
-    "\nVendor AliasDictionary::vendorArray[] =\n"
+    "\nVendor const AliasDictionary::aVendors[] =\n"
     "{\n";
 const char *vendor_footer =
     "};\n"
     "\n"
-    "const size_t AliasDictionary::cVendors = sizeof(AliasDictionary::vendorArray) / sizeof(Vendor);\n";
+    "const size_t AliasDictionary::cVendors = RT_ELEMENTS(AliasDictionary::aVendors);\n";
 
 const char *start_block = "# Vendors, devices and interfaces. Please keep sorted.";

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

@@ -18 +18 @@
 #include "USBIdDatabase.h"
 
-Product         AliasDictionary::productArray[] = {0};
-const size_t    AliasDictionary::products_size  = 0;
-Vendor          AliasDictionary::vendorArray[]  = {0};
-const size_t    AliasDictionary::vendors_size   = 0;
+Product const   AliasDictionary::productArray[] = {0};
+const size_t    AliasDictionary::cProducts      = 1; /* std::lower_bound cannot deal with empty array */
+Vendor const    AliasDictionary::vendorArray[]  = {0};
+const size_t    AliasDictionary::cVendors       = 1; /* std::lower_bound cannot deal with empty array */