儲存庫 vbox 的更動 80730

時間撮記:

2019-9-11 上午10:46:05 (6 年 以前)

作者:

vboxsync

svn:sync-xref-src-repo-rev:

133272

訊息:

Main/MediumImpl: Build fix if VBOX_WITH_EXTPACK= is not defined.

檔案:

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

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

@@ -8215 +8215 @@
         if (itKeyStore != pBase->m->mapProperties.end())
         {
+#ifdef VBOX_WITH_EXTPACK
             settings::StringsMap::iterator itKeyId = pBase->m->mapProperties.find("CRYPT/KeyId");
 
-#ifdef VBOX_WITH_EXTPACK
             ExtPackManager *pExtPackManager = m->pVirtualBox->i_getExtPackManager();
             if (pExtPackManager->i_isExtPackUsable(ORACLE_PUEL_EXTPACK_NAME))
@@ -8241 +8241 @@
                                tr("Encryption is not supported because the extension pack '%s' is missing"),
                                ORACLE_PUEL_EXTPACK_NAME);
-#else
-            throw setError(VBOX_E_NOT_SUPPORTED,
-                           tr("Encryption is not supported because extension pack support is not built in"));
-#endif
 
             if (itKeyId == pBase->m->mapProperties.end())
@@ -8273 +8269 @@
                 throw setErrorBoth(VBOX_E_INVALID_OBJECT_STATE, vrc, tr("Failed to load the decryption filter: %s"),
                                    i_vdError(vrc).c_str());
+#else
+            RT_NOREF(pKeyStore, pCryptoSettings);
+            throw setError(VBOX_E_NOT_SUPPORTED,
+                           tr("Encryption is not supported because extension pack support is not built in"));
+#endif /* VBOX_WITH_EXTPACK */
         }