Commit 6c492f34 authored by Steve Holme's avatar Steve Holme
Browse files

lib1515.c: Fixed various compilation warnings 

lib1515.c:38:26 warning: unused parameter 'curl'
lib1515.c:38:81 warning: unused parameter 'ptr'
lib1515.c:38:5 warning: no previous prototype for 'debug_callback'
lib1515.c:46:5 warning: no previous prototype for 'do_one_request'
lib1515.c:120:3  warning: ISO C90 forbids mixed declarations and code

As well as some code policing such as white space and braces.
parent fa8d7ce4

tests/libtest/lib1515.c

+30 −27
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 *                            | (__| |_| |  _ <| |___

 *                             \___|\___/|_| \_\_____|

 *

 * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.

 * Copyright (C) 1998 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al.

 *

 * This software is licensed as described in the file COPYING, which

 * you should have received as part of this distribution. The terms
@@ -35,15 +35,18 @@ 


#define DNS_TIMEOUT 1



int debug_callback(CURL *curl, curl_infotype info, char *msg, size_t len, void *ptr)

static int debug_callback(CURL *curl, curl_infotype info, char *msg, size_t len, void *ptr)

{

  (void)curl;

  (void)ptr;



  if(info == CURLINFO_TEXT)

    fprintf(stderr, "debug: %.*s", (int) len, msg);



  return 0;

}



int do_one_request(CURLM *m, char *URL, char *resolve)

static int do_one_request(CURLM *m, char *URL, char *resolve)

{

  CURL *curls;

  struct curl_slist *resolve_list = NULL;
@@ -67,8 +70,7 @@ int do_one_request(CURLM *m, char *URL, char *resolve) 


  abort_on_test_timeout();



  while (still_running)

  {

  while(still_running) {

    struct timeval timeout;

    fd_set fdread, fdwrite, fdexcep;

    int maxfd = -99;
@@ -88,16 +90,15 @@ int do_one_request(CURLM *m, char *URL, char *resolve) 
    abort_on_test_timeout();

  }



  while ((msg = curl_multi_info_read(m, &msgs_left)))

  {

    if (msg->msg == CURLMSG_DONE && msg->easy_handle == curls)

    {

  while((msg = curl_multi_info_read(m, &msgs_left))) {

    if(msg->msg == CURLMSG_DONE && msg->easy_handle == curls) {

      res = msg->data.result;

      break;

    }

  }



test_cleanup:



  curl_multi_remove_handle(m, curls);

  curl_easy_cleanup(curls);

  curl_slist_free_all(resolve_list);
@@ -117,24 +118,26 @@ int test(char *URL) 
  int count = 2;



  snprintf(dns_entry, sizeof(dns_entry), "testserver.example.com:%s:%s", port, address);

  char target_url[256];



  start_test_timing();



  global_init(CURL_GLOBAL_ALL);

  multi_init(multi);



  for (i = 1; i <= count; i++)

  {

  for(i = 1; i <= count; i++) {

    char target_url[256];

    snprintf(target_url, sizeof(target_url), "http://testserver.example.com:%s%s%04d", port, path, i);



    /* second request must succeed like the first one */

    if((res = do_one_request(multi, target_url, dns_entry)))

      goto test_cleanup;



    if(i < count)

      sleep(DNS_TIMEOUT + 1);

  }



test_cleanup:



  curl_multi_cleanup(multi);



  return (int) res;