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 /libmpdemux/demux_viv.c | |
| 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 'libmpdemux/demux_viv.c')
| -rw-r--r-- | libmpdemux/demux_viv.c | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/libmpdemux/demux_viv.c b/libmpdemux/demux_viv.c index c416aa1535..0f14033976 100644 --- a/libmpdemux/demux_viv.c +++ b/libmpdemux/demux_viv.c @@ -230,12 +230,9 @@ static void vivo_parse_text_header(demuxer_t *demux, int header_len) token = strtok(NULL, (char *)&("\x0d\x0a")); } - if (buf) - free(buf); - if (opt) - free(opt); - if (param) - free(param); + free(buf); + free(opt); + free(param); } static int vivo_check_file(demuxer_t* demuxer){ @@ -745,14 +742,10 @@ static void demux_close_vivo(demuxer_t *demuxer) vivo_priv_t* priv=demuxer->priv; if (priv) { - if (priv->title) - free(priv->title); - if (priv->author) - free(priv->author); - if (priv->copyright) - free(priv->copyright); - if (priv->producer) - free(priv->producer); + free(priv->title); + free(priv->author); + free(priv->copyright); + free(priv->producer); free(priv); } return; |