Changeset 58000 in vbox for trunk/src/VBox/Main/src-server

Timestamp:

Oct 2, 2015 10:05:38 AM (9 years ago)

Author:

vboxsync

Message:

USBIdDatabase*: Corrected file header, fixed LogRel statement (was given NULL string pointers instead of vendor + device IDs), some style fixes.

Location:

trunk/src/VBox/Main/src-server

Files:

• HostUSBDeviceImpl.cpp (modified) (3 diffs)
• USBIdDatabaseGenerator.cpp (modified) (9 diffs)
• USBIdDatabaseStub.cpp (modified) (1 diff)

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

@@ -170 +170 @@
     if (mUsb->pszManufacturer == NULL || mUsb->pszManufacturer[0] == 0)
     {
-        const char* vendorName = AliasDictionary::findVendor(mUsb->idVendor);
+        const char *vendorName = AliasDictionary::findVendor(mUsb->idVendor);
         if (vendorName)
             aManufacturer = vendorName;
@@ -185 +185 @@
     if (mUsb->pszProduct == NULL || mUsb->pszProduct[0] == 0)
     {
-        const char* productName = AliasDictionary::findProduct(mUsb->idVendor, mUsb->idProduct);
+        const char *productName = AliasDictionary::findProduct(mUsb->idVendor, mUsb->idProduct);
         if (productName)
             aProduct = productName;
@@ -335 +335 @@
         name = Utf8StrFmt("%s %s", mUsb->pszManufacturer, mUsb->pszProduct);
     else if (haveManufacturer)
-        name = Utf8StrFmt("%s", mUsb->pszManufacturer);
+        name = mUsb->pszManufacturer;
     else if (haveProduct)
-        name = Utf8StrFmt("%s", mUsb->pszProduct);
+        name = mUsb->pszProduct;
     else
     {
-        const char* vendorName = AliasDictionary::findVendor(mUsb->idVendor);
-        const char* productName = AliasDictionary::findProduct(mUsb->idVendor, mUsb->idProduct);
-        if (vendorName && productName)
-        {
-            name = Utf8StrFmt("%s %s", vendorName, productName);
-        }
+        const char *pszVendorName  = AliasDictionary::findVendor(mUsb->idVendor);
+        const char *pszProductName = AliasDictionary::findProduct(mUsb->idVendor, mUsb->idProduct);
+        if (pszVendorName && pszProductName)
+            name = Utf8StrFmt("%s %s", pszVendorName, pszProductName);
         else
         {
-            name = "<unknown>";
-            LogRel(("USB: Unknown USB device detected (idVendor: 0x%04x, idProduct: 0x%04x). Please, report the idVendor and idProduct to virtualbox.org.\n", vendorName, productName));
+            LogRel(("USB: Unknown USB device detected (idVendor: 0x%04x, idProduct: 0x%04x). Please, report the idVendor and idProduct to virtualbox.org.\n",
+                    mUsb->idVendor, mUsb->idProduct));
+            if (pszVendorName)
+                name = pszVendorName;
+            else if (pszProductName)
+                name = pszProductName;
+            else
+                name = "<unknown>";
         }
     }

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

@@ +1 @@
+/* $Id$ */
+/** @file
+ * USB device vendor and product ID database - generator.
+ */
+
 /*
-* Copyright (C) 2006-2015 Oracle Corporation
-*
-* This file is part of VirtualBox Open Source Edition (OSE), as
-* available from http://www.virtualbox.org. This file is free software;
-* you can redistribute it and/or modify it under the terms of the GNU
-* General Public License (GPL) as published by the Free Software
-* Foundation, in version 2 as it comes in the "COPYING" file of the
-* VirtualBox OSE distribution. VirtualBox OSE is distributed in the
-* hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
-*/
+ * Copyright (C) 2015 Oracle Corporation
+ *
+ * This file is part of VirtualBox Open Source Edition (OSE), as
+ * available from http://www.virtualbox.org. This file is free software;
+ * you can redistribute it and/or modify it under the terms of the GNU
+ * General Public License (GPL) as published by the Free Software
+ * Foundation, in version 2 as it comes in the "COPYING" file of the
+ * VirtualBox OSE distribution. VirtualBox OSE is distributed in the
+ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
+ */
 
 #include <stdio.h>
@@ -26 +31 @@
 using namespace std;
 
-const char *header =
+static const char * const header =
+    "/** @file\n"
+    " * USB device vendor and product ID database - Autogenerated from <stupid C++ cannot do %s>\n"
+    " */\n"
+    "\n"
     "/*\n"
-    " * Copyright(C) 2015 Oracle Corporation\n"
+    " * Copyright (C) 2015 Oracle Corporation\n"
     " *\n"
     " * This file is part of VirtualBox Open Source Edition(OSE), as\n"
@@ -116 +125 @@
         switch (res[i])
         {
-        case '"':
-        case '\\': res.insert(i++, "\\"); break;
-        default:
-        {
-            // encode multibyte UTF-8 symbols to be sure that they 
-            // will be safely read by compiler
-            if ((unsigned char)res[i] >= 127)
+            case '"':
+            case '\\': res.insert(i++, "\\"); break;
+            default:
             {
-                size_t start = i;
-                string temp = "\" \"";
-                char buffer[8] = { 0 };
-                do
+                // encode multibyte UTF-8 symbols to be sure that they
+                // will be safely read by compiler
+                if ((unsigned char)res[i] >= 127)
                 {
-                    RTStrPrintf(buffer, sizeof(buffer), "\\x%x", (unsigned char)res[i]);
-                    temp.append(buffer);
-                } while ((unsigned char)res[++i] & 0x80);
-                // splitting string after escape sequence to finish number sequence 
-                // otherwise it could lead to situation when "\x88a" will threathened as 
-                // multibyte symbol '\x88a' instead of two symbols '\x88' and 'a'
-                temp.append("\" \"");
-                res.replace(start, i - start, temp);
-                i += temp.length();
+                    size_t start = i;
+                    string temp = "\" \"";
+                    char buffer[8] = { 0 };
+                    do
+                    {
+                        RTStrPrintf(buffer, sizeof(buffer), "\\x%x", (unsigned char)res[i]);
+                        temp.append(buffer);
+                    } while ((unsigned char)res[++i] & 0x80);
+                    // splitting string after escape sequence to finish number sequence
+                    // otherwise it could lead to situation when "\x88a" will threathened as
+                    // multibyte symbol '\x88a' instead of two symbols '\x88' and 'a'
+                    temp.append("\" \"");
+                    res.replace(start, i - start, temp);
+                    i += temp.length();
+                }
             }
-        }
         }
     }
@@ -234 +243 @@
         switch (state)
         {
-        case State::lookForStartBlock:
-        {
-            if (line.find(start_block) != string::npos)
-                state = State::lookForEndBlock;
-            break;
-        }
-        case State::lookForEndBlock:
-        {
-            if (line.find(end_block) != string::npos)
-                state = State::finished;
-            else
+            case State::lookForStartBlock:
             {
-                if (!IsCommentOrEmptyLine(line))
+                if (line.find(start_block) != string::npos)
+                    state = State::lookForEndBlock;
+                break;
+            }
+            case State::lookForEndBlock:
+            {
+                if (line.find(end_block) != string::npos)
+                    state = State::finished;
+                else
                 {
-                    if (line[0] == '\t')
+                    if (!IsCommentOrEmptyLine(line))
                     {
-                        // Parse Product line
-                        // first line should be vendor
-                        if (vendor.vendorID == 0)
+                        if (line[0] == '\t')
                         {
-                            cerr << "Wrong file format. Product before vendor: "
-                                << line.c_str() << "'" << endl;
-                            return ERROR_WRONG_FILE_FORMAT;
+                            // Parse Product line
+                            // first line should be vendor
+                            if (vendor.vendorID == 0)
+                            {
+                                cerr << "Wrong file format. Product before vendor: "
+                                    << line.c_str() << "'" << endl;
+                                return ERROR_WRONG_FILE_FORMAT;
+                            }
+                            ProductRecord product = { 0, vendor.vendorID, 0, "" };
+                            if (ParseAlias(line.substr(1), product.productID, product.product) != 0)
+                            {
+                                cerr << "Error in parsing product line: '"
+                                    << line.c_str() << "'" << endl;
+                                return ERROR_IN_PARSE_LINE;
+                            }
+                            product.key = USBKEY(product.vendorID, product.productID);
+                            Assert(product.vendorID != 0);
+                            g_products.push_back(product);
                         }
-                        ProductRecord product = { 0, vendor.vendorID, 0, "" };
-                        if (ParseAlias(line.substr(1), product.productID, product.product) != 0)
+                        else
                         {
-                            cerr << "Error in parsing product line: '"
-                                << line.c_str() << "'" << endl;
-                            return ERROR_IN_PARSE_LINE;
+                            // Parse vendor line
+                            if (ParseAlias(line, vendor.vendorID, vendor.vendor) != 0)
+                            {
+                                cerr << "Error in parsing vendor line: '"
+                                    << line.c_str() << "'" << endl;
+                                return ERROR_IN_PARSE_LINE;
+                            }
+                            g_vendors.push_back(vendor);
                         }
-                        product.key = USBKEY(product.vendorID, product.productID);
-                        Assert(product.vendorID != 0);
-                        g_products.push_back(product);
-                    }
-                    else
-                    {
-                        // Parse vendor line
-                        if (ParseAlias(line, vendor.vendorID, vendor.vendor) != 0)
-                        {
-                            cerr << "Error in parsing vendor line: '"
-                                << line.c_str() << "'" << endl;
-                            return ERROR_IN_PARSE_LINE;
-                        }
-                        g_vendors.push_back(vendor);
                     }
                 }
+                break;
             }
-            break;
-        }
         }
     }
@@ -294 +303 @@
 }
 
-int main(int argc, char* argv[])
+int main(int argc, char *argv[])
 {
     int rc = RTR3InitExe(argc, &argv, 0);
@@ -312 +321 @@
     g_vendors.reserve(3500);
 
-    char* outName = NULL;
-    rc = 0;
+    const char *outName = NULL;
     for (int i = 1; i < argc; i++)
     {
@@ -322 +330 @@
         }
 
-        if (RT_FAILURE(rc = RTStrmOpen(argv[i], "r", &fin)))
+        rc = RTStrmOpen(argv[i], "r", &fin);
+        if (RT_FAILURE(rc))
         {
             cerr << "Format: " << argv[0] <<
@@ -349 +358 @@
     {
         cerr << "Warning: Duplicate alias detected. " << *ita << endl;
+        /** @todo r=bird: Why return success (0) when we didn't generate the
+         *        file?!?!? */
         return 0;
     }
@@ -360 +371 @@
     }
 
+/** @todo String compression. */
+
     fout.open(outName);
     if (!fout.is_open())

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

@@ +1 @@
+/* $Id$ */
+/** @file
+ * USB device vendor and product ID database - stub.
+ */
+
 /*
-* Copyright(C) 2005 - 2015 Oracle Corporation
-*
-* This file is part of VirtualBox Open Source Edition(OSE), as
-* available from http ://www.virtualbox.org. This file is free software;
-* you can redistribute it and / or modify it under the terms of the GNU
-* General Public License(GPL) as published by the Free Software
-* Foundation, in version 2 as it comes in the "COPYING" file of the
-* VirtualBox OSE distribution.VirtualBox OSE is distributed in the
-* hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
-*
-*/
+ * Copyright (C) 2015 Oracle Corporation
+ *
+ * This file is part of VirtualBox Open Source Edition (OSE), as
+ * available from http://www.virtualbox.org. This file is free software;
+ * you can redistribute it and/or modify it under the terms of the GNU
+ * General Public License (GPL) as published by the Free Software
+ * Foundation, in version 2 as it comes in the "COPYING" file of the
+ * VirtualBox OSE distribution. VirtualBox OSE is distributed in the
+ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
+ */
 
 #include "USBIdDatabase.h"
 
-/** USB devices aliases array.
-*   Format: VendorId, ProductId, Vendor Name, Product Name
-*   The source of the list is http://www.linux-usb.org/usb.ids
-*/
-Product AliasDictionary::productArray[] = {0};
+Product         AliasDictionary::productArray[] = {0};
+const size_t    AliasDictionary::products_size  = 0;
+Vendor          AliasDictionary::vendorArray[]  = {0};
+const size_t    AliasDictionary::vendors_size   = 0;
 
-const size_t AliasDictionary::products_size = sizeof(AliasDictionary::productArray) / sizeof(Product);
-
-Vendor AliasDictionary::vendorArray[] = {0};
-
-const size_t AliasDictionary::vendors_size = sizeof(AliasDictionary::vendorArray) / sizeof(Vendor);