summaryrefslogtreecommitdiffstats
path: root/libvo/vo_fbdev.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 /libvo/vo_fbdev.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 'libvo/vo_fbdev.c')
-rw-r--r--libvo/vo_fbdev.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/libvo/vo_fbdev.c b/libvo/vo_fbdev.c
index 0bddd8dfce..991673a9cd 100644
--- a/libvo/vo_fbdev.c
+++ b/libvo/vo_fbdev.c
@@ -366,10 +366,8 @@ err_out_parse_error:
err_out_print_linenum:
mp_msg(MSGT_VO, MSGL_V, " at line %d\n", line_num);
err_out:
- if (fb_modes) {
- free(fb_modes);
- fb_modes = NULL;
- }
+ free(fb_modes);
+ fb_modes = NULL;
nr_modes = 0;
free(line);
free(fp);
@@ -1121,8 +1119,7 @@ static int preinit(const char *vo_subdevice)
else
#endif
{
- if (fb_dev_name)
- free(fb_dev_name);
+ free(fb_dev_name);
fb_dev_name = strdup(vo_subdevice);
}
}