儲存庫 vbox 的更動 63174

時間撮記:

2016-8-8 下午02:47:28 (8 年 以前)

作者:

vboxsync

訊息:

Main: unreachable code.

位置:

trunk/src/VBox/Main/src-server

檔案:

• HostUSBDeviceImpl.cpp (修改) (1 筆差異)
• Performance.cpp (修改) (1 筆差異)
• SystemPropertiesImpl.cpp (修改) (2 筆差異)
• USBDeviceFilterImpl.cpp (修改) (3 筆差異)

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

@@ -1788 +1788 @@
 
     }
-
-    AssertFailedReturn("shouldn't get here");
+    /* not reached */
 }
 

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

@@ -1460 +1460 @@
         pszPat++;
     }
-    return true;
+    /* not reached */
 }
 

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

@@ -950 +950 @@
     /** @todo not yet implemented, settings handling is missing */
     ReturnComNotImplemented();
-
+#if 0 /* not implemented */
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
     HRESULT rc = i_setDefaultAdditionsISO(aDefaultAdditionsISO);
@@ -963 +963 @@
 
     return rc;
+#endif
 }
 

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

@@ -41 +41 @@
  *  @param  aStr        The output string.
  */
-static void i_usbFilterFieldToString(PCUSBFILTER aFilter, USBFILTERIDX aIdx, Utf8Str &out)
+static void i_usbFilterFieldToString(PCUSBFILTER aFilter, USBFILTERIDX aIdx, Utf8Str &rstrOut)
 {
     const USBFILTERMATCH matchingMethod = USBFilterGetMatchingMethod(aFilter, aIdx);
@@ -51 +51 @@
         Assert(value >= 0 && value <= 0xffff);
 
-        out = Utf8StrFmt("%04RX16", (uint16_t)value);
+        rstrOut = Utf8StrFmt("%04RX16", (uint16_t)value);
     }
     else if (USBFilterIsMethodString(matchingMethod))
-    {
-        out = USBFilterGetString(aFilter, aIdx);
-    }
+        rstrOut = USBFilterGetString(aFilter, aIdx);
     else
-        out.setNull();
+        rstrOut.setNull();
 }
 
@@ -66 +64 @@
     switch (aIdx)
     {
-        case USBFILTERIDX_VENDOR_ID: return tr("Vendor ID");
-        case USBFILTERIDX_PRODUCT_ID: return tr("Product ID");
-        case USBFILTERIDX_DEVICE: return tr("Revision");
-        case USBFILTERIDX_MANUFACTURER_STR: return tr("Manufacturer");
-        case USBFILTERIDX_PRODUCT_STR: return tr("Product");
-        case USBFILTERIDX_SERIAL_NUMBER_STR: return tr("Serial number");
-        case USBFILTERIDX_PORT: return tr("Port number");
-        default: return "";
-    }
-    return "";
+        case USBFILTERIDX_VENDOR_ID:            return tr("Vendor ID");
+        case USBFILTERIDX_PRODUCT_ID:           return tr("Product ID");
+        case USBFILTERIDX_DEVICE:               return tr("Revision");
+        case USBFILTERIDX_MANUFACTURER_STR:     return tr("Manufacturer");
+        case USBFILTERIDX_PRODUCT_STR:          return tr("Product");
+        case USBFILTERIDX_SERIAL_NUMBER_STR:    return tr("Serial number");
+        case USBFILTERIDX_PORT:                 return tr("Port number");
+        default:                                return "";
+    }
+    /* not reached. */
 }