Changeset 56910 in vbox

Timestamp:

Jul 10, 2015 9:02:23 AM (10 years ago)

Author:

vboxsync

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

101600

Message:

Main/VBoxManage: cleanup in raw partition handling, eliminating redundant code

File:

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

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

@@ -1258 +1258 @@
         }
         else
+        {
+            if (fRelative)
+            {
+                RTMsgError("The -relative parameter is invalid for raw images");
+                vrc = VERR_INVALID_PARAMETER;
+                goto out;
+            }
             vrc = VINF_SUCCESS;
+        }
     }
 #elif defined(RT_OS_LINUX)
@@ -1618 +1626 @@
                 if (fRelative)
                 {
-#if defined(RT_OS_LINUX) || defined(RT_OS_FREEBSD)
+#if defined(RT_OS_LINUX) || defined(RT_OS_DARWIN) || defined(RT_OS_FREEBSD)
                     /* Refer to the correct partition and use offset 0. */
                     char *psz;
@@ -1624 +1632 @@
 #if defined(RT_OS_LINUX)
                                  "%s%u",
-#elif defined(RT_OS_FREEBSD)
+#elif defined(RT_OS_DARWIN) || defined(RT_OS_FREEBSD)
                                  "%ss%u",
 #endif
@@ -1634 +1642 @@
                         RTMsgError("Cannot create reference to individual partition %u, rc=%Rrc",
                                    partitions.aPartitions[i].uIndex, vrc);
-                        goto out;
-                    }
-                    pszRawName = psz;
-                    uStartOffset = 0;
-#elif defined(RT_OS_DARWIN)
-                    /* Refer to the correct partition and use offset 0. */
-                    char *psz;
-                    RTStrAPrintf(&psz, "%ss%u", rawdisk.c_str(),
-                                 partitions.aPartitions[i].uIndex);
-                    if (!psz)
-                    {
-                        vrc = VERR_NO_STR_MEMORY;
-                        RTMsgError("Cannot create reference to individual partition %u, rc=%Rrc",
-                                 partitions.aPartitions[i].uIndex, vrc);
                         goto out;
                     }