Changeset 91518 in vbox

Timestamp:

Oct 1, 2021 2:31:06 PM (3 years ago)

Author:

vboxsync

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

147210

Message:

Main/GuestCtrl: Use RTCString::printf instead of Utf8StrFmt + assignment operator. Also, use %Rrc instead of RTErrQueryDefine + %s.

Location:

trunk/src/VBox/Main/src-client

Files:

• GuestDirectoryImpl.cpp (modified) (2 diffs)
• GuestFileImpl.cpp (modified) (2 diffs)
• GuestProcessImpl.cpp (modified) (5 diffs)

trunk/src/VBox/Main/src-client/GuestDirectoryImpl.cpp

@@ -83 +83 @@
         /* Start the directory process on the guest. */
         GuestProcessStartupInfo procInfo;
-        procInfo.mName      = Utf8StrFmt(tr("Opening directory \"%s\""), openInfo.mPath.c_str());
+        procInfo.mName.printf(tr("Opening directory \"%s\""), openInfo.mPath.c_str());
         procInfo.mTimeoutMS = 5 * 60 * 1000; /* 5 minutes timeout. */
         procInfo.mFlags     = ProcessCreateFlag_WaitForStdOut;
@@ -236 +236 @@
 
     Utf8Str strErr;
-
+    switch (rcGuest)
+    {
 #define CASE_MSG(a_iRc, ...) \
-    case a_iRc: strErr = Utf8StrFmt(__VA_ARGS__); break;
-
-    /** @todo pData->u32Flags: int vs. uint32 -- IPRT errors are *negative* !!! */
-    switch (rcGuest)
-    {
+        case a_iRc: strErr.printf(__VA_ARGS__); break;
         CASE_MSG(VERR_CANT_CREATE  , tr("Access to guest directory \"%s\" is denied"), pcszWhat);
         CASE_MSG(VERR_DIR_NOT_EMPTY, tr("Guest directory \"%s\" is not empty"), pcszWhat);
         default:
-        {
-            char szDefine[80];
-            RTErrQueryDefine(rcGuest, szDefine, sizeof(szDefine), false /*fFailIfUnknown*/);
-            strErr = Utf8StrFmt(tr("Error %s for guest directory \"%s\" occurred\n"), szDefine, pcszWhat);
+            strErr.printf(tr("Error %Rrc for guest directory \"%s\" occurred\n"), rcGuest, pcszWhat);
             break;
-        }
     }
 

trunk/src/VBox/Main/src-client/GuestFileImpl.cpp

@@ -416 +416 @@
 
     Utf8Str strErr;
-
+    switch (rcGuest)
+    {
 #define CASE_MSG(a_iRc, ...) \
-    case a_iRc: strErr = Utf8StrFmt(__VA_ARGS__); break;
-
-    /** @todo pData->u32Flags: int vs. uint32 -- IPRT errors are *negative* !!! */
-    switch (rcGuest)
-    {
+        case a_iRc: strErr.printf(__VA_ARGS__); break;
         CASE_MSG(VERR_ACCESS_DENIED     , tr("Access to guest file \"%s\" denied"), pcszWhat);
         CASE_MSG(VERR_ALREADY_EXISTS    , tr("Guest file \"%s\" already exists"), pcszWhat);
@@ -429 +426 @@
         CASE_MSG(VERR_SHARING_VIOLATION , tr("Sharing violation for guest file \"%s\""), pcszWhat);
         default:
-        {
-            char szDefine[80];
-            RTErrQueryDefine(rcGuest, szDefine, sizeof(szDefine), false /*fFailIfUnknown*/);
-            strErr = Utf8StrFmt(tr("Error %s for guest file \"%s\" occurred\n"), szDefine, pcszWhat);
-            break;
-        }
-    }
-
+            strErr.printf(tr("Error %Rrc for guest file \"%s\" occurred\n"), rcGuest, pcszWhat);
+            break;
 #undef CASE_MSG
+    }
 
     return strErr;

trunk/src/VBox/Main/src-client/GuestProcessImpl.cpp

@@ -500 +500 @@
 
     Utf8Str strErr;
-
+    switch (rcGuest)
+    {
 #define CASE_MSG(a_iRc, ...) \
-    case a_iRc: strErr = Utf8StrFmt( __VA_ARGS__); break;
-
-    /** @todo pData->u32Flags: int vs. uint32 -- IPRT errors are *negative* !!! */
-    switch (rcGuest)
-    {
+        case a_iRc: strErr.printf(__VA_ARGS__); break;
+
         CASE_MSG(VERR_FILE_NOT_FOUND,                 tr("No such file or directory \"%s\" on guest"), pcszWhat); /* This is the most likely error. */
         CASE_MSG(VERR_PATH_NOT_FOUND,                 tr("No such file or directory \"%s\" on guest"), pcszWhat);
@@ -519 +517 @@
         CASE_MSG(VERR_NOT_FOUND,                      tr("The guest execution service is not ready (yet)"));
         default:
-        {
-            char szDefine[80];
-            RTErrQueryDefine(rcGuest, szDefine, sizeof(szDefine), false /*fFailIfUnknown*/);
-            strErr = Utf8StrFmt(tr("Error %s for guest process \"%s\" occurred\n"), szDefine, pcszWhat);
-            break;
-        }
-    }
-
+            strErr.printf(tr("Error %Rrc for guest process \"%s\" occurred\n"), rcGuest, pcszWhat);
+            break;
 #undef CASE_MSG
+    }
 
     return strErr;
@@ -2611 +2604 @@
 
 /* static */
-Utf8Str GuestProcessTool::guestErrorToString(const char *pszTool, const GuestErrorInfo& guestErrorInfo)
+Utf8Str GuestProcessTool::guestErrorToString(const char *pszTool, const GuestErrorInfo &guestErrorInfo)
 {
     Utf8Str strErr;
@@ -2619 +2612 @@
     {
         case VERR_ACCESS_DENIED:
-            strErr = Utf8StrFmt(tr("Access to \"%s\" denied"), guestErrorInfo.getWhat().c_str());
+            strErr.printf(tr("Access to \"%s\" denied"), guestErrorInfo.getWhat().c_str());
             break;
 
@@ -2625 +2618 @@
             RT_FALL_THROUGH();
         case VERR_PATH_NOT_FOUND:
-            strErr = Utf8StrFmt(tr("No such file or directory \"%s\""), guestErrorInfo.getWhat().c_str());
+            strErr.printf(tr("No such file or directory \"%s\""), guestErrorInfo.getWhat().c_str());
             break;
 
         case VERR_INVALID_VM_HANDLE:
-            strErr = Utf8StrFmt(tr("VMM device is not available (is the VM running?)"));
+            strErr.printf(tr("VMM device is not available (is the VM running?)"));
             break;
 
         case VERR_HGCM_SERVICE_NOT_FOUND:
-            strErr = Utf8StrFmt(tr("The guest execution service is not available"));
+            strErr.printf(tr("The guest execution service is not available"));
             break;
 
         case VERR_BAD_EXE_FORMAT:
-            strErr = Utf8StrFmt(tr("The file \"%s\" is not an executable format"),
-                                guestErrorInfo.getWhat().c_str());
+            strErr.printf(tr("The file \"%s\" is not an executable format"), guestErrorInfo.getWhat().c_str());
             break;
 
         case VERR_AUTHENTICATION_FAILURE:
-            strErr = Utf8StrFmt(tr("The user \"%s\" was not able to logon"), guestErrorInfo.getWhat().c_str());
+            strErr.printf(tr("The user \"%s\" was not able to logon"), guestErrorInfo.getWhat().c_str());
             break;
 
         case VERR_INVALID_NAME:
-            strErr = Utf8StrFmt(tr("The file \"%s\" is an invalid name"), guestErrorInfo.getWhat().c_str());
+            strErr.printf(tr("The file \"%s\" is an invalid name"), guestErrorInfo.getWhat().c_str());
             break;
 
         case VERR_TIMEOUT:
-            strErr = Utf8StrFmt(tr("The guest did not respond within time"));
+            strErr.printf(tr("The guest did not respond within time"));
             break;
 
         case VERR_CANCELLED:
-            strErr = Utf8StrFmt(tr("The execution operation was canceled"));
+            strErr.printf(tr("The execution operation was canceled"));
             break;
 
         case VERR_GSTCTL_MAX_CID_OBJECTS_REACHED:
-            strErr = Utf8StrFmt(tr("Maximum number of concurrent guest processes has been reached"));
+            strErr.printf(tr("Maximum number of concurrent guest processes has been reached"));
             break;
 
         case VERR_NOT_FOUND:
-            strErr = Utf8StrFmt(tr("The guest execution service is not ready (yet)"));
+            strErr.printf(tr("The guest execution service is not ready (yet)"));
             break;
 
         default:
-            strErr = Utf8StrFmt(tr("Unhandled error %Rrc for \"%s\" occurred for tool \"%s\" on guest -- please file a bug report"),
-                                guestErrorInfo.getRc(), guestErrorInfo.getWhat().c_str(), pszTool);
+            strErr.printf(tr("Unhandled error %Rrc for \"%s\" occurred for tool \"%s\" on guest -- please file a bug report"),
+                          guestErrorInfo.getRc(), guestErrorInfo.getWhat().c_str(), pszTool);
             break;
     }