Mercurial > mplayer.hg
diff sub/font_load_ft.c @ 32511:b39155e98ac3
Remove some useless NULL pointer checks before invoking free() on the pointer.
patch by From: Clment Bsch, ubitux gmail com
author | diego |
---|---|
date | Sun, 07 Nov 2010 12:47:40 +0000 |
parents | 9e627a1793b1 |
children | cf1f4f5bc096 |
line wrap: on
line diff
--- a/sub/font_load_ft.c Sun Nov 07 11:03:47 2010 +0000 +++ b/sub/font_load_ft.c Sun Nov 07 12:47:40 2010 +0000 @@ -860,27 +860,27 @@ // if (!desc->dynamic) return; // some vo_aa crap, better leaking than crashing - if (desc->name) free(desc->name); - if (desc->fpath) free(desc->fpath); + free(desc->name); + free(desc->fpath); for(i = 0; i < 16; i++) { if (desc->pic_a[i]) { - if (desc->pic_a[i]->bmp) free(desc->pic_a[i]->bmp); - if (desc->pic_a[i]->pal) free(desc->pic_a[i]->pal); - free (desc->pic_a[i]); + free(desc->pic_a[i]->bmp); + free(desc->pic_a[i]->pal); + free(desc->pic_a[i]); } if (desc->pic_b[i]) { - if (desc->pic_b[i]->bmp) free(desc->pic_b[i]->bmp); - if (desc->pic_b[i]->pal) free(desc->pic_b[i]->pal); - free (desc->pic_b[i]); + free(desc->pic_b[i]->bmp); + free(desc->pic_b[i]->pal); + free(desc->pic_b[i]); } } - if (desc->tables.g) free(desc->tables.g); - if (desc->tables.gt2) free(desc->tables.gt2); - if (desc->tables.om) free(desc->tables.om); - if (desc->tables.omt) free(desc->tables.omt); - if (desc->tables.tmp) free(desc->tables.tmp); + free(desc->tables.g); + free(desc->tables.gt2); + free(desc->tables.om); + free(desc->tables.omt); + free(desc->tables.tmp); for(i = 0; i < desc->face_cnt; i++) { FT_Done_Face(desc->faces[i]);