diff options
| -rw-r--r-- | lib/http_digest.c | 2 | ||||
| -rw-r--r-- | lib/url.c | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/lib/http_digest.c b/lib/http_digest.c index 1f452c7f5..ea2aebf01 100644 --- a/lib/http_digest.c +++ b/lib/http_digest.c @@ -428,7 +428,7 @@ CURLcode Curl_output_digest(struct connectdata *conn, Further details on Digest implementation differences: 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, (int)(tmp - (char *)uripath), uripath); } @@ -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 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) { 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 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) { 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, struct connectdata *conn) { - bool recv_head = conn->readchannel_inuse && - (gethandleathead(conn->recv_pipe) == data); + bool recv_head = (bool)(conn->readchannel_inuse && + (gethandleathead(conn->recv_pipe) == data)); - bool send_head = conn->writechannel_inuse && - (gethandleathead(conn->send_pipe) == data); + bool send_head = (bool)(conn->writechannel_inuse && + (gethandleathead(conn->send_pipe) == data)); if(Curl_removeHandleFromPipeline(data, conn->recv_pipe) && recv_head) conn->readchannel_inuse = FALSE; |