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

Timestamp:

Aug 14, 2020 9:04:40 PM (5 years ago)

Author:

vboxsync

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

139935

Message:

VBoxManage/showvminfo: Use Utf8Str::printf and appendPrintf instead of Utf8StrFmt.

File:

• trunk/src/VBox/Frontends/VBoxManage/VBoxManageInfo.cpp (modified) (13 diffs)

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

@@ -115 +115 @@
                 Utf8Str newPrefix;
                 if (details == VMINFO_MACHINEREADABLE)
-                    newPrefix = Utf8StrFmt("%s-%d", prefix.c_str(), index + 1);
+                    newPrefix.printf("%s-%d", prefix.c_str(), index + 1);
                 else
-                {
-                    newPrefix = Utf8StrFmt("%s   ", prefix.c_str());
-                }
+                    newPrefix.printf("%s   ", prefix.c_str());
 
                 /* recursive call */
@@ -1217 +1215 @@
                 nic->COMGETTER(MACAddress)(strMACAddress.asOutParam());
                 Utf8Str strAttachment;
-                Utf8Str strNatSettings = "";
-                Utf8Str strNatForwardings = "";
+                Utf8Str strNatSettings;
+                Utf8Str strNatForwardings;
                 NetworkAttachmentType_T attachment;
                 nic->COMGETTER(AttachmentType)(&attachment);
@@ -1252 +1250 @@
                             size_t pos, ppos;
                             pos = ppos = 0;
-                            #define ITERATE_TO_NEXT_TERM(res, str, pos, ppos)   \
+#define ITERATE_TO_NEXT_TERM(res, str, pos, ppos)   \
                             do {                                                \
                                 pos = str.find(",", ppos);                      \
@@ -1275 +1273 @@
                             if (fSkip) continue;
                             strGuestPort = utf.substr(ppos, utf.length() - ppos);
-                            #undef ITERATE_TO_NEXT_TERM
+#undef ITERATE_TO_NEXT_TERM
                             switch (strProto.toUInt32())
                             {
@@ -1289 +1287 @@
                             }
                             if (details == VMINFO_MACHINEREADABLE)
-                            {
-                                strNatForwardings = Utf8StrFmt("%sForwarding(%d)=\"%s,%s,%s,%s,%s,%s\"\n",
-                                    strNatForwardings.c_str(), i, strName.c_str(), strProto.c_str(),
-                                    strHostIP.c_str(), strHostPort.c_str(),
-                                    strGuestIP.c_str(), strGuestPort.c_str());
-                            }
+                                /** @todo r=bird: This probably isn't good enough wrt escaping. */
+                                strNatForwardings.printf("%sForwarding(%d)=\"%s,%s,%s,%s,%s,%s\"\n",
+                                                         strNatForwardings.c_str(), i, strName.c_str(), strProto.c_str(),
+                                                         strHostIP.c_str(), strHostPort.c_str(),
+                                                         strGuestIP.c_str(), strGuestPort.c_str());
                             else
-                            {
-                                strNatForwardings = Utf8StrFmt("%sNIC %d Rule(%d):   name = %s, protocol = %s,"
-                                    " host ip = %s, host port = %s, guest ip = %s, guest port = %s\n",
-                                    strNatForwardings.c_str(), currentNIC + 1, i, strName.c_str(), strProto.c_str(),
-                                    strHostIP.c_str(), strHostPort.c_str(),
-                                    strGuestIP.c_str(), strGuestPort.c_str());
-                            }
+                                strNatForwardings.printf("%sNIC %d Rule(%d):   name = %s, protocol = %s, host ip = %s, host port = %s, guest ip = %s, guest port = %s\n",
+                                                         strNatForwardings.c_str(), currentNIC + 1, i, strName.c_str(),
+                                                         strProto.c_str(), strHostIP.c_str(), strHostPort.c_str(),
+                                                         strGuestIP.c_str(), strGuestPort.c_str());
                         }
                         ULONG mtu = 0;
@@ -1316 +1310 @@
                             RTPrintf("natnet%d=\"%ls\"\n", currentNIC + 1, strNetwork.length() ? strNetwork.raw(): Bstr("nat").raw());
                             strAttachment = "nat";
-                            strNatSettings = Utf8StrFmt("mtu=\"%d\"\nsockSnd=\"%d\"\nsockRcv=\"%d\"\ntcpWndSnd=\"%d\"\ntcpWndRcv=\"%d\"\n",
-                                mtu, sockSnd ? sockSnd : 64, sockRcv ? sockRcv : 64, tcpSnd ? tcpSnd : 64, tcpRcv ? tcpRcv : 64);
+                            strNatSettings.printf("mtu=\"%d\"\nsockSnd=\"%d\"\nsockRcv=\"%d\"\ntcpWndSnd=\"%d\"\ntcpWndRcv=\"%d\"\n",
+                                                  mtu, sockSnd ? sockSnd : 64, sockRcv ? sockRcv : 64, tcpSnd ? tcpSnd : 64, tcpRcv ? tcpRcv : 64);
                         }
                         else
                         {
                             strAttachment = "NAT";
-                            strNatSettings = Utf8StrFmt("NIC %d Settings:  MTU: %d, Socket (send: %d, receive: %d), TCP Window (send:%d, receive: %d)\n",
-                                currentNIC + 1, mtu, sockSnd ? sockSnd : 64, sockRcv ? sockRcv : 64, tcpSnd ? tcpSnd : 64, tcpRcv ? tcpRcv : 64);
+                            strNatSettings.printf("NIC %d Settings:  MTU: %d, Socket (send: %d, receive: %d), TCP Window (send:%d, receive: %d)\n",
+                                                  currentNIC + 1, mtu, sockSnd ? sockSnd : 64, sockRcv ? sockRcv : 64, tcpSnd ? tcpSnd : 64, tcpRcv ? tcpRcv : 64);
                         }
                         break;
@@ -1338 +1332 @@
                         }
                         else
-                            strAttachment = Utf8StrFmt("Bridged Interface '%ls'", strBridgeAdp.raw());
+                            strAttachment.printf("Bridged Interface '%ls'", strBridgeAdp.raw());
                         break;
                     }
@@ -1352 +1346 @@
                         }
                         else
-                            strAttachment = Utf8StrFmt("Internal Network '%s'", Utf8Str(strNetwork).c_str());
+                            strAttachment.printf("Internal Network '%s'", Utf8Str(strNetwork).c_str());
                         break;
                     }
@@ -1366 +1360 @@
                         }
                         else
-                            strAttachment = Utf8StrFmt("Host-only Interface '%ls'", strHostonlyAdp.raw());
+                            strAttachment.printf("Host-only Interface '%ls'", strHostonlyAdp.raw());
                         break;
                     }
@@ -1381 +1375 @@
                         else
                         {
-                            strAttachment = Utf8StrFmt("Generic '%ls'", strGenericDriver.raw());
+                            strAttachment.printf("Generic '%ls'", strGenericDriver.raw());
 
                             // show the generic properties
@@ -1393 +1387 @@
                                 strAttachment += " { ";
                                 for (unsigned i = 0; i < aProperties.size(); ++i)
-                                    strAttachment += Utf8StrFmt(!i ? "%ls='%ls'" : ", %ls='%ls'",
-                                                                aProperties[i], aValues[i]);
+                                    strAttachment.appendPrintf(!i ? "%ls='%ls'" : ", %ls='%ls'", aProperties[i], aValues[i]);
                                 strAttachment += " }";
                             }
@@ -1411 +1404 @@
                         }
                         else
-                            strAttachment = Utf8StrFmt("NAT Network '%s'", Utf8Str(strNetwork).c_str());
+                            strAttachment.printf("NAT Network '%s'", Utf8Str(strNetwork).c_str());
                         break;
                     }
@@ -1426 +1419 @@
                         }
                         else
-                            strAttachment = Utf8StrFmt("Cloud Network '%s'", Utf8Str(strNetwork).c_str());
+                            strAttachment.printf("Cloud Network '%s'", Utf8Str(strNetwork).c_str());
                         break;
                     }