Commit 3521e4e4 authored by Steve Holme's avatar Steve Holme
Browse files

tool_paramhlp: Fixed compilation warnings 

declaration of 'index' shadows a global declaration
parent 873178a6

src/tool_paramhlp.c

+8 −8
Original line number Diff line number Diff line
@@ -367,7 +367,7 @@ ParameterError str2offset(curl_off_t *val, const char *str) 
}



static CURLcode checkpasswd(const char *kind, /* for what purpose */

                            const size_t index, /* operation index */

                            const size_t i,   /* operation index */

                            const bool last,  /* TRUE if last operation */

                            char **userpwd)   /* pointer to allocated string */

{
@@ -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;

  }