Commit 059707be authored by Yang Tse's avatar Yang Tse
Browse files

Renamed a couple of global variables to avoid shadowing warnings

parent 048bfeaa

tests/libtest/first.c

+4 −4
Original line number Diff line number Diff line
@@ -34,8 +34,8 @@ int select_test (int num_fds, fd_set *rd, fd_set *wr, fd_set *exc, 
  return select(num_fds, rd, wr, exc, tv);

}



char *arg2=NULL;

char *arg3=NULL;

char *libtest_arg2=NULL;

char *libtest_arg3=NULL;

int test_argc;

char **test_argv;
@@ -73,10 +73,10 @@ int main(int argc, char **argv) 
  test_argv = argv;



  if(argc>2)

    arg2=argv[2];

    libtest_arg2=argv[2];



  if(argc>3)

    arg3=argv[3];

    libtest_arg3=argv[3];



  URL = argv[1]; /* provide this to the rest */

tests/libtest/lib503.c

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ int test(char *URL) 
    return TEST_ERR_MAJOR_BAD;

  }



  curl_easy_setopt(c, CURLOPT_PROXY, arg2); /* set in first.c */

  curl_easy_setopt(c, CURLOPT_PROXY, libtest_arg2); /* set in first.c */

  curl_easy_setopt(c, CURLOPT_URL, URL);

  curl_easy_setopt(c, CURLOPT_USERPWD, "test:ing");

  curl_easy_setopt(c, CURLOPT_PROXYUSERPWD, "test:ing");

tests/libtest/lib504.c

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ int test(char *URL) 


  /* the point here being that there must not run anything on the given

     proxy port */

  curl_easy_setopt(c, CURLOPT_PROXY, arg2);

  curl_easy_setopt(c, CURLOPT_PROXY, libtest_arg2);

  curl_easy_setopt(c, CURLOPT_URL, URL);

  curl_easy_setopt(c, CURLOPT_VERBOSE, 1);

tests/libtest/lib505.c

+6 −6
Original line number Diff line number Diff line
@@ -49,36 +49,36 @@ int test(char *URL) 
  const char *buf_1 = "RNFR 505";

  const char *buf_2 = "RNTO 505-forreal";



  if (!arg2) {

  if (!libtest_arg2) {

    fprintf(stderr, "Usage: <url> <file-to-upload>\n");

    return -1;

  }



  /* get the file size of the local file */

  hd = stat(arg2, &file_info);

  hd = stat(libtest_arg2, &file_info);

  if(hd == -1) {

    /* can't open file, bail out */

    error = ERRNO;

    fprintf(stderr, "stat() failed with error: %d %s\n",

            error, strerror(error));

    fprintf(stderr, "WARNING: cannot open file %s\n", arg2);

    fprintf(stderr, "WARNING: cannot open file %s\n", libtest_arg2);

    return -1;

  }



  if(! file_info.st_size) {

    fprintf(stderr, "WARNING: file %s has no size!\n", arg2);

    fprintf(stderr, "WARNING: file %s has no size!\n", libtest_arg2);

    return -4;

  }



  /* get a FILE * of the same file, could also be made with

     fdopen() from the previous descriptor, but hey this is just

     an example! */

  hd_src = fopen(arg2, "rb");

  hd_src = fopen(libtest_arg2, "rb");

  if(NULL == hd_src) {

    error = ERRNO;

    fprintf(stderr, "fopen() failed with error: %d %s\n",

            error, strerror(error));

    fprintf(stderr, "Error opening file: %s\n", arg2);

    fprintf(stderr, "Error opening file: %s\n", libtest_arg2);

    return -2; /* if this happens things are major weird */

  }

tests/libtest/lib509.c

+2 −2
Original line number Diff line number Diff line
@@ -206,8 +206,8 @@ int test(char *URL) 
  char ml_timedout = FALSE;

  char mp_timedout = FALSE;



  if(arg2) {

    portnum = atoi(arg2);

  if(libtest_arg2) {

    portnum = atoi(libtest_arg2);

  }



  if (curl_global_init(CURL_GLOBAL_ALL) != CURLE_OK) {