儲存庫 vbox 的更動 42875

時間撮記:

2012-8-20 上午02:11:05 (12 年 以前)

作者:

vboxsync

訊息:

Machine::GetNetworkAdapter: More details. (Testsuite doesn't check for E_INVALIDARG, btw.)

檔案:

• trunk/src/VBox/Main/src-server/MachineImpl.cpp (修改) (1 筆差異)

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

@@ -4678 +4678 @@
 {
     CheckComArgOutPointerValid(adapter);
-    /* Do not assert in debug builds here in case someone iterates over the
-     * slots and relies on the E_INVALIDARG error. */
+    /* Do not assert if slot is out of range, just return the advertised
+       status.  testdriver/vbox.py triggers this in logVmInfo. */
     if (slot >= mNetworkAdapters.size())
         return setError(E_INVALIDARG,
-                        tr("No network adapter in slot %RU32 found (total %RU32 adapters)"),
+                        tr("No network adapter in slot %RU32 (total %RU32 adapters)"),
                         slot, mNetworkAdapters.size());