From: Guenter Knauf <lists@gknw.net>
Date: Wed, 4 Jul 2012 10:54:21 +0000 (+0200)
Subject: Renamed vars to avoid shadow global declaration.
X-Git-Tag: curl-7_27_0~84
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6388ac7dc1f531f4f94616e8e0a46a0cecde8315;p=curl

Renamed vars to avoid shadow global declaration.
---

diff --git a/src/tool_getparam.c b/src/tool_getparam.c
index c9c6198ff..4205f596a 100644
--- a/src/tool_getparam.c
+++ b/src/tool_getparam.c
@@ -824,9 +824,9 @@ ParameterError getparameter(char *flag,    /* f or -long-flag */
       case 'J': /* --metalink */
         {
 #ifdef USE_METALINK
-          int major, minor, patch;
-          metalink_get_version(&major, &minor, &patch);
-          if((major*10000)+(minor*100)+patch < CURL_REQ_LIBMETALINK_VERS) {
+          int mlmaj, mlmin, mlpatch;
+          metalink_get_version(&mlmaj, &mlmin, &mlpatch);
+          if((mlmaj*10000)+(mlmin*100)+mlpatch < CURL_REQ_LIBMETALINK_VERS) {
             warnf(config,
                   "--metalink option cannot be used because the version of "
                   "the linked libmetalink library is too old. "
@@ -834,7 +834,7 @@ ParameterError getparameter(char *flag,    /* f or -long-flag */
                   CURL_REQ_LIBMETALINK_MAJOR,
                   CURL_REQ_LIBMETALINK_MINOR,
                   CURL_REQ_LIBMETALINK_PATCH,
-                  major, minor, patch);
+                  mlmaj, mlmin, mlpatch);
             return PARAM_BAD_USE;
           }
           else