Mercurial > mplayer.hg
comparison subopt-helper.c @ 32511:b39155e98ac3
Remove some useless NULL pointer checks before invoking free() on the pointer.
patch by From: Clment Bsch, ubitux gmail com
author | diego |
---|---|
date | Sun, 07 Nov 2010 12:47:40 +0000 |
parents | fdf3f93c2828 |
children | 08a90b0e44e1 |
comparison
equal
deleted
inserted
replaced
32510:b756312f1d15 | 32511:b39155e98ac3 |
---|---|
224 char **valp = opts[idx].valp; | 224 char **valp = opts[idx].valp; |
225 strarg_t tmp; | 225 strarg_t tmp; |
226 tmp.str = NULL; | 226 tmp.str = NULL; |
227 tmp.len = 0; | 227 tmp.len = 0; |
228 last = parse_str( &str[parse_pos], &tmp ); | 228 last = parse_str( &str[parse_pos], &tmp ); |
229 if (*valp) | 229 free(*valp); |
230 free(*valp); | |
231 *valp = NULL; | 230 *valp = NULL; |
232 if (tmp.str && tmp.len > 0) { | 231 if (tmp.str && tmp.len > 0) { |
233 *valp = malloc(tmp.len + 1); | 232 *valp = malloc(tmp.len + 1); |
234 memcpy(*valp, tmp.str, tmp.len); | 233 memcpy(*valp, tmp.str, tmp.len); |
235 (*valp)[tmp.len] = 0; | 234 (*valp)[tmp.len] = 0; |