Changeset 69997 in vbox for trunk/src/VBox

Timestamp:

Dec 7, 2017 5:41:26 PM (7 years ago)

Author:

vboxsync

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

119511

Message:

VBoxService: Fixed VGSvcLog ellipsis/va_list mixup, renaming it to VBoxSVCLogV to be clear about what it takes as an argument.

Location:

trunk/src/VBox/Additions/common/VBoxService

Files:

• VBoxService.cpp (modified) (3 diffs)
• VBoxServiceInternal.h (modified) (2 diffs)
• VBoxServiceTimeSync.cpp (modified) (1 diff)

trunk/src/VBox/Additions/common/VBoxService/VBoxService.cpp

@@ -338 +338 @@
  *
  * @param   pszFormat   The message text.
- * @param   ...         Format arguments.
- */
-void VGSvcLog(const char *pszFormat, ...)
+ * @param   va          Format arguments.
+ */
+void VGSvcLogV(const char *pszFormat, va_list va)
 {
 #ifdef DEBUG
@@ -347 +347 @@
     {
 #endif
-        va_list args;
-        va_start(args, pszFormat);
         char *psz = NULL;
-        RTStrAPrintfV(&psz, pszFormat, args);
-        va_end(args);
+        RTStrAPrintfV(&psz, pszFormat, va);
 
         AssertPtr(psz);
@@ -459 +456 @@
     if (iLevel <= g_cVerbosity)
     {
-        va_list args;
-        va_start(args, pszFormat);
-
-        VGSvcLog(pszFormat, args);
-
-        va_end(args);
+        va_list va;
+        va_start(va, pszFormat);
+        VGSvcLogV(pszFormat, va);
+        va_end(va);
     }
 }

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceInternal.h

@@ -28 +28 @@
 #include <iprt/critsect.h>
 #include <iprt/path.h> /* RTPATH_MAX */
+#include <iprt/stdarg.h>
 
 #include <VBox/VBoxGuestLib.h>
@@ -185 +186 @@
 extern void                     VGSvcVerbose(unsigned iLevel, const char *pszFormat, ...);
 extern int                      VGSvcLogCreate(const char *pszLogFile);
-extern void                     VGSvcLog(const char *pszFormat, ...);
+extern void                     VGSvcLogV(const char *pszFormat, va_list va);
 extern void                     VGSvcLogDestroy(void);
 extern int                      VGSvcArgUInt32(int argc, char **argv, const char *psz, int *pi, uint32_t *pu32,

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceTimeSync.cpp

@@ -259 +259 @@
     if (iLevel <= g_cTimeSyncVerbosity)
     {
-        va_list args;
-        va_start(args, pszFormat);
-
-        VGSvcLog(pszFormat, args);
-
-        va_end(args);
+        va_list va;
+        va_start(va, pszFormat);
+        VGSvcLogV(pszFormat, va);
+        va_end(va);
     }
 }