Commit 733a184c authored by Yang Tse's avatar Yang Tse
Browse files

Compiler warning fix

parent eee09e79

lib/ftp.c

+1 −1
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@ static void freedirs(struct connectdata *conn) 
*/

static bool isBadFtpString(const char *string)

{

  return strchr(string, '\r') != NULL || strchr(string, '\n') != NULL;

  return (bool)((NULL != strchr(string, '\r')) || (NULL != strchr(string, '\n')));

}



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

lib/http.c

+2 −2
Original line number Diff line number Diff line
@@ -455,7 +455,7 @@ Curl_http_output_auth(struct connectdata *conn, 
      if(auth) {

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

              auth, conn->proxyuser?conn->proxyuser:"");

        authproxy->multi = !authproxy->done;

        authproxy->multi = (bool)(!authproxy->done);

      }

      else

        authproxy->multi = FALSE;
@@ -525,7 +525,7 @@ Curl_http_output_auth(struct connectdata *conn, 
        infof(data, "Server auth using %s with user '%s'\n",

              auth, conn->user);



        authhost->multi = !authhost->done;

        authhost->multi = (bool)(!authhost->done);

      }

      else

        authhost->multi = FALSE;

lib/multi.c

+1 −1
Original line number Diff line number Diff line
@@ -706,7 +706,7 @@ static CURLMcode multi_runsingle(struct Curl_multi *multi, 
  do {



    if(!GOOD_EASY_HANDLE(easy->easy_handle))

      return CURLE_BAD_FUNCTION_ARGUMENT;

      return CURLM_BAD_EASY_HANDLE;



    if (easy->easy_handle->state.pipe_broke) {

      infof(easy->easy_handle, "Pipe broke: handle 0x%x\n", easy);

lib/sendf.c

+1 −1
Original line number Diff line number Diff line
@@ -477,7 +477,7 @@ int Curl_read(struct connectdata *conn, /* connection data */ 


  conn->bits.stream_was_rewound = FALSE;



  *n = bytestocopy;

  *n = (ssize_t)bytestocopy;



  if (bytesremaining == 0) {

      return CURLE_OK;

lib/sslgen.c

+2 −2
Original line number Diff line number Diff line
@@ -68,10 +68,10 @@ static bool safe_strequal(char* str1, char* str2) 
{

  if(str1 && str2)

    /* both pointers point to something then compare them */

    return strequal(str1, str2);

    return (bool)(0 != strequal(str1, str2));

  else

    /* if both pointers are NULL then treat them as equal */

    return (!str1 && !str2);

    return (bool)(!str1 && !str2);

}



bool