diff options
author | cboesch <cboesch@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-11-14 09:12:34 +0000 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-11-14 13:11:20 +0200 |
commit | fe3c4810e1c8b535caf07df8e4434e322d3e6fc0 (patch) | |
tree | cbcd859f358c479223eb7b0aa2a2d3dfe1c81b69 /stream/realrtsp | |
parent | b492561241f2a3263a8ab558fafc957130dbdfc1 (diff) | |
download | mpv-fe3c4810e1c8b535caf07df8e4434e322d3e6fc0.tar.bz2 mpv-fe3c4810e1c8b535caf07df8e4434e322d3e6fc0.tar.xz |
cleanup: remove NULL checks before free() all over the code
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32624 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'stream/realrtsp')
-rw-r--r-- | stream/realrtsp/real.c | 3 | ||||
-rw-r--r-- | stream/realrtsp/rmff.c | 6 | ||||
-rw-r--r-- | stream/realrtsp/sdpplin.c | 24 |
3 files changed, 12 insertions, 21 deletions
diff --git a/stream/realrtsp/real.c b/stream/realrtsp/real.c index cad231dedd..6f33bc9c6c 100644 --- a/stream/realrtsp/real.c +++ b/stream/realrtsp/real.c @@ -507,8 +507,7 @@ rtsp_send_describe: } autherr: - if (authfield) - free(authfield); + free(authfield); if ( status<200 || status>299 ) { diff --git a/stream/realrtsp/rmff.c b/stream/realrtsp/rmff.c index e147b76f36..d538222141 100644 --- a/stream/realrtsp/rmff.c +++ b/stream/realrtsp/rmff.c @@ -847,9 +847,9 @@ void rmff_free_header(rmff_header_t *h) { if (!h) return; - if (h->fileheader) free(h->fileheader); - if (h->prop) free(h->prop); - if (h->data) free(h->data); + free(h->fileheader); + free(h->prop); + free(h->data); if (h->cont) { free(h->cont->title); diff --git a/stream/realrtsp/sdpplin.c b/stream/realrtsp/sdpplin.c index fe561f4082..41ef618d25 100644 --- a/stream/realrtsp/sdpplin.c +++ b/stream/realrtsp/sdpplin.c @@ -368,14 +368,10 @@ void sdpplin_free(sdpplin_t *description) { for (i = 0; i < description->stream_count; i++) { if (description->stream[i]) { - if (description->stream[i]->stream_name) - free(description->stream[i]->stream_name); - if (description->stream[i]->mime_type) - free(description->stream[i]->mime_type); - if (description->stream[i]->mlti_data) - free(description->stream[i]->mlti_data); - if (description->stream[i]->asm_rule_book) - free(description->stream[i]->asm_rule_book); + free(description->stream[i]->stream_name); + free(description->stream[i]->mime_type); + free(description->stream[i]->mlti_data); + free(description->stream[i]->asm_rule_book); free(description->stream[i]->id); free(description->stream[i]); } @@ -383,14 +379,10 @@ void sdpplin_free(sdpplin_t *description) { if(description->stream_count) free(description->stream); - if (description->title) - free(description->title); - if (description->author) - free(description->author); - if (description->copyright) - free(description->copyright); - if (description->abstract) - free(description->abstract); + free(description->title); + free(description->author); + free(description->copyright); + free(description->abstract); free(description); } |