Changeset 32701 in vbox for trunk/src/VBox/Frontends/VBoxManage/VBoxManageImport.cpp

Timestamp:

Sep 22, 2010 5:12:01 PM (15 years ago)

Author:

vboxsync

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

66128

Message:

Frontends/VBoxManage: Error printing cleanup, use stderr and consistent formatting. Small cleanups (like using Keyboard::PutScancodes instead of the more clumsy Keyboard::PutScancode and fixing the incorrect comment which attracted my attention).

File:

• trunk/src/VBox/Frontends/VBoxManage/VBoxManageImport.cpp (modified) (6 diffs)

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2009 Oracle Corporation
+ * Copyright (C) 2009-2010 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -265 +265 @@
         // call interpret(); this can yield both warnings and errors, so we need
         // to tinker with the error info a bit
-        RTPrintf("Interpreting %ls...\n", path.raw());
+        RTStrmPrintf(g_pStdErr, "Interpreting %ls...\n", path.raw());
         rc = pAppliance->Interpret();
         com::ErrorInfo info0(pAppliance, COM_IIDOF(IAppliance));
@@ -276 +276 @@
             {
                 Bstr bstrWarning(aWarnings[i]);
-                RTPrintf("WARNING: %ls.\n", bstrWarning.raw());
+                RTMsgWarning("%ls.", bstrWarning.raw());
             }
         }
@@ -287 +287 @@
         }
 
-        RTPrintf("OK.\n");
+        RTStrmPrintf(g_pStdErr, "OK.\n");
 
         // fetch all disks
@@ -693 +693 @@
 
             if (cLicensesInTheWay == 1)
-                RTPrintf("ERROR: Cannot import until the license agreement listed above is accepted.\n");
+                RTMsgError("Cannot import until the license agreement listed above is accepted.");
             else if (cLicensesInTheWay > 1)
-                RTPrintf("ERROR: Cannot import until the %c license agreements listed above are accepted.\n", cLicensesInTheWay);
+                RTMsgError("Cannot import until the %c license agreements listed above are accepted.", cLicensesInTheWay);
 
             if (!cLicensesInTheWay && fExecute)
@@ -935 +935 @@
                         else
                         {
-                            RTPrintf("ERROR: Cannot read license file \"%s\" which should be included in the virtual system %u.\n",
-                                     itD->second.c_str(),
-                                     i);
+                            RTMsgError("Cannot read license file \"%s\" which should be included in the virtual system %u.",
+                                       itD->second.c_str(), i);
                             return 1;
                         }