Changeset 97890 in vbox

Timestamp:

Dec 29, 2022 2:58:32 PM (2 years ago)

Author:

vboxsync

Message:

Main/USBDeviceFilter: Skip some unnecessary Utf8Str copying.

File:

• trunk/src/VBox/Main/src-server/USBDeviceFilterImpl.cpp (modified) (5 diffs)

trunk/src/VBox/Main/src-server/USBDeviceFilterImpl.cpp

@@ -62 +62 @@
         Assert(value >= 0 && value <= 0xffff);
 
-        rstrOut = Utf8StrFmt("%04RX16", (uint16_t)value);
+        rstrOut.printf("%04RX16", (uint16_t)value);
     }
     else if (USBFilterIsMethodString(matchingMethod))
@@ -130 +130 @@
                     else
                     {
-                        aErrStr = Utf8StrFmt(tr("The %s value '%s' is too big (max 0xFFFF)"),
-                                             i_describeUSBFilterIdx(aIdx), pcszValue);
+                        aErrStr.printf(tr("The %s value '%s' is too big (max 0xFFFF)"), i_describeUSBFilterIdx(aIdx), pcszValue);
                         return E_INVALIDARG;
                     }
@@ -145 +144 @@
             /* Any wildcard in the string? */
             Assert(USBFilterIsStringField(aIdx));
-            if (    strchr(pcszValue, '*')
-                ||  strchr(pcszValue, '?')
+            if (   strchr(pcszValue, '*')
+                || strchr(pcszValue, '?')
                 /* || strchr (psz, '[') - later */
                 )
@@ -159 +158 @@
         if (vrc == VERR_INVALID_PARAMETER)
         {
-            aErrStr = Utf8StrFmt(tr("The %s filter expression '%s' is not valid"), i_describeUSBFilterIdx(aIdx), aValue.c_str());
+            aErrStr.printf(tr("The %s filter expression '%s' is not valid"), i_describeUSBFilterIdx(aIdx), aValue.c_str());
             return E_INVALIDARG;
         }
         if (vrc == VERR_BUFFER_OVERFLOW)
         {
-            aErrStr = Utf8StrFmt(tr("Insufficient expression space for the '%s' filter expression '%s'"),
-                                 i_describeUSBFilterIdx(aIdx), aValue.c_str());
+            aErrStr.printf(tr("Insufficient expression space for the '%s' filter expression '%s'"),
+                           i_describeUSBFilterIdx(aIdx), aValue.c_str());
             return E_FAIL;
         }
         AssertRC(vrc);
-        aErrStr = Utf8StrFmt(tr("Encountered unexpected status %Rrc when setting '%s' to '%s'"),
-                             vrc, i_describeUSBFilterIdx(aIdx), aValue.c_str());
+        aErrStr.printf(tr("Encountered unexpected status %Rrc when setting '%s' to '%s'"),
+                       vrc, i_describeUSBFilterIdx(aIdx), aValue.c_str());
         return E_FAIL;
     }
@@ -458 +457 @@
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    aName = bd->mData.strName;
-
-    return S_OK;
+    return aName.assignEx(bd->mData.strName);
 }