Commit bbefdf88 authored by Yang Tse's avatar Yang Tse
Browse files 

fix compiler warning
parent 06c96d01

lib/cookie.c

+3 −3
Original line number Diff line number Diff line
@@ -783,7 +783,7 @@ static int cookie_sort(const void *p1, const void *p2) 
  size_t l1 = c1->path?strlen(c1->path):0;

  size_t l2 = c2->path?strlen(c2->path):0;



  return l2 - l1;

  return (int)(l2 - l1);

}



/*****************************************************************************
@@ -806,7 +806,7 @@ struct Cookie *Curl_cookie_getlist(struct CookieInfo *c, 
  struct Cookie *co;

  time_t now = time(NULL);

  struct Cookie *mainco=NULL;

  int matches=0;

  size_t matches = 0;



  if(!c || !c->cookies)

    return NULL; /* no cookie struct or no cookies in the struct */
@@ -872,7 +872,7 @@ struct Cookie *Curl_cookie_getlist(struct CookieInfo *c, 
       once, the longest specified path version comes first. To make this

       the swiftest way, we just sort them all based on path length. */

    struct Cookie **array;

    int i;

    size_t i;



    /* alloc an array and store all cookie pointers */

    array = (struct Cookie **)malloc(sizeof(struct Cookie *) * matches);

lib/url.c

+3 −3
Original line number Diff line number Diff line
@@ -2339,7 +2339,7 @@ CURLcode Curl_setopt(struct SessionHandle *data, CURLoption option, 
       * Would this be better if the RTSPREQ_* were just moved into here?

       */

      long curl_rtspreq = va_arg(param, long);

      long rtspreq = RTSPREQ_NONE;

      Curl_RtspReq rtspreq = RTSPREQ_NONE;

      switch(curl_rtspreq) {

        case CURL_RTSPREQ_OPTIONS:

          rtspreq = RTSPREQ_OPTIONS;
@@ -3557,8 +3557,8 @@ static CURLcode parseurlandfillconn(struct SessionHandle *data, 
       * The URL was badly formatted, let's try the browser-style _without_

       * protocol specified like 'http://'.

       */

      if(1 > (rc = sscanf(data->change.url, "%[^\n/]%[^\n]",

                          conn->host.name, path)) ) {

      rc = sscanf(data->change.url, "%[^\n/]%[^\n]", conn->host.name, path);

      if(1 > rc) {

        /*

         * We couldn't even get this format.

         * djgpp 2.04 has a sscanf() bug where 'conn->host.name' is

src/main.c

+2 −1
Original line number Diff line number Diff line
@@ -4073,7 +4073,8 @@ static void dumpeasycode(struct Configurable *config) 


static bool stdin_upload(const char *uploadfile)

{

  return curlx_strequal(uploadfile, "-") || curlx_strequal(uploadfile, ".");

  return (bool)(curlx_strequal(uploadfile, "-") ||

                curlx_strequal(uploadfile, "."));

}



static char*