From: Eric Bollengier <eric@baculasystems.com>
Date: Fri, 14 Dec 2018 16:06:17 +0000 (+0100)
Subject: Avoid to use the same variable name for two different things in the cmd_parser class
X-Git-Tag: Release-9.4.3~49
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0127f60cdaf20d720dbb4a6914e2088185b1d91a;p=thirdparty%2Fbacula.git

Avoid to use the same variable name for two different things in the cmd_parser class
---

diff --git a/bacula/src/lib/cmd_parser.h b/bacula/src/lib/cmd_parser.h
index 750a254d4..d1904156a 100644
--- a/bacula/src/lib/cmd_parser.h
+++ b/bacula/src/lib/cmd_parser.h
@@ -89,11 +89,11 @@ public:
     */
    int find_next_arg_with_value(const int previous, ...)
    {
-      va_list args;
+      va_list vaargs;
       for (int i=previous + 1; i<argc; i++) {
          char *arg;
-         va_start(args, previous);
-         while ((arg = va_arg(args, char *)) != NULL) {
+         va_start(vaargs, previous);
+         while ((arg = va_arg(vaargs, char *)) != NULL) {
             if (strcasecmp(arg, argk[i]) == 0) {
                if (argv[i]) {
                   /* va_end should match indentation of va_start so we can't just return here */
@@ -101,7 +101,7 @@ public:
                }
             }
          }
-         va_end(args);
+         va_end(vaargs);
          if (arg) {
             return i;
          }