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

Timestamp:

May 5, 2020 8:00:32 PM (5 years ago)

Author:

vboxsync

Message:

Main: Reverted r137602 & r137737 as the API is not actually needed. bugref:9699

Location:

trunk/src/VBox/Main/src-server

Files:

• ApplianceImpl.cpp (modified) (1 diff)
• ApplianceImplImport.cpp (modified) (3 diffs)

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

@@ -505 +505 @@
  * Public method implementation.
  */
-HRESULT Appliance::getManifest(com::Utf8Str &aManifest, com::Utf8Str &aManifestName)
-{
-    /* Write lock the appliance here as we don't want concurrent hMemFileTheirManifest
-       accesses (lazyness/paranoia). */
-    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
-
-    Assert(aManifest.isEmpty());
-    if (m->hMemFileTheirManifest != NIL_RTVFSFILE)
-    {
-        uint64_t cchManifest = 0;
-        int rc = RTVfsFileQuerySize(m->hMemFileTheirManifest, &cchManifest);
-        AssertRCReturn(rc, setErrorVrc(rc));
-
-        rc = aManifest.reserveNoThrow(cchManifest + 1);
-        AssertRCReturn(rc, setErrorVrc(rc));
-
-        char *pszManifest = aManifest.mutableRaw();
-        rc = RTVfsFileReadAt(m->hMemFileTheirManifest, 0, pszManifest, cchManifest, NULL);
-        pszManifest[cchManifest] = '\0';
-        AssertRCReturn(rc, setErrorVrc(rc));
-        RTStrPurgeEncoding(pszManifest);
-        aManifest.jolt();
-    }
-
-    aManifestName = m->strManifestName;
-    return S_OK;
-}
-
-/**
- * Public method implementation.
- */
 HRESULT Appliance::getDisks(std::vector<com::Utf8Str> &aDisks)
 {

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

@@ -2561 +2561 @@
  *                              reference is always consumed.
  * @param   pszSubFileNm        The manifest filename (no path) for error
- *                              messages, logging and strManifestName.
+ *                              messages and logging.
  * @returns COM status code, error info set.
  * @throws  Nothing
@@ -2568 +2568 @@
 {
     LogFlowFunc(("%s[%s]\n", pTask->locInfo.strPath.c_str(), pszSubFileNm));
-
-    /* Remember the manifet file name */
-    HRESULT hrc = m->strManifestName.assignEx(pszSubFileNm);
-    AssertReturn(SUCCEEDED(hrc), hrc);
 
     /*
@@ -2595 +2591 @@
     RTVfsIoStrmRelease(hVfsIos);
     if (RT_FAILURE(vrc))
-        return setErrorVrc(vrc, tr("Failed to parse manifest file '%s' for '%s' (%Rrc): %s"),
-                           pszSubFileNm, pTask->locInfo.strPath.c_str(), vrc, szErr);
+        throw setErrorVrc(vrc, tr("Failed to parse manifest file '%s' for '%s' (%Rrc): %s"),
+                          pszSubFileNm, pTask->locInfo.strPath.c_str(), vrc, szErr);
 
     /*