Changeset 85283 in vbox

Timestamp:

Jul 12, 2020 2:54:15 PM (5 years ago)

Author:

vboxsync

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

139260

Message:

Main/ApplianceImpl.cpp: Signed/unsigned conversion issues in i_searchUniqueImageFilePath. Renamed it to i_ensureUniqueImageFilePath as it's not really searching anything. bugref:9790

Location:

trunk/src/VBox/Main

Files:

• include/ApplianceImpl.h (modified) (1 diff)
• src-server/ApplianceImplImport.cpp (modified) (1 diff)

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

@@ -132 +132 @@
     bool i_isApplianceIdle();
     HRESULT i_searchUniqueVMName(Utf8Str& aName) const;
-    HRESULT i_searchUniqueImageFilePath(const Utf8Str &aMachineFolder,
+    HRESULT i_ensureUniqueImageFilePath(const Utf8Str &aMachineFolder,
                                         DeviceType_T aDeviceType,
                                         Utf8Str &aName) const;

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

@@ -750 +750 @@
                         strFilename.stripSuffix();
 
-                    i_searchUniqueImageFilePath(strMachineFolder, devType, strFilename); /** @todo check the return code! */
+                    i_ensureUniqueImageFilePath(strMachineFolder, devType, strFilename); /** @todo check the return code! */
 
                     /* find the description for the storage controller