diff options
119 files changed, 277 insertions, 481 deletions
diff --git a/TOOLS/vfw2menc.c b/TOOLS/vfw2menc.c index bdeb960351..760b6950c9 100644 --- a/TOOLS/vfw2menc.c +++ b/TOOLS/vfw2menc.c @@ -295,9 +295,9 @@ int main(int argc, char *argv[]) } cleanup: - if (driver) free(driver); - if (fourcc) free(fourcc); - if (filename) free(filename); + free(driver); + free(fourcc); + free(filename); if (hDriver) CloseDriver(hDriver, 0, 0); if ((coinit == S_OK) || coinit == S_FALSE) CoUninitialize(); return ret; diff --git a/input/ar.c b/input/ar.c index a71f3d3eb4..d7cac43178 100644 --- a/input/ar.c +++ b/input/ar.c @@ -277,8 +277,7 @@ int mp_input_ar_init(void) (*queue)->addElement(queue, cookies[i], 0); // not used anymore - if (cookies != NULL) - free(cookies); + free(cookies); // Start data delivery to the queue. (*queue)->start(queue); @@ -290,8 +289,7 @@ int mp_input_ar_init(void) return 0; mp_input_ar_init_error: - if (cookies != NULL) - free(cookies); + free(cookies); if (hidDeviceInterface != NULL) { if (*hidDeviceInterface != NULL) { (*hidDeviceInterface)->close(hidDeviceInterface); diff --git a/input/input.c b/input/input.c index 294e091bf4..c08f3d49f0 100644 --- a/input/input.c +++ b/input/input.c @@ -659,8 +659,7 @@ void mp_input_rm_cmd_fd(struct input_ctx *ictx, int fd) return; if(cmd_fds[i].close_func) cmd_fds[i].close_func(cmd_fds[i].fd); - if(cmd_fds[i].buffer) - talloc_free(cmd_fds[i].buffer); + talloc_free(cmd_fds[i].buffer); if (i + 1 < ictx->num_cmd_fd) memmove(&cmd_fds[i], &cmd_fds[i+1], @@ -1131,10 +1130,8 @@ static mp_cmd_t* interpret_key(struct input_ctx *ictx, int code) ictx->num_key_down--; ictx->last_key_down = 0; ictx->ar_state = -1; - if (ictx->ar_cmd) { - mp_cmd_free(ictx->ar_cmd); - ictx->ar_cmd = NULL; - } + mp_cmd_free(ictx->ar_cmd); + ictx->ar_cmd = NULL; return ret; } @@ -1481,8 +1478,7 @@ static void bind_keys(struct input_ctx *ictx, memset(&bind_section->cmd_binds[i],0,2*sizeof(mp_cmd_bind_t)); bind = &bind_section->cmd_binds[i]; } - if(bind->cmd) - talloc_free(bind->cmd); + talloc_free(bind->cmd); bind->cmd = talloc_strdup(bind_section->cmd_binds, cmd); memcpy(bind->input,keys,(MP_MAX_KEY_DOWN+1)*sizeof(int)); } @@ -1652,8 +1648,7 @@ void mp_input_set_section(struct input_ctx *ictx, char *name) ictx->cmd_binds = NULL; ictx->cmd_binds_default = NULL; - if (ictx->section) - talloc_free(ictx->section); + talloc_free(ictx->section); if (name) ictx->section = talloc_strdup(ictx, name); else diff --git a/input/lirc.c b/input/lirc.c index a10d83816f..15a2d82d7f 100644 --- a/input/lirc.c +++ b/input/lirc.c @@ -115,10 +115,8 @@ int mp_input_lirc_read(int fd,char* dest, int s) { void mp_input_lirc_close(int fd) { - if(cmd_buf) { - free(cmd_buf); - cmd_buf = NULL; - } + free(cmd_buf); + cmd_buf = NULL; lirc_freeconfig(lirc_config); lirc_deinit(); } diff --git a/libaf/af.c b/libaf/af.c index 47eb9fa5b0..8b51eaa0d1 100644 --- a/libaf/af.c +++ b/libaf/af.c @@ -624,8 +624,7 @@ int af_resize_local_buffer(af_instance_t* af, af_data_t* data) mp_msg(MSGT_AFILTER, MSGL_V, "[libaf] Reallocating memory in module %s, " "old len = %i, new len = %i\n",af->info->name,af->data->len,len); // If there is a buffer free it - if(af->data->audio) - free(af->data->audio); + free(af->data->audio); // Create new buffer and check that it is OK af->data->audio = malloc(len); if(!af->data->audio){ diff --git a/libaf/af_center.c b/libaf/af_center.c index d3c867c39e..1cc3626439 100644 --- a/libaf/af_center.c +++ b/libaf/af_center.c @@ -78,9 +78,7 @@ static int control(struct af_instance_s* af, int cmd, void* arg) // Deallocate memory static void uninit(struct af_instance_s* af) { - if(af->data) free(af->data); - if(af->setup) free(af->setup); } diff --git a/libaf/af_comp.c b/libaf/af_comp.c index 4999612865..db88dade5a 100644 --- a/libaf/af_comp.c +++ b/libaf/af_comp.c @@ -107,9 +107,7 @@ static int control(struct af_instance_s* af, int cmd, void* arg) // Deallocate memory static void uninit(struct af_instance_s* af) { - if(af->data) free(af->data); - if(af->setup) free(af->setup); } diff --git a/libaf/af_delay.c b/libaf/af_delay.c index 84a76c470e..f0a9704eaa 100644 --- a/libaf/af_delay.c +++ b/libaf/af_delay.c @@ -49,10 +49,8 @@ static int control(struct af_instance_s* af, int cmd, void* arg) int i; // Free prevous delay queues - for(i=0;i<af->data->nch;i++){ - if(s->q[i]) - free(s->q[i]); - } + for(i=0;i<af->data->nch;i++) + free(s->q[i]); af->data->rate = ((af_data_t*)arg)->rate; af->data->nch = ((af_data_t*)arg)->nch; @@ -112,13 +110,11 @@ static int control(struct af_instance_s* af, int cmd, void* arg) static void uninit(struct af_instance_s* af) { int i; - if(af->data) - free(af->data); + + free(af->data); for(i=0;i<AF_NCH;i++) - if(((af_delay_t*)(af->setup))->q[i]) free(((af_delay_t*)(af->setup))->q[i]); - if(af->setup) - free(af->setup); + free(af->setup); } // Filter data through filter diff --git a/libaf/af_dummy.c b/libaf/af_dummy.c index 2d375924e1..ba921eb09b 100644 --- a/libaf/af_dummy.c +++ b/libaf/af_dummy.c @@ -41,7 +41,6 @@ static int control(struct af_instance_s* af, int cmd, void* arg) // Deallocate memory static void uninit(struct af_instance_s* af) { - if(af->data) free(af->data); } diff --git a/libaf/af_equalizer.c b/libaf/af_equalizer.c index bd69fdec9d..318b7a72d0 100644 --- a/libaf/af_equalizer.c +++ b/libaf/af_equalizer.c @@ -181,9 +181,7 @@ static int control(struct af_instance_s* af, int cmd, void* arg) // Deallocate memory static void uninit(struct af_instance_s* af) { - if(af->data) free(af->data); - if(af->setup) free(af->setup); } diff --git a/libaf/af_export.c b/libaf/af_export.c index 780df80a93..193271b45e 100644 --- a/libaf/af_export.c +++ b/libaf/af_export.c @@ -73,7 +73,7 @@ static int control(struct af_instance_s* af, int cmd, void* arg) int mapsize; // Free previous buffers - if (s->buf && s->buf[0]) + if (s->buf) free(s->buf[0]); |