romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-07-23 21:07:17 +03:00
Code Issues Projects Releases Packages Wiki Activity

checksrc: warn for assignments within if() expressions

Browse source 
... they're already frowned upon in our source code style guide, this
now enforces the rule harder.
This commit is contained in:
Daniel Stenberg 2016-12-14 01:29:44 +01:00
parent b228d2952b
commit 1c3e8bbfed
86 changed files with 413 additions and 226 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/tool_getparam.c
View file

@ -757,7 +757,11 @@ ParameterError getparameter(char *flag, /* f or -long-flag */
case '@': /* the URL! */
{
struct getout *url;
if(config->url_get || ((config->url_get = config->url_list) != NULL)) {
if(!config->url_get)
config->url_get = config->url_list;
if(config->url_get) {
/* there's a node here, if it already is filled-in continue to find
an "empty" node */
while(config->url_get && (config->url_get->flags & GETOUT_URL))
@ -1687,7 +1691,9 @@ ParameterError getparameter(char *flag, /* f or -long-flag */
/* output file */
{
struct getout *url;
if(config->url_out || ((config->url_out = config->url_list) != NULL)) {
if(!config->url_out)
config->url_out = config->url_list;
if(config->url_out) {
/* there's a node here, if it already is filled-in continue to find
an "empty" node */
while(config->url_out && (config->url_out->flags & GETOUT_OUTFILE))
@ -1824,7 +1830,9 @@ ParameterError getparameter(char *flag, /* f or -long-flag */
/* we are uploading */
{
struct getout *url;
if(config->url_out || ((config->url_out = config->url_list) != NULL)) {
if(!config->url_out)
config->url_out = config->url_list;
if(config->url_out) {
/* there's a node here, if it already is filled-in continue to find
an "empty" node */
while(config->url_out && (config->url_out->flags & GETOUT_UPLOAD))

15
src/tool_paramhlp.c
View file

@ -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;
}

7
src/tool_writeout.c
View file

@ -124,9 +124,14 @@ void ourWriteOut(CURL *curl, struct OutStruct *outs, const char *writeinfo)
char *end;
char keepit;
int i;
if(('{' == ptr[1]) && ((end = strchr(ptr, '}')) != NULL)) {
if('{' == ptr[1]) {
bool match = FALSE;
end = strchr(ptr, '}');
ptr += 2; /* pass the % and the { */
if(!end) {
fputs("%{", stream);
continue;
}
keepit = *end;
*end = 0; /* zero terminate */
for(i = 0; replacements[i].name; i++) {