Changeset 107597 in vbox

Timestamp:

Jan 9, 2025 1:18:25 PM (3 months ago)

Author:

vboxsync

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

166672

Message:

Main/src-server/ApplianceImplImport.cpp: Some unused assignment parfait warning fixes, bugref:3409

Location:

trunk/src/VBox/Main

Files:

• include/ApplianceImplPrivate.h (modified) (1 diff)
• src-server/ApplianceImplImport.cpp (modified) (7 diffs)

trunk/src/VBox/Main/include/ApplianceImplPrivate.h

@@ -540 +540 @@
 
     HRESULT restoreOriginalUUIDOfAttachedDevice(settings::MachineConfigFile *config);
-    HRESULT saveOriginalUUIDOfAttachedDevice(settings::AttachedDevice &device, const Utf8Str &newlyUuid);
+    void saveOriginalUUIDOfAttachedDevice(settings::AttachedDevice &device, const Utf8Str &newlyUuid);
     RTVFSIOSTREAM claimOvaLookAHead(void);
 };

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

@@ -1605 +1605 @@
 
                         if ( hDir != NULL)
+                        {
                             vrc = RTDirClose(hDir);
+                            AssertRC(vrc);
+                        }
                     }
                     else
@@ -2494 +2497 @@
      */
     char    *pszOvfNameBase = NULL;
-    size_t   cchOvfNameBase = 0; NOREF(cchOvfNameBase);
     unsigned cLeftToFind = 3;
     HRESULT  hrc = S_OK;
@@ -2543 +2545 @@
                             *pszSuffix = '\0';
                             pszOvfNameBase = pszName;
-                            cchOvfNameBase = strlen(pszName);
                             pszName = NULL;
                             cLeftToFind--;
@@ -3783 +3784 @@
                 SafeIfaceArray<IMedium> aMedia;
                 hrc2 = failedMachine->Unregister(CleanupMode_DetachAllReturnHardDisksOnly, ComSafeArrayAsOutParam(aMedia));
+                if (FAILED(hrc2))
+                    LogRel(("Appliance::i_importFS: Cleaning up failed import failed with hrc2 -> %Rhrc in IMachine::Unregister()\n", hrc2));
                 ComPtr<IProgress> pProgress2;
                 hrc2 = failedMachine->DeleteConfig(ComSafeArrayAsInParam(aMedia), pProgress2.asOutParam());
+                if (FAILED(hrc2))
+                    LogRel(("Appliance::i_importFS: Cleaning up failed import failed with hrc2 -> %Rhrc in IMachine::DeleteConfig()\n", hrc2));
                 pProgress2->WaitForCompletion(-1);
             }
@@ -4595 +4600 @@
             if (stack.strFirmwareType.contains("32"))
                 firmwareType = FirmwareType_EFI32;
-            if (stack.strFirmwareType.contains("64"))
+            else if (stack.strFirmwareType.contains("64"))
                 firmwareType = FirmwareType_EFI64;
             else
@@ -6019 +6024 @@
                  */
                 {
-                    hrc = stack.saveOriginalUUIDOfAttachedDevice(d, Utf8Str(hdId));
+                    stack.saveOriginalUUIDOfAttachedDevice(d, Utf8Str(hdId));
                     d.uuid = hdId;
                 }
@@ -6232 +6237 @@
 }
 
-HRESULT Appliance::ImportStack::saveOriginalUUIDOfAttachedDevice(settings::AttachedDevice &device,
-                                                     const Utf8Str &newlyUuid)
+void Appliance::ImportStack::saveOriginalUUIDOfAttachedDevice(settings::AttachedDevice &device,
+                                                              const Utf8Str &newlyUuid)
 {
-    HRESULT hrc = S_OK;
-
     /* save for restoring */
     mapNewUUIDsToOriginalUUIDs.insert(std::make_pair(newlyUuid, device.uuid.toString()));
-
-    return hrc;
 }