Changeset 38625 in vbox

Timestamp:

Sep 5, 2011 8:50:00 AM (13 years ago)

Author:

vboxsync

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

73832

Message:

VBoxService/Toolbox: Don't output error messages when writing machine readable data.

File:

• trunk/src/VBox/Additions/common/VBoxService/VBoxServiceToolBox.cpp (modified) (5 diffs)

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceToolBox.cpp

@@ -608 +608 @@
     if (RT_FAILURE(rc))
     {
-        RTMsgError("Failed to retrieve absolute path of '%s', rc=%Rrc\n", pszDir, rc);
+        if (!(uOutputFlags & VBOXSERVICETOOLBOXOUTPUTFLAG_PARSEABLE))
+            RTMsgError("Failed to retrieve absolute path of '%s', rc=%Rrc\n", pszDir, rc);
         return rc;
     }
@@ -616 +617 @@
     if (RT_FAILURE(rc))
     {
-        RTMsgError("Failed to open directory '%s', rc=%Rrc\n", szPathAbs, rc);
+        if (!(uOutputFlags & VBOXSERVICETOOLBOXOUTPUTFLAG_PARSEABLE))
+            RTMsgError("Failed to open directory '%s', rc=%Rrc\n", szPathAbs, rc);
         return rc;
     }
@@ -650 +652 @@
     if (RT_FAILURE(rc2))
     {
-        RTMsgError("Failed to close dir '%s', rc=%Rrc\n",
-                   pszDir, rc2);
+        if (!(uOutputFlags & VBOXSERVICETOOLBOXOUTPUTFLAG_PARSEABLE))
+            RTMsgError("Failed to close dir '%s', rc=%Rrc\n",
+                       pszDir, rc2);
         if (RT_SUCCESS(rc))
             rc = rc2;
@@ -838 +841 @@
                 if (RT_FAILURE(rc2))
                 {
-                    RTMsgError("Cannot access '%s': No such file or directory\n",
-                               pNodeIt->pszName);
+                    if (!(fOutputFlags & VBOXSERVICETOOLBOXOUTPUTFLAG_PARSEABLE))
+                        RTMsgError("Cannot access '%s': No such file or directory\n",
+                                   pNodeIt->pszName);
                     rc = VERR_FILE_NOT_FOUND;
                     /* Do not break here -- process every element in the list
@@ -1070 +1074 @@
             if (RT_FAILURE(rc2))
             {
-                RTMsgError("Cannot stat for '%s': No such file or directory\n",
-                           pNodeIt->pszName);
+                if (!(fOutputFlags & VBOXSERVICETOOLBOXOUTPUTFLAG_PARSEABLE))
+                    RTMsgError("Cannot stat for '%s': No such file or directory\n",
+                               pNodeIt->pszName);
                 rc = VERR_FILE_NOT_FOUND;
                 /* Do not break here -- process every element in the list