Changeset 97151 in vbox for trunk/src/VBox/Main

Timestamp:

Oct 14, 2022 8:02:41 AM (2 years ago)

Author:

vboxsync

Message:

Main/Guest Control: Resolved some @todos: Got rid of using separate Utf8Str instances when assigning format strings; instead use .printf() for that. bugref:10286

Location:

trunk/src/VBox/Main/src-client

Files:

• GuestSessionImpl.cpp (modified) (1 diff)
• GuestSessionImplTasks.cpp (modified) (14 diffs)

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

@@ -1866 +1866 @@
     {
         case VERR_INVALID_VM_HANDLE:
-            strError += Utf8StrFmt(tr("VMM device is not available (is the VM running?)"));
+            strError.printf(tr("VMM device is not available (is the VM running?)"));
             break;
 
         case VERR_HGCM_SERVICE_NOT_FOUND:
-            strError += Utf8StrFmt(tr("The guest execution service is not available"));
+            strError.printf(tr("The guest execution service is not available"));
             break;
 
         case VERR_ACCOUNT_RESTRICTED:
-            strError += Utf8StrFmt(tr("The specified user account on the guest is restricted and can't be used to logon"));
+            strError.printf(tr("The specified user account on the guest is restricted and can't be used to logon"));
             break;
 
         case VERR_AUTHENTICATION_FAILURE:
-            strError += Utf8StrFmt(tr("The specified user was not able to logon on guest"));
+            strError.printf(tr("The specified user was not able to logon on guest"));
             break;
 
         case VERR_TIMEOUT:
-            strError += Utf8StrFmt(tr("The guest did not respond within time"));
+            strError.printf(tr("The guest did not respond within time"));
             break;
 
         case VERR_CANCELLED:
-            strError += Utf8StrFmt(tr("The session operation was canceled"));
+            strError.printf(tr("The session operation was canceled"));
             break;
 
         case VERR_GSTCTL_MAX_CID_OBJECTS_REACHED:
-            strError += Utf8StrFmt(tr("Maximum number of concurrent guest processes has been reached"));
+            strError.printf(tr("Maximum number of concurrent guest processes has been reached"));
             break;
 
         case VERR_NOT_FOUND:
-            strError += Utf8StrFmt(tr("The guest execution service is not ready (yet)"));
+            strError.printf(tr("The guest execution service is not ready (yet)"));
             break;
 
         default:
-            strError += Utf8StrFmt("%Rrc", rcGuest);
+            strError.printf("%Rrc", rcGuest);
             break;
     }

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

@@ -1449 +1449 @@
     if (mDest.isEmpty())
     {
-        strErrorInfo = Utf8StrFmt(tr("Host destination must not be empty"));
+        strErrorInfo.printf(tr("Host destination must not be empty"));
         vrc = VERR_INVALID_PARAMETER;
     }
@@ -1464 +1464 @@
             if (strSrc.isEmpty())
             {
-                strErrorInfo = Utf8StrFmt(tr("Guest source entry must not be empty"));
+                strErrorInfo.printf(tr("Guest source entry must not be empty"));
                 vrc = VERR_INVALID_PARAMETER;
                 break;
@@ -1501 +1501 @@
                                                                GuestErrorInfo(GuestErrorInfo::Type_ToolStat, vrcGuest, strSrc.c_str()));
                 else
-                    strErrorInfo = Utf8StrFmt(tr("Guest file lookup for \"%s\" failed: %Rrc"),
-                                              strSrc.c_str(), vrc);
+                    strErrorInfo.printf(tr("Guest file lookup for \"%s\" failed: %Rrc"),
+                                        strSrc.c_str(), vrc);
                 break;
             }
@@ -1510 +1510 @@
                 if (itSrc->enmType != FsObjType_Directory)
                 {
-                    strErrorInfo = Utf8StrFmt(tr("Guest source is not a file: %s"), strSrc.c_str());
+                    strErrorInfo.printf(tr("Guest source is not a file: %s"), strSrc.c_str());
                     vrc = VERR_NOT_A_FILE;
                     break;
@@ -1519 +1519 @@
                 if (itSrc->enmType != FsObjType_File)
                 {
-                    strErrorInfo = Utf8StrFmt(tr("Guest source is not a directory: %s"), strSrc.c_str());
+                    strErrorInfo.printf(tr("Guest source is not a directory: %s"), strSrc.c_str());
                     vrc = VERR_NOT_A_DIRECTORY;
                     break;
@@ -1541 +1541 @@
                 {
                     delete pFsList;
-                    strErrorInfo = Utf8StrFmt(tr("Error adding guest source '%s' to list: %Rrc"),
-                                              strSrc.c_str(), vrc);
+                    strErrorInfo.printf(tr("Error adding guest source '%s' to list: %Rrc"),
+                                        strSrc.c_str(), vrc);
                     break;
                 }
@@ -1577 +1577 @@
     {
         if (strErrorInfo.isEmpty())
-            strErrorInfo = Utf8StrFmt(tr("Failed with %Rrc"), vrc);
+            strErrorInfo.printf(tr("Failed with %Rrc"), vrc);
         setProgressErrorMsg(VBOX_E_IPRT_ERROR, strErrorInfo);
     }
@@ -1752 +1752 @@
     if (mDest.isEmpty())
     {
-        strErrorInfo = Utf8StrFmt(tr("Guest destination must not be empty"));
+        strErrorInfo.printf(tr("Guest destination must not be empty"));
         vrc = VERR_INVALID_PARAMETER;
     }
@@ -1767 +1767 @@
             if (strSrc.isEmpty())
             {
-                strErrorInfo = Utf8StrFmt(tr("Host source entry must not be empty"));
+                strErrorInfo.printf(tr("Host source entry must not be empty"));
                 vrc = VERR_INVALID_PARAMETER;
                 break;
@@ -1776 +1776 @@
             if (RT_FAILURE(vrc))
             {
-                strErrorInfo = Utf8StrFmt(tr("No such host file/directory: %s"), strSrc.c_str());
+                strErrorInfo.printf(tr("No such host file/directory: %s"), strSrc.c_str());
                 break;
             }
@@ -1784 +1784 @@
                 if (itSrc->enmType != FsObjType_Directory)
                 {
-                    strErrorInfo = Utf8StrFmt(tr("Host source is not a file: %s"), strSrc.c_str());
+                    strErrorInfo.printf(tr("Host source is not a file: %s"), strSrc.c_str());
                     vrc = VERR_NOT_A_FILE;
                     break;
@@ -1793 +1793 @@
                 if (itSrc->enmType == FsObjType_Directory)
                 {
-                    strErrorInfo = Utf8StrFmt(tr("Host source is not a directory: %s"), strSrc.c_str());
+                    strErrorInfo.printf(tr("Host source is not a directory: %s"), strSrc.c_str());
                     vrc = VERR_NOT_A_DIRECTORY;
                     break;
@@ -1818 +1818 @@
                 {
                     delete pFsList;
-                    strErrorInfo = Utf8StrFmt(tr("Error adding host source '%s' to list: %Rrc"),
-                                              strSrc.c_str(), vrc);
+                    strErrorInfo.printf(tr("Error adding host source '%s' to list: %Rrc"),
+                                        strSrc.c_str(), vrc);
                     break;
                 }
@@ -1854 +1854 @@
     {
         if (strErrorInfo.isEmpty())
-            strErrorInfo = Utf8StrFmt(tr("Failed with %Rrc"), vrc);
+            strErrorInfo.printf(tr("Failed with %Rrc"), vrc);
         setProgressErrorMsg(VBOX_E_IPRT_ERROR, strErrorInfo);
     }