summaryrefslogtreecommitdiffstats
path: root/stream/cdinfo.c
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-11-07 12:47:40 +0000
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-11-08 18:05:12 +0200
commit12d3e0df9980822282f70dffad148b729dbee541 (patch)
treed298b2c8f5039eae7aeeb16dfd927bea0efcc134 /stream/cdinfo.c
parentaf4b23cd36cff0dc34cde59c6a154fd080d11216 (diff)
downloadmpv-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 'stream/cdinfo.c')
-rw-r--r--stream/cdinfo.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/stream/cdinfo.c b/stream/cdinfo.c
index cc42bf11e4..3ec5560a24 100644
--- a/stream/cdinfo.c
+++ b/stream/cdinfo.c
@@ -53,15 +53,15 @@ void
cd_info_free(cd_info_t *cd_info) {
cd_track_t *cd_track, *cd_track_next;
if( cd_info==NULL ) return;
- if( cd_info->artist!=NULL ) free(cd_info->artist);
- if( cd_info->album!=NULL ) free(cd_info->album);
- if( cd_info->genre!=NULL ) free(cd_info->genre);
+ free(cd_info->artist);
+ free(cd_info->album);
+ free(cd_info->genre);
cd_track_next = cd_info->first;
while( cd_track_next!=NULL ) {
cd_track = cd_track_next;
cd_track_next = cd_track->next;
- if( cd_track->name!=NULL ) free(cd_track->name);
+ free(cd_track->name);
free(cd_track);
}
}