diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2016-12-14 01:29:44 +0100 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2016-12-14 01:29:44 +0100 |
| commit | 1c3e8bbfedcd3822aeb1bab22fb56c5ecff4295b (patch) | |
| tree | c1606588aeae4535f0faa7942fcbe50e6e340f8b /lib/vtls | |
| parent | b228d2952b6762b5c9b851fba0cf391e80c6761a (diff) | |
checksrc: warn for assignments within if() expressions
... they're already frowned upon in our source code style guide, this
now enforces the rule harder.
Diffstat (limited to 'lib/vtls')
| -rw-r--r-- | lib/vtls/gtls.c | 3 | ||||
| -rw-r--r-- | lib/vtls/nss.c | 3 | ||||
| -rw-r--r-- | lib/vtls/openssl.c | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/lib/vtls/gtls.c b/lib/vtls/gtls.c index 1435284b8..0e308cb79 100644 --- a/lib/vtls/gtls.c +++ b/lib/vtls/gtls.c @@ -242,7 +242,8 @@ static gnutls_datum_t load_file(const char *file) long filelen; void *ptr; - if(!(f = fopen(file, "rb"))) + f = fopen(file, "rb"); + if(!f) return loaded_file; if(fseek(f, 0, SEEK_END) != 0 || (filelen = ftell(f)) < 0 diff --git a/lib/vtls/nss.c b/lib/vtls/nss.c index 455bad641..ba8d58260 100644 --- a/lib/vtls/nss.c +++ b/lib/vtls/nss.c @@ -254,7 +254,8 @@ static SECStatus set_ciphers(struct Curl_easy *data, PRFileDesc * model, while((*cipher) && (ISSPACE(*cipher))) ++cipher; - if((cipher_list = strchr(cipher, ','))) { + cipher_list = strchr(cipher, ','); + if(cipher_list) { *cipher_list++ = '\0'; } diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c index 75051d41e..94410df4b 100644 --- a/lib/vtls/openssl.c +++ b/lib/vtls/openssl.c @@ -2336,7 +2336,8 @@ static int asn1_object_dump(ASN1_OBJECT *a, char *buf, size_t len) { int i, ilen; - if((ilen = (int)len) < 0) + ilen = (int)len; + if(ilen < 0) return 1; /* buffer too big */ i = i2t_ASN1_OBJECT(buf, ilen, a); |