Changeset 61674 in vbox

Timestamp:

Jun 13, 2016 12:31:37 PM (9 years ago)

Author:

vboxsync

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

108031

Message:

FE/VBoxManage: Committed too much

File:

• trunk/src/VBox/Frontends/VBoxManage/VBoxInternalManage.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VBoxManage/VBoxInternalManage.cpp

@@ -1662 +1662 @@
                     /* Refer to the correct partition and use offset 0. */
                     char *psz;
+#if defined(RT_OS_LINUX)
                     /*
                      * Check whether raw disk ends with a digit. In that case
@@ -1672 +1673 @@
                     if (RT_C_IS_DIGIT(pszRawName[cchRawDisk - 1]))
                         RTStrAPrintf(&psz,
-                                     "%s%c%u",
+                                     "%sp%u",
                                      rawdisk.c_str(),
-# if defined(RT_OS_LINUX)
-                                     'p',
-# else
-                                     's',
-# endif
                                      partitions.aPartitions[i].uIndex);
                     else
@@ -1685 +1681 @@
                                      rawdisk.c_str(),
                                      partitions.aPartitions[i].uIndex);
+#elif defined(RT_OS_DARWIN) || defined(RT_OS_FREEBSD)
+                    RTStrAPrintf(&psz,
+                                 "%ss%u",
+                                 rawdisk.c_str(),
+                                 partitions.aPartitions[i].uIndex);
+#endif
                     if (!psz)
                     {