diff options
| -rw-r--r-- | lib/easy.c | 5 | ||||
| -rw-r--r-- | lib/formdata.c | 4 | ||||
| -rw-r--r-- | lib/gtls.c | 2 | ||||
| -rw-r--r-- | lib/hmac.c | 6 | ||||
| -rw-r--r-- | lib/hostares.c | 2 | ||||
| -rw-r--r-- | lib/http_digest.c | 2 | ||||
| -rw-r--r-- | lib/polarssl.c | 4 | ||||
| -rw-r--r-- | lib/ssluse.c | 2 |
8 files changed, 14 insertions, 13 deletions
diff --git a/lib/easy.c b/lib/easy.c index 1f839fe24..0ddfb64b0 100644 --- a/lib/easy.c +++ b/lib/easy.c @@ -634,7 +634,7 @@ CURL *curl_easy_duphandle(CURL *incurl) if(NULL == outcurl) return NULL; /* failure */ - do { + for(;;) { /* * We setup a few buffers we need. We should probably make them @@ -720,8 +720,9 @@ CURL *curl_easy_duphandle(CURL *incurl) outcurl->magic = CURLEASY_MAGIC_NUMBER; fail = FALSE; /* we reach this point and thus we are OK */ + break; - } while(0); + } if(fail) { if(outcurl) { diff --git a/lib/formdata.c b/lib/formdata.c index 07d7a6b42..5ec3e384e 100644 --- a/lib/formdata.c +++ b/lib/formdata.c @@ -1647,14 +1647,14 @@ int main(int argc, argv_item_t argv[]) Curl_FormInit(&formread, form); - do { + for(;;) { nread = Curl_FormReader(buffer, 1, sizeof(buffer), (FILE *)&formread); if(nread < 1) break; fwrite(buffer, nread, 1, stdout); - } while(1); + } fprintf(stdout, "size: "); fprintf(stdout, "%" FORMAT_OFF_T, size); diff --git a/lib/gtls.c b/lib/gtls.c index 99be073a0..fca2a7e7d 100644 --- a/lib/gtls.c +++ b/lib/gtls.c @@ -196,7 +196,7 @@ static CURLcode handshake(struct connectdata *conn, int rc; int what; - while(1) { + for(;;) { /* check allowed time left */ timeout_ms = Curl_timeleft(conn, NULL, duringconnect); diff --git a/lib/hmac.c b/lib/hmac.c index 0c01d1187..8cb5f2eaa 100644 --- a/lib/hmac.c +++ b/lib/hmac.c @@ -60,7 +60,7 @@ Curl_HMAC_init(const HMAC_params * hashparams, /* Create HMAC context. */ i = sizeof *ctxt + 2 * hashparams->hmac_ctxtsize + hashparams->hmac_resultlen; - ctxt = (HMAC_context *) malloc(i); + ctxt = malloc(i); if(!ctxt) return ctxt; @@ -85,9 +85,9 @@ Curl_HMAC_init(const HMAC_params * hashparams, (*hashparams->hmac_hinit)(ctxt->hmac_hashctxt2); for (i = 0; i < keylen; i++) { - b = *key ^ hmac_ipad; + b = (unsigned char)(*key ^ hmac_ipad); (*hashparams->hmac_hupdate)(ctxt->hmac_hashctxt1, &b, 1); - b = *key++ ^ hmac_opad; + b = (unsigned char)(*key++ ^ hmac_opad); (*hashparams->hmac_hupdate)(ctxt->hmac_hashctxt2, &b, 1); } diff --git a/lib/hostares.c b/lib/hostares.c index a00fefa0d..5d54ac1b4 100644 --- a/lib/hostares.c +++ b/lib/hostares.c @@ -234,7 +234,7 @@ CURLcode Curl_wait_for_resolv(struct connectdata *conn, timeout = CURL_TIMEOUT_RESOLVE * 1000; /* default name resolve timeout */ /* Wait for the name resolve query to complete. */ - while(1) { + for(;;) { struct timeval *tvp, tv, store; long timediff; int itimeout; diff --git a/lib/http_digest.c b/lib/http_digest.c index be40fc7fe..45d8aeba8 100644 --- a/lib/http_digest.c +++ b/lib/http_digest.c @@ -158,7 +158,7 @@ CURLdigest Curl_input_digest(struct connectdata *conn, /* clear off any former leftovers and init to defaults */ Curl_digest_cleanup_one(d); - while(1) { + for(;;) { char value[MAX_VALUE_LENGTH]; char content[MAX_CONTENT_LENGTH]; diff --git a/lib/polarssl.c b/lib/polarssl.c index e81e66091..bed76354a 100644 --- a/lib/polarssl.c +++ b/lib/polarssl.c @@ -221,7 +221,7 @@ Curl_polarssl_connect(struct connectdata *conn, ssl_set_dbg(&conn->ssl[sockindex].ssl, polarssl_debug, data); #endif - do { + for(;;) { if (!(ret = ssl_handshake(&conn->ssl[sockindex].ssl))) { break; } else if(ret != POLARSSL_ERR_NET_TRY_AGAIN) { @@ -250,7 +250,7 @@ Curl_polarssl_connect(struct connectdata *conn, break; } } - } while (1); + } infof(data, "PolarSSL: Handshake complete, cipher is %s\n", ssl_get_cipher(&conn->ssl[sockindex].ssl)); diff --git a/lib/ssluse.c b/lib/ssluse.c index 474bc9a33..d0eaadede 100644 --- a/lib/ssluse.c +++ b/lib/ssluse.c @@ -1049,7 +1049,7 @@ static int asn1_output(const ASN1_UTCTIME *tm, static int hostmatch(const char *hostname, const char *pattern) { - while(1) { + for(;;) { char c = *pattern++; if(c == '\0') |