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

misc: fix "warning: empty expression statement has no effect"

Browse source 
Turned several macros into do-while(0) style to allow their use to work
find with semicolon.

Bug: 08e8455ddd (commitcomment-45433279)
Follow-up to 08e8455ddd
Reported-by: Gisle Vanem
Closes #6376
This commit is contained in:
Daniel Stenberg 2020-12-26 15:43:25 +01:00
parent ec424f311a
commit 8ab78f720a
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
11 changed files with 84 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/tool_formparse.c
View file

@ -720,19 +720,22 @@ static int get_param_part(struct OperationConfig *config, char endchar,
***************************************************************************/
/* Convenience macros for null pointer check. */
#define NULL_CHECK(ptr, init, retcode) { \
(ptr) = (init); \
if(!(ptr)) { \
warnf(config->global, "out of memory!\n"); \
curl_slist_free_all(headers); \
Curl_safefree(contents); \
return retcode; \
} \
}
#define SET_TOOL_MIME_PTR(m, field, retcode) { \
if(field) \
NULL_CHECK((m)->field, strdup(field), retcode); \
}
#define NULL_CHECK(ptr, init, retcode) \
do { \
(ptr) = (init); \
if(!(ptr)) { \
warnf(config->global, "out of memory!\n"); \
curl_slist_free_all(headers); \
Curl_safefree(contents); \
return retcode; \
} \
} while(0)
#define SET_TOOL_MIME_PTR(m, field, retcode) \
do { \
if(field) \
NULL_CHECK((m)->field, strdup(field), retcode); \
} while(0)
int formparse(struct OperationConfig *config,
const char *input,

5
src/tool_operate.c
View file

@ -362,10 +362,7 @@ static CURLcode post_per_transfer(struct GlobalConfig *global,
}
else
#endif
if(config->synthetic_error) {
;
}
else if(result && global->showerror) {
if(!config->synthetic_error && result && global->showerror) {
fprintf(global->errors, "curl: (%d) %s\n", result,
(per->errorbuffer[0]) ? per->errorbuffer :
curl_easy_strerror(result));

2
src/tool_writeout_json.c
View file

@ -74,7 +74,7 @@ static void jsonEscape(FILE *stream, const char *in)
fputc(*i, stream);
}
break;
};
}
}
}