diff options
author | Grigori Goronzy <greg@blackbox> | 2010-08-09 03:28:29 +0200 |
---|---|---|
committer | Grigori Goronzy <greg@blackbox> | 2010-08-09 05:58:00 +0200 |
commit | 32083be82b7b533fa85c36ae5ccacea94857fafa (patch) | |
tree | b492d25d52fe7daed512d828aabccaa1eff4352d /libass/ass.c | |
parent | 65d9960f24ec25cadfacd505046f9e4f2932bb12 (diff) | |
download | libass-32083be82b7b533fa85c36ae5ccacea94857fafa.tar.bz2 libass-32083be82b7b533fa85c36ae5ccacea94857fafa.tar.xz |
Get rid of NULL checks for free
The useless "if (foo) free(foo)" idiom is all over the place, just
get rid of it finally...
Diffstat (limited to 'libass/ass.c')
-rw-r--r-- | libass/ass.c | 36 |
1 files changed, 14 insertions, 22 deletions
diff --git a/libass/ass.c b/libass/ass.c index b080ff9a..cc66e1a1 100644 --- a/libass/ass.c +++ b/libass/ass.c @@ -65,26 +65,22 @@ void ass_free_track(ASS_Track *track) int i; if (track->parser_priv) { - if (track->parser_priv->fontname) - free(track->parser_priv->fontname); - if (track->parser_priv->fontdata) - free(track->parser_priv->fontdata); + free(track->parser_priv->fontname); + free(track->parser_priv->fontdata); free(track->parser_priv); } - if (track->style_format) - free(track->style_format); - if (track->event_format) - free(track->event_format); + free(track->style_format); + free(track->event_format); if (track->styles) { for (i = 0; i < track->n_styles; ++i) ass_free_style(track, i); - free(track->styles); } + free(track->styles); if (track->events) { for (i = 0; i < track->n_events; ++i) ass_free_event(track, i); - free(track->events); } + free(track->events); free(track->name); free(track); } @@ -136,23 +132,19 @@ int ass_alloc_event(ASS_Track *track) void ass_free_event(ASS_Track *track, int eid) { ASS_Event *event = track->events + eid; - if (event->Name) - free(event->Name); - if (event->Effect) - free(event->Effect); - if (event->Text) - free(event->Text); - if (event->render_priv) - free(event->render_priv); + + free(event->Name); + free(event->Effect); + free(event->Text); + free(event->render_priv); } void ass_free_style(ASS_Track *track, int sid) { ASS_Style *style = track->styles + sid; - if (style->Name) - free(style->Name); - if (style->FontName) - free(style->FontName); + + free(style->Name); + free(style->FontName); } // ============================================================================================== |