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

fix compiler warning

parent de25ed3f

lib/http_digest.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -428,7 +428,7 @@ CURLcode Curl_output_digest(struct connectdata *conn, 
     Further details on Digest implementation differences:

     Further details on Digest implementation differences:

     http://www.fngtps.com/2006/09/http-authentication

     http://www.fngtps.com/2006/09/http-authentication

  */

  */

  if(authp->iestyle && (tmp = strchr((char *)uripath, '?'))) {

  if(authp->iestyle && ((tmp = strchr((char *)uripath, '?')) != NULL)) {

    md5this = (unsigned char *)aprintf("%s:%.*s", request,

    md5this = (unsigned char *)aprintf("%s:%.*s", request,

                                       (int)(tmp - (char *)uripath), uripath);

                                       (int)(tmp - (char *)uripath), uripath);

  }

  }

lib/url.c

+6 −6
Original line number Original line Diff line number Diff line
@@ -1356,7 +1356,7 @@ CURLcode Curl_setopt(struct SessionHandle *data, CURLoption option, 




    /* the DIGEST_IE bit is only used to set a special marker, for all the

    /* the DIGEST_IE bit is only used to set a special marker, for all the

       rest we need to handle it as normal DIGEST */

       rest we need to handle it as normal DIGEST */

    data->state.authhost.iestyle = (auth & CURLAUTH_DIGEST_IE)?TRUE:FALSE;

    data->state.authhost.iestyle = (bool)((auth & CURLAUTH_DIGEST_IE)?TRUE:FALSE);





    if(auth & CURLAUTH_DIGEST_IE) {

    if(auth & CURLAUTH_DIGEST_IE) {

      auth |= CURLAUTH_DIGEST; /* set standard digest bit */

      auth |= CURLAUTH_DIGEST; /* set standard digest bit */
@@ -1401,7 +1401,7 @@ CURLcode Curl_setopt(struct SessionHandle *data, CURLoption option, 




    /* the DIGEST_IE bit is only used to set a special marker, for all the

    /* the DIGEST_IE bit is only used to set a special marker, for all the

       rest we need to handle it as normal DIGEST */

       rest we need to handle it as normal DIGEST */

    data->state.authproxy.iestyle = (auth & CURLAUTH_DIGEST_IE)?TRUE:FALSE;

    data->state.authproxy.iestyle = (bool)((auth & CURLAUTH_DIGEST_IE)?TRUE:FALSE);





    if(auth & CURLAUTH_DIGEST_IE) {

    if(auth & CURLAUTH_DIGEST_IE) {

      auth |= CURLAUTH_DIGEST; /* set standard digest bit */

      auth |= CURLAUTH_DIGEST; /* set standard digest bit */
@@ -2465,11 +2465,11 @@ static struct SessionHandle* gethandleathead(struct curl_llist *pipeline) 
void Curl_getoff_all_pipelines(struct SessionHandle *data,

void Curl_getoff_all_pipelines(struct SessionHandle *data,

                               struct connectdata *conn)

                               struct connectdata *conn)

{

{

  bool recv_head = conn->readchannel_inuse &&

  bool recv_head = (bool)(conn->readchannel_inuse &&

    (gethandleathead(conn->recv_pipe) == data);

    (gethandleathead(conn->recv_pipe) == data));





  bool send_head = conn->writechannel_inuse &&

  bool send_head = (bool)(conn->writechannel_inuse &&

    (gethandleathead(conn->send_pipe) == data);

    (gethandleathead(conn->send_pipe) == data));





  if(Curl_removeHandleFromPipeline(data, conn->recv_pipe) && recv_head)

  if(Curl_removeHandleFromPipeline(data, conn->recv_pipe) && recv_head)

    conn->readchannel_inuse = FALSE;

    conn->readchannel_inuse = FALSE;