Commit 88513d2d authored by Dan Fandrich's avatar Dan Fandrich
Browse files

Fixed some compiler warnings with gcc

parent 91bc3961

lib/hostip.c

+2 −3
Original line number Diff line number Diff line
@@ -540,8 +540,7 @@ int Curl_resolv_timeout(struct connectdata *conn, 
  unsigned int prev_alarm=0;

  struct SessionHandle *data = conn->data;

#endif /* USE_ALARM_TIMEOUT */



  int rc = CURLRESOLV_ERROR; /* error by default */

  int rc;



  *entry = NULL;
@@ -562,7 +561,7 @@ int Curl_resolv_timeout(struct connectdata *conn, 
      if(sigsetjmp(curl_jmpenv, 1)) {

        /* this is coming from a siglongjmp() after an alarm signal */

        failf(data, "name lookup timed out");

        return rc;

        return CURLRESOLV_ERROR;

      }



    /*************************************************************

lib/http.c

+3 −0
Original line number Diff line number Diff line
@@ -591,6 +591,9 @@ http_output_auth(struct connectdata *conn, 
        if(result)

          return result;

      }

#else

      (void)request;

      (void)path;

#endif

      if(auth) {

        infof(data, "Proxy auth using %s with user '%s'\n",

tests/libtest/lib553.c

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ static char buf[SIZE_HEADERS + 100]; 
int test(char *URL)

{

  CURL *curl;

  CURLcode res;

  CURLcode res = CURLE_FAILED_INIT;

  int i;

  struct curl_slist *headerlist=NULL, *hl;

tests/server/resolve.c

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ const char *serverlogfile=""; /* for a util.c function we don't use */ 
int main(int argc, char *argv[])

{

  int arg=1;

  char *host;

  const char *host = NULL;

  int rc;



  while(argc>arg) {

tests/server/sockfilt.c

+3 −3
Original line number Diff line number Diff line
@@ -406,13 +406,13 @@ static bool juggle(curl_socket_t *sockfdp, 
  fd_set fds_read;

  fd_set fds_write;

  fd_set fds_err;

  curl_socket_t sockfd;

  curl_socket_t maxfd;

  curl_socket_t sockfd = CURL_SOCKET_BAD;

  curl_socket_t maxfd = CURL_SOCKET_BAD;

  ssize_t rc;

  ssize_t nread_socket;

  ssize_t bytes_written;

  ssize_t buffer_len;

  int error;

  int error = 0;



 /* 'buffer' is this excessively large only to be able to support things like

    test 1003 which tests exceedingly large server response lines */