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

Timestamp:

Oct 17, 2021 5:55:43 PM (3 years ago)

Author:

vboxsync

Message:

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

File:

• trunk/src/VBox/Runtime/common/string/strprintf2.cpp (modified) (3 diffs)

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

@@ -106 +106 @@
 }
 
-
-RTDECL(ssize_t) RTStrPrintf2(char *pszBuffer, size_t cchBuffer, const char *pszFormat, ...)
+RTDECL(ssize_t) RTStrPrintf2V(char *pszBuffer, size_t cchBuffer, const char *pszFormat, va_list args)
 {
-    /* Explicitly inline RTStrPrintf2V + RTStrPrintf2ExV here because this is a frequently use API. */
     STRPRINTF2OUTPUTARGS Args;
     size_t cchRet;
-    va_list args;
     AssertMsg(cchBuffer > 0, ("Excellent idea! Format a string with no space for the output!\n"));
 
@@ -119 +116 @@
     Args.fOverflowed = false;
 
-    va_start(args, pszFormat);
     cchRet = RTStrFormatV(rtStrPrintf2Output, &Args, NULL, NULL, pszFormat, args);
-    va_end(args);
 
     return !Args.fOverflowed ? (ssize_t)cchRet : -(ssize_t)cchRet - 1;
+}
+RT_EXPORT_SYMBOL(RTStrPrintf2V);
+
+
+
+RTDECL(ssize_t) RTStrPrintf2(char *pszBuffer, size_t cchBuffer, const char *pszFormat, ...)
+{
+    va_list va;
+    ssize_t cbRet;
+    va_start(va, pszFormat);
+    cbRet = RTStrPrintf2V(pszBuffer, cchBuffer, pszFormat, va);
+    va_end(va);
+    return cbRet;
 }
 RT_EXPORT_SYMBOL(RTStrPrintf2);
@@ -144 +152 @@
 
 
-RTDECL(ssize_t) RTStrPrintf2V(char *pszBuffer, size_t cchBuffer, const char *pszFormat, va_list args)
-{
-    return RTStrPrintf2ExV(NULL, NULL, pszBuffer, cchBuffer, pszFormat, args);
-}
-RT_EXPORT_SYMBOL(RTStrPrintf2V);
-
-
 RTDECL(ssize_t) RTStrPrintf2Ex(PFNSTRFORMAT pfnFormat, void *pvArg, char *pszBuffer, size_t cchBuffer, const char *pszFormat, ...)
 {