diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2008-05-20 20:39:38 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2008-05-20 20:39:38 +0000 |
| commit | 88917b0f143e2eac468aea14338b4d9eddba389d (patch) | |
| tree | 790fd49f0632b93a7ad9cd02974bff82efa60b25 /libc/misc/wordexp/wordexp.c | |
| parent | 43eb269ab1d216074e18dadc74c9671398dfe938 (diff) | |
replace "if (p) free(p)" by just "free(p)" - free(NULL) is safe.
Diffstat (limited to 'libc/misc/wordexp/wordexp.c')
| -rw-r--r-- | libc/misc/wordexp/wordexp.c | 30 |
1 files changed, 11 insertions, 19 deletions
diff --git a/libc/misc/wordexp/wordexp.c b/libc/misc/wordexp/wordexp.c index 6872a65ba..45d5a876e 100644 --- a/libc/misc/wordexp/wordexp.c +++ b/libc/misc/wordexp/wordexp.c @@ -1076,8 +1076,7 @@ parse_comm(char **word, size_t * word_length, size_t * max_length, } /* Premature end */ - if (comm) - free(comm); + free(comm); return WRDE_SYNTAX; } @@ -1370,8 +1369,7 @@ parse_param(char **word, size_t * word_length, size_t * max_length, &buffer[20]); *word = w_addstr(*word, word_length, max_length, value); free(env); - if (pattern) - free(pattern); + free(pattern); return *word ? 0 : WRDE_NOSPACE; } /* Is it `$*' or `$@' (unquoted) ? */ @@ -1530,8 +1528,7 @@ parse_param(char **word, size_t * word_length, size_t * max_length, if (free_value) free(value); - if (expanded) - free(expanded); + free(expanded); goto do_error; } @@ -1550,8 +1547,7 @@ parse_param(char **word, size_t * word_length, size_t * max_length, if (free_value) free(value); - if (expanded) - free(expanded); + free(expanded); goto do_error; } @@ -1573,8 +1569,7 @@ parse_param(char **word, size_t * word_length, size_t * max_length, goto no_space; } - if (pattern) - free(pattern); + free(pattern); pattern = expanded; } @@ -1723,7 +1718,7 @@ parse_param(char **word, size_t * word_length, size_t * max_length, /* Substitute parameter */ break; - if (free_value && value) + if (free_value) free(value); if (!colon_seen && value) @@ -1740,7 +1735,7 @@ parse_param(char **word, size_t * word_length, size_t * max_length, case ACT_NONNULL_SUBST: if (value && (*value || !colon_seen)) { - if (free_value && value) + if (free_value) free(value); value = pattern ? strdup(pattern) : pattern; @@ -1769,7 +1764,7 @@ parse_param(char **word, size_t * word_length, size_t * max_length, goto success; } - if (free_value && value) + if (free_value) free(value); value = pattern ? strdup(pattern) : pattern; @@ -1895,11 +1890,9 @@ parse_param(char **word, size_t * word_length, size_t * max_length, error = WRDE_SYNTAX; do_error: - if (env) - free(env); + free(env); - if (pattern) - free(pattern); + free(pattern); return error; } @@ -2269,8 +2262,7 @@ int wordexp(const char *words, wordexp_t * we, int flags) * set we members back to what they were. */ - if (word != NULL) - free(word); + free(word); if (error == WRDE_NOSPACE) return WRDE_NOSPACE; |