diff options
author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-11-07 12:47:40 +0000 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-11-08 18:05:12 +0200 |
commit | 12d3e0df9980822282f70dffad148b729dbee541 (patch) | |
tree | d298b2c8f5039eae7aeeb16dfd927bea0efcc134 /playtreeparser.c | |
parent | af4b23cd36cff0dc34cde59c6a154fd080d11216 (diff) | |
download | mpv-12d3e0df9980822282f70dffad148b729dbee541.tar.bz2 mpv-12d3e0df9980822282f70dffad148b729dbee541.tar.xz |
cleanup: don't check for NULL before free()
patch by Clément Bœsch, ubitux gmail com
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32598 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'playtreeparser.c')
-rw-r--r-- | playtreeparser.c | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/playtreeparser.c b/playtreeparser.c index 93a8dfefc0..29530ae161 100644 --- a/playtreeparser.c +++ b/playtreeparser.c @@ -355,14 +355,9 @@ parse_pls(play_tree_parser_t* p) { list = entry; last_entry = entry; } - if(entries[num].title) { - // When we have info in playtree we add this info - free(entries[num].title); - } - if(entries[num].length) { - // When we have info in playtree we add this info - free(entries[num].length); - } + // When we have info in playtree we add these info + free(entries[num].title); + free(entries[num].length); } free(entries); @@ -518,10 +513,8 @@ parse_smil(play_tree_parser_t* p) { line = NULL; do { strstrip(src_line); - if (line) { - free(line); - line = NULL; - } + free(line); + line = NULL; /* If we're parsing smil over realrtsp and this is not the last packet and * this is the last line in the packet (terminating with ") ) we must get * the next line, strip the header, and concatenate it to the current line. @@ -601,8 +594,7 @@ parse_smil(play_tree_parser_t* p) { } } while((src_line = play_tree_parser_get_line(p)) != NULL); - if (line) - free(line); + free(line); if(!list) return NULL; // Nothing found @@ -811,8 +803,8 @@ play_tree_parser_free(play_tree_parser_t* p) { assert(p != NULL); #endif - if(p->buffer) free(p->buffer); - if(p->line) free(p->line); + free(p->buffer); + free(p->line); free(p); } |