Mercurial > mplayer.hg
diff mplayer.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 | fbe5c829c69b |
children | 8fa2f43cb760 |
line wrap: on
line diff
--- a/mplayer.c Sun Nov 07 11:03:47 2010 +0000 +++ b/mplayer.c Sun Nov 07 12:47:40 2010 +0000 @@ -599,7 +599,7 @@ static void mp_dvdnav_context_free(MPContext *ctx){ if (ctx->nav_smpi) free_mp_image(ctx->nav_smpi); ctx->nav_smpi = NULL; - if (ctx->nav_buffer) free(ctx->nav_buffer); + free(ctx->nav_buffer); ctx->nav_buffer = NULL; ctx->nav_start = NULL; ctx->nav_in_size = 0; @@ -760,7 +760,7 @@ mpctx->playtree = NULL; - if(edl_records != NULL) free(edl_records); // free mem allocated for EDL + free(edl_records); // free mem allocated for EDL edl_records = NULL; switch(how) { case EXIT_QUIT: @@ -2037,8 +2037,7 @@ if (mpctx->stream->type != STREAMTYPE_DVDNAV) return; - if (mpctx->nav_buffer) - free(mpctx->nav_buffer); + free(mpctx->nav_buffer); mpctx->nav_buffer = malloc(in_size); mpctx->nav_start = start; @@ -3947,8 +3946,7 @@ while( !brk_cmd && (cmd = mp_input_get_cmd(0,0,0)) != NULL) { brk_cmd = run_command(mpctx, cmd); if (cmd->id == MP_CMD_EDL_LOADFILE) { - if (edl_filename) - free(edl_filename); + free(edl_filename); edl_filename = strdup(cmd->args[0].v.s); if (edl_filename) edl_loadfile();