Changeset 31539 in vbox for trunk/src/VBox/Frontends/VBoxManage

Timestamp:

Aug 10, 2010 3:40:18 PM (15 years ago)

Author:

vboxsync

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

64639

Message:

Main: use settings struct for machine user data; remove iprt::MiniString::raw() and change all occurences to c_str()

Location:

trunk/src/VBox/Frontends/VBoxManage

Files:

• VBoxInternalManage.cpp (modified) (37 diffs)
• VBoxManage.cpp (modified) (1 diff)
• VBoxManageControlVM.cpp (modified) (5 diffs)
• VBoxManageDHCPServer.cpp (modified) (1 diff)
• VBoxManageDisk.cpp (modified) (6 diffs)
• VBoxManageGuestCtrl.cpp (modified) (2 diffs)
• VBoxManageGuestProp.cpp (modified) (2 diffs)
• VBoxManageHostonly.cpp (modified) (1 diff)
• VBoxManageInfo.cpp (modified) (17 diffs)
• VBoxManageList.cpp (modified) (5 diffs)
• VBoxManageMisc.cpp (modified) (5 diffs)
• VBoxManageModifyVM.cpp (modified) (1 diff)
• VBoxManageSnapshot.cpp (modified) (2 diffs)

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

@@ -269 +269 @@
     /* find a unique number - brute force rulez. */
     Utf8Str KeysUtf8(Keys);
-    const char *pszKeys = RTStrStripL(KeysUtf8.raw());
+    const char *pszKeys = RTStrStripL(KeysUtf8.c_str());
     for (unsigned i = 1; i < 1000000; i++)
     {
@@ -526 +526 @@
         HDPARENTUUID
     } uuidType;
-    
+
     if (!strcmp(argv[0], "sethduuid"))
     {
@@ -598 +598 @@
         RTPrintf("Error while setting a new UUID: %Rrc\n", rc);
     else
-        RTPrintf("UUID changed to: %s\n", uuid.toString().raw());
+        RTPrintf("UUID changed to: %s\n", uuid.toString().c_str());
 
     VDCloseAll(pDisk);
@@ -848 +848 @@
         else
         {
-            return errorSyntax(USAGE_LISTPARTITIONS, "Invalid parameter '%s'", Utf8Str(argv[i]).raw());
+            return errorSyntax(USAGE_LISTPARTITIONS, "Invalid parameter '%s'", Utf8Str(argv[i]).c_str());
         }
     }
@@ -856 +856 @@
 
     RTFILE RawFile;
-    int vrc = RTFileOpen(&RawFile, rawdisk.raw(), RTFILE_O_READ | RTFILE_O_OPEN | RTFILE_O_DENY_WRITE);
+    int vrc = RTFileOpen(&RawFile, rawdisk.c_str(), RTFILE_O_READ | RTFILE_O_OPEN | RTFILE_O_DENY_WRITE);
     if (RT_FAILURE(vrc))
     {
@@ -972 +972 @@
 #endif /* RT_OS_LINUX */
         else
-        {
-            return errorSyntax(USAGE_CREATERAWVMDK, "Invalid parameter '%s'", Utf8Str(argv[i]).raw());
-        }
+            return errorSyntax(USAGE_CREATERAWVMDK, "Invalid parameter '%s'", Utf8Str(argv[i]).c_str());
     }
 
@@ -988 +986 @@
 #endif /* RT_OS_DARWIN */
     RTFILE RawFile;
-    int vrc = RTFileOpen(&RawFile, rawdisk.raw(), RTFILE_O_READ | RTFILE_O_OPEN | RTFILE_O_DENY_WRITE);
+    int vrc = RTFileOpen(&RawFile, rawdisk.c_str(), RTFILE_O_READ | RTFILE_O_OPEN | RTFILE_O_DENY_WRITE);
     if (RT_FAILURE(vrc))
     {
-        RTPrintf("Error opening the raw disk '%s': %Rrc\n", rawdisk.raw(), vrc);
+        RTPrintf("Error opening the raw disk '%s': %Rrc\n", rawdisk.c_str(), vrc);
         goto out;
     }
@@ -1066 +1064 @@
             {
                 vrc = RTErrConvertFromErrno(errno);
-                RTPrintf("Error getting the size of the raw disk '%s': %Rrc\n", rawdisk.raw(), vrc);
+                RTPrintf("Error getting the size of the raw disk '%s': %Rrc\n", rawdisk.c_str(), vrc);
                 goto out;
             }
@@ -1073 +1071 @@
     else
     {
-        RTPrintf("File '%s' is no block device\n", rawdisk.raw());
+        RTPrintf("File '%s' is no block device\n", rawdisk.c_str());
         vrc = VERR_INVALID_PARAMETER;
         goto out;
@@ -1164 +1162 @@
     if (!cbSize || cbSize % 512)
     {
-        RTPrintf("Detected size of raw disk '%s' is %s, an invalid value\n", rawdisk.raw(), cbSize);
+        RTPrintf("Detected size of raw disk '%s' is %s, an invalid value\n", rawdisk.c_str(), cbSize);
         vrc = VERR_INVALID_PARAMETER;
         goto out;
@@ -1176 +1174 @@
     {
         RawDescriptor.fRawDisk = true;
-        RawDescriptor.pszRawDisk = rawdisk.raw();
+        RawDescriptor.pszRawDisk = rawdisk.c_str();
     }
     else
@@ -1214 +1212 @@
         if (RT_FAILURE(vrc))
         {
-            RTPrintf("Error reading the partition information from '%s'\n", rawdisk.raw());
+            RTPrintf("Error reading the partition information from '%s'\n", rawdisk.c_str());
             goto out;
         }
@@ -1245 +1243 @@
                 if (!pPartDesc)
                 {
-                    RTPrintf("Out of memory allocating the partition list for '%s'\n", rawdisk.raw());
+                    RTPrintf("Out of memory allocating the partition list for '%s'\n", rawdisk.c_str());
                     vrc = VERR_NO_MEMORY;
                     goto out;
@@ -1261 +1259 @@
                 if (!pPartData)
                 {
-                    RTPrintf("Out of memory allocating the partition descriptor for '%s'\n", rawdisk.raw());
+                    RTPrintf("Out of memory allocating the partition descriptor for '%s'\n", rawdisk.c_str());
                     vrc = VERR_NO_MEMORY;
                     goto out;
@@ -1269 +1267 @@
                 if (RT_FAILURE(vrc))
                 {
-                    RTPrintf("Cannot read partition data from raw device '%s': %Rrc\n", rawdisk.raw(), vrc);
+                    RTPrintf("Cannot read partition data from raw device '%s': %Rrc\n", rawdisk.c_str(), vrc);
                     goto out;
                 }
@@ -1303 +1301 @@
 
             /* set up values for non-relative device names */
-            const char *pszRawName = rawdisk.raw();
+            const char *pszRawName = rawdisk.c_str();
             uint64_t uStartOffset = partitions.aPartitions[i].uStart * 512;
 
@@ -1310 +1308 @@
             if (!pPartDesc)
             {
-                RTPrintf("Out of memory allocating the partition list for '%s'\n", rawdisk.raw());
+                RTPrintf("Out of memory allocating the partition list for '%s'\n", rawdisk.c_str());
                 vrc = VERR_NO_MEMORY;
                 goto out;
@@ -1322 +1320 @@
                     /* Refer to the correct partition and use offset 0. */
                     char *psz;
-                    vrc = RTStrAPrintf(&psz, "%s%u", rawdisk.raw(),
+                    vrc = RTStrAPrintf(&psz, "%s%u", rawdisk.c_str(),
                                        partitions.aPartitions[i].uIndex);
                     if (RT_FAILURE(vrc))
@@ -1446 +1444 @@
     LCHS.cHeads = 0;
     LCHS.cSectors = 0;
-    vrc = VDCreateBase(pDisk, "VMDK", Utf8Str(filename).raw(), cbSize,
+    vrc = VDCreateBase(pDisk, "VMDK", Utf8Str(filename).c_str(), cbSize,
                        VD_IMAGE_FLAGS_FIXED | VD_VMDK_IMAGE_FLAGS_RAWDISK,
                        (char *)&RawDescriptor, &PCHS, &LCHS, NULL,
@@ -1455 +1453 @@
         goto out;
     }
-    RTPrintf("RAW host disk access VMDK file %s created successfully.\n", Utf8Str(filename).raw());
+    RTPrintf("RAW host disk access VMDK file %s created successfully.\n", Utf8Str(filename).c_str());
 
     VDCloseAll(pDisk);
@@ -1514 +1512 @@
         else
         {
-            return errorSyntax(USAGE_RENAMEVMDK, "Invalid parameter '%s'", Utf8Str(argv[i]).raw());
+            return errorSyntax(USAGE_RENAMEVMDK, "Invalid parameter '%s'", Utf8Str(argv[i]).c_str());
         }
     }
@@ -1545 +1543 @@
     else
     {
-        vrc = VDOpen(pDisk, "VMDK", Utf8Str(src).raw(), VD_OPEN_FLAGS_NORMAL, NULL);
+        vrc = VDOpen(pDisk, "VMDK", Utf8Str(src).c_str(), VD_OPEN_FLAGS_NORMAL, NULL);
         if (RT_FAILURE(vrc))
         {
@@ -1552 +1550 @@
         else
         {
-            vrc = VDCopy(pDisk, 0, pDisk, "VMDK", Utf8Str(dst).raw(), true, 0, VD_IMAGE_FLAGS_NONE, NULL, NULL, NULL, NULL);
+            vrc = VDCopy(pDisk, 0, pDisk, "VMDK", Utf8Str(dst).c_str(), true, 0, VD_IMAGE_FLAGS_NONE, NULL, NULL, NULL, NULL);
             if (RT_FAILURE(vrc))
             {
@@ -1596 +1594 @@
         else
         {
-            return errorSyntax(USAGE_CONVERTTORAW, "Invalid parameter '%s'", Utf8Str(argv[i]).raw());
+            return errorSyntax(USAGE_CONVERTTORAW, "Invalid parameter '%s'", Utf8Str(argv[i]).c_str());
         }
     }
@@ -1632 +1630 @@
         outFile = 1;
     else
-        vrc = RTFileOpen(&outFile, Utf8Str(dst).raw(), RTFILE_O_WRITE | RTFILE_O_CREATE | RTFILE_O_DENY_ALL);
+        vrc = RTFileOpen(&outFile, Utf8Str(dst).c_str(), RTFILE_O_WRITE | RTFILE_O_CREATE | RTFILE_O_DENY_ALL);
     if (RT_FAILURE(vrc))
     {
         VDCloseAll(pDisk);
-        RTPrintf("Error while creating destination file \"%s\": %Rrc\n", Utf8Str(dst).raw(), vrc);
+        RTPrintf("Error while creating destination file \"%s\": %Rrc\n", Utf8Str(dst).c_str(), vrc);
         return 1;
     }
@@ -1643 +1641 @@
     {
         char *pszFormat = NULL;
-        vrc = VDGetFormat(NULL, Utf8Str(src).raw(), &pszFormat);
+        vrc = VDGetFormat(NULL, Utf8Str(src).c_str(), &pszFormat);
         if (RT_FAILURE(vrc))
         {
@@ -1650 +1648 @@
             {
                 RTFileClose(outFile);
-                RTFileDelete(Utf8Str(dst).raw());
+                RTFileDelete(Utf8Str(dst).c_str());
             }
             RTPrintf("No file format specified and autodetect failed - please specify format: %Rrc\n", vrc);
@@ -1658 +1656 @@
         RTStrFree(pszFormat);
     }
-    vrc = VDOpen(pDisk, Utf8Str(srcformat).raw(), Utf8Str(src).raw(), VD_OPEN_FLAGS_READONLY, NULL);
+    vrc = VDOpen(pDisk, Utf8Str(srcformat).c_str(), Utf8Str(src).c_str(), VD_OPEN_FLAGS_READONLY, NULL);
     if (RT_FAILURE(vrc))
     {
@@ -1665 +1663 @@
         {
             RTFileClose(outFile);
-            RTFileDelete(Utf8Str(dst).raw());
+            RTFileDelete(Utf8Str(dst).c_str());
         }
         RTPrintf("Error while opening the source image: %Rrc\n", vrc);
@@ -1678 +1676 @@
     if (pvBuf)
     {
-        RTPrintf("Converting image \"%s\" with size %RU64 bytes (%RU64MB) to raw...\n", Utf8Str(src).raw(), cbSize, (cbSize + _1M - 1) / _1M);
+        RTPrintf("Converting image \"%s\" with size %RU64 bytes (%RU64MB) to raw...\n", Utf8Str(src).c_str(), cbSize, (cbSize + _1M - 1) / _1M);
         while (offFile < cbSize)
         {
@@ -1696 +1694 @@
             {
                 RTFileClose(outFile);
-                RTFileDelete(Utf8Str(dst).raw());
+                RTFileDelete(Utf8Str(dst).c_str());
             }
             RTPrintf("Error copying image data: %Rrc\n", vrc);
@@ -1709 +1707 @@
         {
             RTFileClose(outFile);
-            RTFileDelete(Utf8Str(dst).raw());
+            RTFileDelete(Utf8Str(dst).c_str());
         }
         RTPrintf("Error allocating read buffer: %Rrc\n", vrc);
@@ -1762 +1760 @@
         else
         {
-            return errorSyntax(USAGE_CONVERTHD, "Invalid parameter '%s'", Utf8Str(argv[i]).raw());
+            return errorSyntax(USAGE_CONVERTHD, "Invalid parameter '%s'", Utf8Str(argv[i]).c_str());
         }
     }
@@ -1790 +1788 @@
         {
             char *pszFormat = NULL;
-            vrc = VDGetFormat(NULL, Utf8Str(src).raw(), &pszFormat);
+            vrc = VDGetFormat(NULL, Utf8Str(src).c_str(), &pszFormat);
             if (RT_FAILURE(vrc))
             {
@@ -1808 +1806 @@
 
         /* Open the input image */
-        vrc = VDOpen(pSrcDisk, Utf8Str(srcformat).raw(), Utf8Str(src).raw(), VD_OPEN_FLAGS_READONLY, NULL);
+        vrc = VDOpen(pSrcDisk, Utf8Str(srcformat).c_str(), Utf8Str(src).c_str(), VD_OPEN_FLAGS_READONLY, NULL);
         if (RT_FAILURE(vrc))
         {
@@ -1827 +1825 @@
 
         uint64_t cbSize = VDGetSize(pSrcDisk, VD_LAST_IMAGE);
-        RTPrintf("Converting image \"%s\" with size %RU64 bytes (%RU64MB)...\n", Utf8Str(src).raw(), cbSize, (cbSize + _1M - 1) / _1M);
+        RTPrintf("Converting image \"%s\" with size %RU64 bytes (%RU64MB)...\n", Utf8Str(src).c_str(), cbSize, (cbSize + _1M - 1) / _1M);
 
         /* Create the output image */
-        vrc = VDCopy(pSrcDisk, VD_LAST_IMAGE, pDstDisk, Utf8Str(dstformat).raw(),
-                     Utf8Str(dst).raw(), false, 0, VD_VMDK_IMAGE_FLAGS_STREAM_OPTIMIZED, NULL, NULL, NULL, NULL);
+        vrc = VDCopy(pSrcDisk, VD_LAST_IMAGE, pDstDisk, Utf8Str(dstformat).c_str(),
+                     Utf8Str(dst).c_str(), false, 0, VD_VMDK_IMAGE_FLAGS_STREAM_OPTIMIZED, NULL, NULL, NULL, NULL);
         if (RT_FAILURE(vrc))
         {
@@ -2036 +2034 @@
 
     /* default: */
-    return errorSyntax(USAGE_ALL, "Invalid command '%s'", Utf8Str(a->argv[0]).raw());
-}
-
+    return errorSyntax(USAGE_ALL, "Invalid command '%s'", Utf8Str(a->argv[0]).c_str());
+}
+

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

@@ -407 +407 @@
     }
     if (!s_commandHandlers[commandIndex].command)
-    {
-        rc = errorSyntax(USAGE_ALL, "Invalid command '%s'", Utf8Str(argv[iCmd]).raw());
-    }
+        rc = errorSyntax(USAGE_ALL, "Invalid command '%s'", Utf8Str(argv[iCmd]).c_str());
 
     /* Although all handlers should always close the session if they open it,

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

@@ -298 +298 @@
                 else
                 {
-                    errorArgument("Invalid link state '%s'", Utf8Str(a->argv[2]).raw());
+                    errorArgument("Invalid link state '%s'", Utf8Str(a->argv[2]).c_str());
                     rc = E_FAIL;
                     break;
@@ -397 +397 @@
                     else
                     {
-                        errorArgument("Invalid nictrace%lu argument '%s'", n, Utf8Str(a->argv[2]).raw());
+                        errorArgument("Invalid nictrace%lu argument '%s'", n, Utf8Str(a->argv[2]).c_str());
                         rc = E_FAIL;
                         break;
@@ -491 +491 @@
                     else
                     {
-                        errorArgument("Invalid type '%s' specfied for NIC %lu", Utf8Str(a->argv[2]).raw(), n);
+                        errorArgument("Invalid type '%s' specfied for NIC %lu", Utf8Str(a->argv[2]).c_str(), n);
                         rc = E_FAIL;
                         break;
@@ -528 +528 @@
                 else
                 {
-                    errorArgument("Invalid vrdp server state '%s'", Utf8Str(a->argv[2]).raw());
+                    errorArgument("Invalid vrdp server state '%s'", Utf8Str(a->argv[2]).c_str());
                     rc = E_FAIL;
                     break;
@@ -876 +876 @@
         else
         {
-            errorSyntax(USAGE_CONTROLVM, "Invalid parameter '%s'", Utf8Str(a->argv[1]).raw());
+            errorSyntax(USAGE_CONTROLVM, "Invalid parameter '%s'", Utf8Str(a->argv[1]).c_str());
             rc = E_FAIL;
         }

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

@@ -308 +308 @@
         else
         {
-            result = errorSyntax(USAGE_DHCPSERVER, "Invalid parameter '%s'", Utf8Str(a->argv[i]).raw());
+            result = errorSyntax(USAGE_DHCPSERVER, "Invalid parameter '%s'", Utf8Str(a->argv[i]).c_str());
             break;
         }

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

@@ -312 +312 @@
                 }
 
-                RTPrintf("Disk image created. UUID: %s\n", Utf8Str(uuid).raw());
+                RTPrintf("Disk image created. UUID: %s\n", Utf8Str(uuid).c_str());
             }
         }
@@ -628 +628 @@
             if (RT_FAILURE(irc))
             {
-                RTPrintf("Cannot convert filename \"%s\" to absolute path\n", Utf8Str(src).raw());
+                RTPrintf("Cannot convert filename \"%s\" to absolute path\n", Utf8Str(src).c_str());
                 return 1;
             }
@@ -662 +662 @@
                     if (RT_FAILURE(irc))
                     {
-                        RTPrintf("Cannot convert filename \"%s\" to absolute path\n", Utf8Str(dst).raw());
+                        RTPrintf("Cannot convert filename \"%s\" to absolute path\n", Utf8Str(dst).c_str());
                         return 1;
                     }
@@ -708 +708 @@
 
         RTPrintf("Clone hard disk created in format '%ls'. UUID: %s\n",
-                 format.raw(), Utf8Str(uuid).raw());
+                 format.raw(), Utf8Str(uuid).c_str());
     }
     while (0);
@@ -1093 +1093 @@
         Bstr guid;
         CHECK_ERROR(hardDisk, COMGETTER(Id)(guid.asOutParam()));
-        RTPrintf("iSCSI disk created. UUID: %s\n", Utf8Str(guid).raw());
+        RTPrintf("iSCSI disk created. UUID: %s\n", Utf8Str(guid).c_str());
     }
     while (0);
@@ -1186 +1186 @@
 
         hardDisk->COMGETTER(Id)(uuid.asOutParam());
-        RTPrintf("UUID:                 %s\n", Utf8Str(uuid).raw());
+        RTPrintf("UUID:                 %s\n", Utf8Str(uuid).c_str());
 
         /* check for accessibility */

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

@@ -253 +253 @@
         }
         else if (!strcmp(a->argv[i], "--verbose"))
-        {
             fVerbose = true;
-        }
         /** @todo Add fancy piping stuff here. */
         else
-        {
             return errorSyntax(USAGE_GUESTCONTROL,
-                               "Invalid parameter '%s'", Utf8Str(a->argv[i]).raw());
-        }
+                               "Invalid parameter '%s'", Utf8Str(a->argv[i]).c_str());
     }
 
@@ -333 +329 @@
             }
             if (fVerbose)
-                RTPrintf("Process '%s' (PID: %u) started\n", Utf8Cmd.raw(), uPID);
+                RTPrintf("Process '%s' (PID: %u) started\n", Utf8Cmd.c_str(), uPID);
             if (fWaitForExit)
             {

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

@@ -197 +197 @@
     Utf8Str Utf8Patterns(a->argc > 2 ? a->argv[2] : "");
     for (int i = 3; i < a->argc; ++i)
-        Utf8Patterns = Utf8StrFmt ("%s,%s", Utf8Patterns.raw(), a->argv[i]);
+        Utf8Patterns = Utf8StrFmt ("%s,%s", Utf8Patterns.c_str(), a->argv[i]);
 
     /*
@@ -335 +335 @@
                     gpcev->COMGETTER(Name)(aNextName.asOutParam());
                     if (RTStrSimplePatternMultiMatch(pszPatterns, RTSTR_MAX,
-                                                     Utf8Str(aNextName).raw(), RTSTR_MAX, NULL))
+                                                     Utf8Str(aNextName).c_str(), RTSTR_MAX, NULL))
                     {
                         Bstr aNextValue, aNextFlags;

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

@@ -319 +319 @@
         else
         {
-            result = errorSyntax(USAGE_HOSTONLYIFS, "Invalid parameter '%s'", Utf8Str(a->argv[i]).raw());
+            result = errorSyntax(USAGE_HOSTONLYIFS, "Invalid parameter '%s'", Utf8Str(a->argv[i]).c_str());
             break;
         }

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

@@ -59 +59 @@
         /* print with hierarchical numbering */
         RTPrintf("SnapshotName%lS=\"%lS\"\n", prefix.raw(), name.raw());
-        RTPrintf("SnapshotUUID%lS=\"%s\"\n", prefix.raw(), Utf8Str(uuid).raw());
+        RTPrintf("SnapshotUUID%lS=\"%s\"\n", prefix.raw(), Utf8Str(uuid).c_str());
     }
     else
@@ -68 +68 @@
                  prefix.raw(),
                  name.raw(),
-                 Utf8Str(uuid).raw(),
+                 Utf8Str(uuid).c_str(),
                  (fCurrent) ? " *" : "");
     }
@@ -151 +151 @@
     {
         if (details == VMINFO_COMPACT)
-            RTPrintf("\"<inaccessible>\" {%s}\n", Utf8Str(uuid).raw());
+            RTPrintf("\"<inaccessible>\" {%s}\n", Utf8Str(uuid).c_str());
         else
         {
@@ -159 +159 @@
                 RTPrintf("Name:            <inaccessible!>\n");
             if (details == VMINFO_MACHINEREADABLE)
-                RTPrintf("UUID=\"%s\"\n", Utf8Str(uuid).raw());
-            else
-                RTPrintf("UUID:            %s\n", Utf8Str(uuid).raw());
+                RTPrintf("UUID=\"%s\"\n", Utf8Str(uuid).c_str());
+            else
+                RTPrintf("UUID:            %s\n", Utf8Str(uuid).c_str());
             if (details != VMINFO_MACHINEREADABLE)
             {
@@ -183 +183 @@
     if (details == VMINFO_COMPACT)
     {
-        RTPrintf("\"%lS\" {%s}\n", machineName.raw(), Utf8Str(uuid).raw());
+        RTPrintf("\"%lS\" {%s}\n", machineName.raw(), Utf8Str(uuid).c_str());
         return S_OK;
     }
@@ -204 +204 @@
 
     if (details == VMINFO_MACHINEREADABLE)
-        RTPrintf("UUID=\"%s\"\n", Utf8Str(uuid).raw());
-    else
-        RTPrintf("UUID:            %s\n", Utf8Str(uuid).raw());
+        RTPrintf("UUID=\"%s\"\n", Utf8Str(uuid).c_str());
+    else
+        RTPrintf("UUID:            %s\n", Utf8Str(uuid).c_str());
 
     Bstr settingsFilePath;
@@ -694 +694 @@
                                  i, k, filePath.raw());
                         RTPrintf("\"%lS-ImageUUID-%d-%d\"=\"%s\"\n",
-                                 storageCtlName.raw(), i, k, Utf8Str(uuid).raw());
+                                 storageCtlName.raw(), i, k, Utf8Str(uuid).c_str());
                         if (fPassthrough)
                             RTPrintf("\"%lS-dvdpassthrough\"=\"%s\"\n", storageCtlName.raw(),
@@ -703 +703 @@
                         RTPrintf("%lS (%d, %d): %lS (UUID: %s)",
                                  storageCtlName.raw(), i, k, filePath.raw(),
-                                 Utf8Str(uuid).raw());
+                                 Utf8Str(uuid).c_str());
                         if (fPassthrough)
                             RTPrintf(" (passthrough enabled)");
@@ -790 +790 @@
                                 if (pos == Utf8Str::npos)                       \
                                 {                                               \
-                                    Log(( #res " extracting from %s is failed\n", str.raw())); \
+                                    Log(( #res " extracting from %s is failed\n", str.c_str())); \
                                     fSkip = true;                               \
                                 }                                               \
                                 res = str.substr(ppos, pos - ppos);             \
-                                Log2((#res " %s pos:%d, ppos:%d\n", res.raw(), pos, ppos)); \
+                                Log2((#res " %s pos:%d, ppos:%d\n", res.c_str(), pos, ppos)); \
                                 ppos = pos + 1;                                 \
                             } while (0)
@@ -824 +824 @@
                             {
                                 strNatForwardings = Utf8StrFmt("%sForwarding(%d)=\"%s,%s,%s,%s,%s,%s\"\n",
-                                    strNatForwardings.raw(), i, strName.raw(), strProto.raw(),
-                                    strHostIP.isEmpty() ? "": strHostIP.raw(), strHostPort.raw(),
-                                    strGuestIP.isEmpty() ? "": strGuestIP.raw(), strGuestPort.raw());
+                                    strNatForwardings.c_str(), i, strName.c_str(), strProto.c_str(),
+                                    strHostIP.c_str(), strHostPort.c_str(),
+                                    strGuestIP.c_str(), strGuestPort.c_str());
                             }
                             else
@@ -832 +832 @@
                                 strNatForwardings = Utf8StrFmt("%sNIC %d Rule(%d):   name = %s, protocol = %s,"
                                     " host ip = %s, host port = %s, guest ip = %s, guest port = %s\n",
-                                    strNatForwardings.raw(), currentNIC + 1, i, strName.raw(), strProto.raw(),
-                                    strHostIP.isEmpty() ? "": strHostIP.raw(), strHostPort.raw(),
-                                    strGuestIP.isEmpty() ? "": strGuestIP.raw(), strGuestPort.raw());
+                                    strNatForwardings.c_str(), currentNIC + 1, i, strName.c_str(), strProto.c_str(),
+                                    strHostIP.c_str(), strHostPort.c_str(),
+                                    strGuestIP.c_str(), strGuestPort.c_str());
                             }
                         }
@@ -882 +882 @@
                         }
                         else
-                            strAttachment = Utf8StrFmt("Internal Network '%s'", Utf8Str(strNetwork).raw());
+                            strAttachment = Utf8StrFmt("Internal Network '%s'", Utf8Str(strNetwork).c_str());
                         break;
                     }
@@ -974 +974 @@
                     RTPrintf("macaddress%d=\"%lS\"\n", currentNIC + 1, strMACAddress.raw());
                     RTPrintf("cableconnected%d=\"%s\"\n", currentNIC + 1, fConnected ? "on" : "off");
-                    RTPrintf("nic%d=\"%s\"\n", currentNIC + 1, strAttachment.raw());
+                    RTPrintf("nic%d=\"%s\"\n", currentNIC + 1, strAttachment.c_str());
                 }
                 else
                     RTPrintf("NIC %d:           MAC: %lS, Attachment: %s, Cable connected: %s, Trace: %s (file: %lS), Type: %s, Reported speed: %d Mbps, Boot priority: %d\n",
-                             currentNIC + 1, strMACAddress.raw(), strAttachment.raw(),
+                             currentNIC + 1, strMACAddress.raw(), strAttachment.c_str(),
                              fConnected ? "on" : "off",
                              fTraceEnabled ? "on" : "off",
                              traceFile.isEmpty() ? Bstr("none").raw() : traceFile.raw(),
-                             strNICType.raw(),
+                             strNICType.c_str(),
                              ulLineSpeed / 1000,
                              (int)ulBootPriority);
                 if (strNatSettings.length())
-                    RTPrintf(strNatSettings.raw());
+                    RTPrintf(strNatSettings.c_str());
                 if (strNatForwardings.length())
-                    RTPrintf(strNatForwardings.raw());
+                    RTPrintf(strNatForwardings.c_str());
             }
         }
@@ -1537 +1537 @@
                                      "USBRemoteProductId%zu=\"%#06x\"\n"
                                      "USBRemoteRevision%zu=\"%#04x%02x\"\n",
-                                     index + 1, Utf8Str(id).raw(),
+                                     index + 1, Utf8Str(id).c_str(),
                                      index + 1, usVendorId,
                                      index + 1, usProductId,
@@ -1546 +1546 @@
                                      "ProductId:          0x%04x (%04X)\n"
                                      "Revision:           %u.%u (%02u%02u)\n",
-                                     Utf8Str(id).raw(),
+                                     Utf8Str(id).c_str(),
                                      usVendorId, usVendorId, usProductId, usProductId,
                                      bcdRevision >> 8, bcdRevision & 0xff,
@@ -1626 +1626 @@
                                      "USBAttachedProductId%zu=\"%#06x\"\n"
                                      "USBAttachedRevision%zu=\"%#04x%02x\"\n",
-                                     index + 1, Utf8Str(id).raw(),
+                                     index + 1, Utf8Str(id).c_str(),
                                      index + 1, usVendorId,
                                      index + 1, usProductId,
@@ -1635 +1635 @@
                                      "ProductId:          0x%04x (%04X)\n"
                                      "Revision:           %u.%u (%02u%02u)\n",
-                                     Utf8Str(id).raw(),
+                                     Utf8Str(id).c_str(),
                                      usVendorId, usVendorId, usProductId, usProductId,
                                      bcdRevision >> 8, bcdRevision & 0xff,

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

@@ -73 +73 @@
         Bstr uuid;
         pMedium->COMGETTER(Id)(uuid.asOutParam());
-        RTPrintf("UUID:        %s\n", Utf8Str(uuid).raw());
+        RTPrintf("UUID:        %s\n", Utf8Str(uuid).c_str());
         if (pszParentUUIDStr)
             RTPrintf("Parent UUID: %s\n", pszParentUUIDStr);
@@ -167 +167 @@
         {
             // depth first listing of child media
-            listMedia(aVirtualBox, children, Utf8Str(uuid).raw());
+            listMedia(aVirtualBox, children, Utf8Str(uuid).c_str());
         }
     }
@@ -391 +391 @@
                     Bstr uuid;
                     dvdDrive->COMGETTER(Id)(uuid.asOutParam());
-                    RTPrintf("UUID:         %s\n", Utf8Str(uuid).raw());
+                    RTPrintf("UUID:         %s\n", Utf8Str(uuid).c_str());
                     Bstr name;
                     dvdDrive->COMGETTER(Name)(name.asOutParam());
@@ -413 +413 @@
                     Bstr uuid;
                     floppyDrive->COMGETTER(Id)(uuid.asOutParam());
-                    RTPrintf("UUID:         %s\n", Utf8Str(uuid).raw());
+                    RTPrintf("UUID:         %s\n", Utf8Str(uuid).c_str());
                     Bstr name;
                     floppyDrive->COMGETTER(Name)(name.asOutParam());
@@ -706 +706 @@
                             "ProductId:          0x%04x (%04X)\n"
                             "Revision:           %u.%u (%02u%02u)\n",
-                            Utf8Str(id).raw(),
+                            Utf8Str(id).c_str(),
                             usVendorId, usVendorId, usProductId, usProductId,
                             bcdRevision >> 8, bcdRevision & 0xff,

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

@@ -238 +238 @@
         }
         else
-            return errorSyntax(USAGE_CREATEVM, "Invalid parameter '%s'", Utf8Str(a->argv[i]).raw());
+            return errorSyntax(USAGE_CREATEVM, "Invalid parameter '%s'", Utf8Str(a->argv[i]).c_str());
     }
     if (!name)
@@ -269 +269 @@
                  "Settings file: '%ls'\n",
                  name.raw(), fRegister ? " and registered" : "",
-                 Utf8Str(uuid).raw(), settingsFile.raw());
+                 Utf8Str(uuid).c_str(), settingsFile.raw());
     }
     while (0);
@@ -719 +719 @@
             }
             else
-                return errorSyntax(USAGE_SHAREDFOLDER_ADD, "Invalid parameter '%s'", Utf8Str(a->argv[i]).raw());
+                return errorSyntax(USAGE_SHAREDFOLDER_ADD, "Invalid parameter '%s'", Utf8Str(a->argv[i]).c_str());
         }
 
@@ -789 +789 @@
             }
             else
-                return errorSyntax(USAGE_SHAREDFOLDER_REMOVE, "Invalid parameter '%s'", Utf8Str(a->argv[i]).raw());
+                return errorSyntax(USAGE_SHAREDFOLDER_REMOVE, "Invalid parameter '%s'", Utf8Str(a->argv[i]).c_str());
         }
 
@@ -828 +828 @@
     }
     else
-        return errorSyntax(USAGE_SETPROPERTY, "Invalid parameter '%s'", Utf8Str(a->argv[0]).raw());
+        return errorSyntax(USAGE_SETPROPERTY, "Invalid parameter '%s'", Utf8Str(a->argv[0]).c_str());
 
     return 0;

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

@@ -339 +339 @@
                 else
                 {
-                    errorArgument("Invalid guest OS type '%s'", Utf8Str(ValueUnion.psz).raw());
+                    errorArgument("Invalid guest OS type '%s'", Utf8Str(ValueUnion.psz).c_str());
                     rc = E_FAIL;
                 }

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

@@ -456 +456 @@
                 else
                 {
-                    errorSyntax(USAGE_SNAPSHOT, "Invalid parameter '%s'", Utf8Str(a->argv[i]).raw());
+                    errorSyntax(USAGE_SNAPSHOT, "Invalid parameter '%s'", Utf8Str(a->argv[i]).c_str());
                     rc = E_FAIL;
                     break;
@@ -489 +489 @@
         }
         else if (!strcmp(a->argv[1], "dump"))          // undocumented parameter to debug snapshot info
-        {
             DumpSnapshot(pMachine);
-        }
         else
         {
-            errorSyntax(USAGE_SNAPSHOT, "Invalid parameter '%s'", Utf8Str(a->argv[1]).raw());
+            errorSyntax(USAGE_SNAPSHOT, "Invalid parameter '%s'", Utf8Str(a->argv[1]).c_str());
             rc = E_FAIL;
         }