aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Holme <steve_holme@hotmail.com>2014-02-20 23:18:48 +0000
committerSteve Holme <steve_holme@hotmail.com>2014-02-20 23:18:48 +0000
commit3521e4e40d5a68c239a0248a0b472131b2dee5c2 (patch)
tree14d15d7a0f449d6b05593a0ba7e4533de1f340da
parent873178a6577ff20c659621034b0b201d249f5eb7 (diff)
tool_paramhlp: Fixed compilation warnings
declaration of 'index' shadows a global declaration
-rw-r--r--src/tool_paramhlp.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/tool_paramhlp.c b/src/tool_paramhlp.c
index d4f1368c4..7ce9131c6 100644
--- a/src/tool_paramhlp.c
+++ b/src/tool_paramhlp.c
@@ -366,9 +366,9 @@ ParameterError str2offset(curl_off_t *val, const char *str)
return PARAM_BAD_NUMERIC;
}
-static CURLcode checkpasswd(const char *kind, /* for what purpose */
- const size_t index, /* operation index */
- const bool last, /* TRUE if last operation */
+static CURLcode checkpasswd(const char *kind, /* for what purpose */
+ const size_t i, /* operation index */
+ const bool last, /* TRUE if last operation */
char **userpwd) /* pointer to allocated string */
{
char *psep;
@@ -395,7 +395,7 @@ static CURLcode checkpasswd(const char *kind, /* for what purpose */
*osep = '\0';
/* build a nice-looking prompt */
- if(!index && last)
+ if(!i && last)
curlx_msnprintf(prompt, sizeof(prompt),
"Enter %s password for user '%s':",
kind, *userpwd);
@@ -403,7 +403,7 @@ static CURLcode checkpasswd(const char *kind, /* for what purpose */
curlx_msnprintf(prompt, sizeof(prompt),
"Enter %s password for user '%s' on URL #%"
CURL_FORMAT_CURL_OFF_TU ":",
- kind, *userpwd, index + 1);
+ kind, *userpwd, i + 1);
/* get password */
getpass_r(prompt, passwd, sizeof(passwd));
@@ -481,21 +481,21 @@ static char *my_useragent(void)
return strdup(CURL_NAME "/" CURL_VERSION);
}
-CURLcode get_args(struct Configurable *config, const size_t index)
+CURLcode get_args(struct Configurable *config, const size_t i)
{
CURLcode result = CURLE_OK;
bool last = (config->next ? FALSE : TRUE);
/* Check we have a password for the given host user */
if(config->userpwd && !config->xoauth2_bearer) {
- result = checkpasswd("host", index, last, &config->userpwd);
+ result = checkpasswd("host", i, last, &config->userpwd);
if(result)
return result;
}
/* Check we have a password for the given proxy user */
if(config->proxyuserpwd) {
- result = checkpasswd("proxy", index, last, &config->proxyuserpwd);
+ result = checkpasswd("proxy", i, last, &config->proxyuserpwd);
if(result)
return result;
}