Changeset 79961 in vbox for trunk/src/VBox/Main/src-server/MediumImpl.cpp

Timestamp:

Jul 24, 2019 3:41:32 PM (6 years ago)

Author:

vboxsync

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

132392

Message:

Main/MediumImpl.cpp: Suffix strings that skips over the dot are called extensions in IPRT parlence. Simplified no-suffix check. bugref:8344

File:

• trunk/src/VBox/Main/src-server/MediumImpl.cpp (modified) (4 diffs)

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

@@ -2951 +2951 @@
             destFName.stripPath();
 
-            Utf8Str suffix(destFName);
-            suffix.stripSuffix();
-
-            if (suffix.equals(destFName) && !destFName.isEmpty())
+            if (destFName.isNotEmpty() && !RTPathHasSuffix(destFName.c_str()))
             {
                 /*
                  * The target path has no filename: Either "/path/to/new/location" or
-                 * just "newname" (no trailing backslash or there is no filename with
-                 * extension(suffix)).
+                 * just "newname" (no trailing backslash or there is no filename extension).
                  */
                 if (destPath.equals(destFName))
@@ -2993 +2989 @@
                 }
 
-                suffix = RTPathSuffix(sourceFName.c_str());
+                const char *pszSuffix = RTPathSuffix(sourceFName.c_str());
 
                 /* Suffix is empty and one is deduced from the medium format */
-                if (suffix.isEmpty())
+                if (pszSuffix == NULL)
                 {
-                    suffix = i_getFormat();
-                    if (suffix.compare("RAW", Utf8Str::CaseInsensitive) == 0)
+                    Utf8Str strExt = i_getFormat();
+                    if (strExt.compare("RAW", Utf8Str::CaseInsensitive) == 0)
                     {
                         DeviceType_T devType = i_getDeviceType();
@@ -3005 +3001 @@
                         {
                             case DeviceType_DVD:
-                                suffix = "iso";
+                                strExt = "iso";
                                 break;
                             case DeviceType_Floppy:
-                                suffix = "img";
+                                strExt = "img";
                                 break;
                             default:
-                                rc = setError(VERR_NOT_A_FILE,
+                                rc = setError(VERR_NOT_A_FILE, /** @todo r=bird: Mixing status codes again. */
                                        tr("Medium '%s' has RAW type. \"Move\" operation isn't supported for this type."),
                                        i_getLocationFull().c_str());
@@ -3017 +3013 @@
                         }
                     }
-                    else if (suffix.compare("Parallels", Utf8Str::CaseInsensitive) == 0)
+                    else if (strExt.compare("Parallels", Utf8Str::CaseInsensitive) == 0)
                     {
-                        suffix = "hdd";
+                        strExt = "hdd";
                     }
 
                     /* Set the target extension like on the source. Any conversions are prohibited */
-                    suffix.toLower();
-                    destPath.stripSuffix().append('.').append(suffix);
+                    strExt.toLower();
+                    destPath.stripSuffix().append('.').append(strExt);
                 }
                 else
-                    destPath.stripSuffix().append(suffix);
+                    destPath.stripSuffix().append(pszSuffix);
             }