summaryrefslogtreecommitdiff
path: root/src/tool_paramhlp.c
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2016-12-14 01:29:44 +0100
committerDaniel Stenberg <daniel@haxx.se>2016-12-14 01:29:44 +0100
commit1c3e8bbfedcd3822aeb1bab22fb56c5ecff4295b (patch)
treec1606588aeae4535f0faa7942fcbe50e6e340f8b /src/tool_paramhlp.c
parentb228d2952b6762b5c9b851fba0cf391e80c6761a (diff)
downloadcurl-1c3e8bbfedcd3822aeb1bab22fb56c5ecff4295b.tar.gz
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 'src/tool_paramhlp.c')
-rw-r--r--src/tool_paramhlp.c15
1 files changed, 10 insertions, 5 deletions
diff --git a/src/tool_paramhlp.c b/src/tool_paramhlp.c
index 09910a784..257e5c697 100644
--- a/src/tool_paramhlp.c
+++ b/src/tool_paramhlp.c
@@ -66,12 +66,15 @@ ParameterError file2string(char **bufp, FILE *file)
if(file) {
while(fgets(buffer, sizeof(buffer), file)) {
- if((ptr = strchr(buffer, '\r')) != NULL)
+ ptr = strchr(buffer, '\r');
+ if(ptr)
*ptr = '\0';
- if((ptr = strchr(buffer, '\n')) != NULL)
+ ptr = strchr(buffer, '\n');
+ if(ptr)
*ptr = '\0';
buflen = strlen(buffer);
- if((ptr = realloc(string, stringlen+buflen+1)) == NULL) {
+ ptr = realloc(string, stringlen+buflen+1);
+ if(!ptr) {
Curl_safefree(string);
return PARAM_NO_MEM;
}
@@ -102,7 +105,8 @@ ParameterError file2memory(char **bufp, size_t *size, FILE *file)
}
alloc *= 2;
/* allocate an extra char, reserved space, for null termination */
- if((newbuf = realloc(buffer, alloc+1)) == NULL) {
+ newbuf = realloc(buffer, alloc+1);
+ if(!newbuf) {
Curl_safefree(buffer);
return PARAM_NO_MEM;
}
@@ -115,7 +119,8 @@ ParameterError file2memory(char **bufp, size_t *size, FILE *file)
buffer[nused] = '\0';
/* free trailing slack space, if possible */
if(alloc != nused) {
- if((newbuf = realloc(buffer, nused+1)) == NULL) {
+ newbuf = realloc(buffer, nused+1);
+ if(!newbuf) {
Curl_safefree(buffer);
return PARAM_NO_MEM;
}