summaryrefslogtreecommitdiffstats
path: root/libaf/af_export.c
diff options
context:
space:
mode:
authorcboesch <cboesch@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-11-14 09:12:34 +0000
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-11-14 13:11:20 +0200
commitfe3c4810e1c8b535caf07df8e4434e322d3e6fc0 (patch)
treecbcd859f358c479223eb7b0aa2a2d3dfe1c81b69 /libaf/af_export.c
parentb492561241f2a3263a8ab558fafc957130dbdfc1 (diff)
downloadmpv-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 'libaf/af_export.c')
-rw-r--r--libaf/af_export.c19
1 files changed, 7 insertions, 12 deletions
diff --git a/libaf/af_export.c b/libaf/af_export.c
index 780df80a93..193271b45e 100644
--- a/libaf/af_export.c
+++ b/libaf/af_export.c
@@ -73,7 +73,7 @@ static int control(struct af_instance_s* af, int cmd, void* arg)
int mapsize;
// Free previous buffers
- if (s->buf && s->buf[0])
+ if (s->buf)
free(s->buf[0]);
// unmap previous area
@@ -136,8 +136,7 @@ static int control(struct af_instance_s* af, int cmd, void* arg)
char *str = arg;
if (!str){
- if(s->filename)
- free(s->filename);
+ free(s->filename);
s->filename = get_path(SHARED_FILE);
return AF_OK;
@@ -146,8 +145,7 @@ static int control(struct af_instance_s* af, int cmd, void* arg)
while((str[i]) && (str[i] != ':'))
i++;
- if(s->filename)
- free(s->filename);
+ free(s->filename);
s->filename = calloc(i + 1, 1);
memcpy(s->filename, str, i);
@@ -177,14 +175,12 @@ static int control(struct af_instance_s* af, int cmd, void* arg)
*/
static void uninit( struct af_instance_s* af )
{
- if (af->data){
- free(af->data);
- af->data = NULL;
- }
+ free(af->data);
+ af->data = NULL;
if(af->setup){
af_export_t* s = af->setup;
- if (s->buf && s->buf[0])
+ if (s->buf)
free(s->buf[0]);
// Free mmaped area
@@ -194,8 +190,7 @@ static void uninit( struct af_instance_s* af )
if(s->fd > -1)
close(s->fd);
- if(s->filename)
- free(s->filename);
+ free(s->filename);
free(af->setup);
af->setup = NULL;