mirror/curl
2
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2025-02-17 14:59:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

main.c: convert GetStr() into a macro to ease leak debugging

Browse Source
This commit is contained in:
Yang Tse 2011-09-16 00:57:54 +02:00
parent e533f59025
commit 43c59765e1
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/main.c
View File

@ -980,6 +980,7 @@ static int parseconfig(const char *filename,
static char *my_get_line(FILE *fp); static char *my_get_line(FILE *fp);
static int create_dir_hierarchy(const char *outfile, FILE *errors); static int create_dir_hierarchy(const char *outfile, FILE *errors);
#if 0
static void GetStr(char **string, static void GetStr(char **string,
const char *value) const char *value)
{ {
@ -987,6 +988,17 @@ static void GetStr(char **string,
if(value) if(value)
*string = strdup(value); *string = strdup(value);
} }
#else
#define GetStr(str,val) \
do { \
if(*(str)) { \
free(*(str)); \
*(str) = NULL; \
} \
if((val)) \
*(str) = strdup((val)); \
} WHILE_FALSE
#endif
static void clean_getout(struct Configurable *config) static void clean_getout(struct Configurable *config)
{ {
@ -3084,7 +3096,8 @@ static ParameterError getparameter(char *flag, /* f or -long-flag */
"Appending one for you!\n"); "Appending one for you!\n");
off = curlx_strtoofft(nextarg, NULL, 10); off = curlx_strtoofft(nextarg, NULL, 10);
snprintf(buffer, sizeof(buffer), "%" CURL_FORMAT_CURL_OFF_T "-", off); snprintf(buffer, sizeof(buffer), "%" CURL_FORMAT_CURL_OFF_T "-", off);
GetStr(&config->range, buffer); Curl_safefree(config->range);
config->range = strdup(buffer);
} }
{ {
/* byte range requested */ /* byte range requested */
@ -3172,7 +3185,8 @@ static ParameterError getparameter(char *flag, /* f or -long-flag */
case 'v': case 'v':
if(toggle) { if(toggle) {
/* the '%' thing here will cause the trace get sent to stderr */ /* the '%' thing here will cause the trace get sent to stderr */
GetStr(&config->trace_dump, (char *)"%"); Curl_safefree(config->trace_dump);
config->trace_dump = strdup("%");
if(config->tracetype && (config->tracetype != TRACE_PLAIN)) if(config->tracetype && (config->tracetype != TRACE_PLAIN))
warnf(config, warnf(config,
"-v, --verbose overrides an earlier trace/verbose option\n"); "-v, --verbose overrides an earlier trace/verbose option\n");