Changeset 91787 in vbox for trunk/src/VBox/Runtime/common/string

Timestamp:

Oct 17, 2021 5:48:02 PM (3 years ago)

Author:

vboxsync

Message:

IPRT/strprintf: Prep for splitting out the ellipsis functions. bugref:10124

File:

• trunk/src/VBox/Runtime/common/string/strprintf.cpp (modified) (2 diffs)

trunk/src/VBox/Runtime/common/string/strprintf.cpp

@@ -99 +99 @@
 
 
-RTDECL(size_t) RTStrPrintf(char *pszBuffer, size_t cchBuffer, const char *pszFormat, ...)
+RTDECL(size_t) RTStrPrintfV(char *pszBuffer, size_t cchBuffer, const char *pszFormat, va_list args)
 {
-    /* Explicitly inline RTStrPrintfV + RTStrPrintfExV here because this is a frequently use API. */
     STRBUFARG Arg;
-    va_list args;
-    size_t cbRet;
-
     AssertMsgReturn(cchBuffer, ("Excellent idea! Format a string with no space for the output!\n"), 0);
     Arg.psz = pszBuffer;
     Arg.cch = cchBuffer - 1;
+    return RTStrFormatV(strbufoutput, &Arg, NULL, NULL, pszFormat, args);
+}
+RT_EXPORT_SYMBOL(RTStrPrintfV);
 
-    va_start(args, pszFormat);
-    cbRet = RTStrFormatV(strbufoutput, &Arg, NULL, NULL, pszFormat, args);
-    va_end(args);
 
+RTDECL(size_t) RTStrPrintf(char *pszBuffer, size_t cchBuffer, const char *pszFormat, ...)
+{
+    size_t  cbRet;
+    va_list va;
+    va_start(va, pszFormat);
+    cbRet = RTStrPrintfV(pszBuffer, cchBuffer, pszFormat, va);
+    va_end(va);
     return cbRet;
 }
@@ -130 +133 @@
 
 
-RTDECL(size_t) RTStrPrintfV(char *pszBuffer, size_t cchBuffer, const char *pszFormat, va_list args)
-{
-    return RTStrPrintfExV(NULL, NULL, pszBuffer, cchBuffer, pszFormat, args);
-}
-RT_EXPORT_SYMBOL(RTStrPrintfV);
-
 
 RTDECL(size_t) RTStrPrintfEx(PFNSTRFORMAT pfnFormat, void *pvArg, char *pszBuffer, size_t cchBuffer, const char *pszFormat, ...)