From 974d3245d2d29771a00c9cce280704ec803f8b24 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 23 May 2016 22:04:00 +0200 Subject: [PATCH] Fix logically dead code warnings --- driver.c | 2 -- input/connect/joypad_connection.c | 9 +++------ input/drivers/linuxraw_input.c | 2 -- input/drivers_joypad/parport_joypad.c | 4 ---- input/input_config.c | 6 +----- input/input_overlay.c | 3 --- libretro-common/net/net_ifinfo.c | 3 --- list_special.c | 3 +-- managers/core_option_manager.c | 5 ----- menu/menu_displaylist.c | 3 --- tasks/task_decompress.c | 2 -- tasks/task_http.c | 2 -- tasks/task_image.c | 2 -- tasks/task_overlay.c | 3 --- 14 files changed, 5 insertions(+), 44 deletions(-) diff --git a/driver.c b/driver.c index 9bebc2a2a8..fe17c74029 100644 --- a/driver.c +++ b/driver.c @@ -139,8 +139,6 @@ static int driver_find_index(const char * label, const char *drv) for (i = 0; (obj = (const void*) find_driver_nonempty(label, i, str, sizeof(str))) != NULL; i++) { - if (!obj) - return -1; if (string_is_empty(str)) break; if (string_is_equal_noncase(drv, str)) diff --git a/input/connect/joypad_connection.c b/input/connect/joypad_connection.c index 70b165f8db..f03e77161d 100644 --- a/input/connect/joypad_connection.c +++ b/input/connect/joypad_connection.c @@ -54,12 +54,9 @@ joypad_connection_t *pad_connection_init(unsigned pads) { joypad_connection_t *conn = (joypad_connection_t*)&joyconn[i]; - if (!conn) - continue; - - conn->connected = false; - conn->iface = NULL; - conn->data = NULL; + conn->connected = false; + conn->iface = NULL; + conn->data = NULL; } return joyconn; diff --git a/input/drivers/linuxraw_input.c b/input/drivers/linuxraw_input.c index 4beccb6c33..82c5534145 100644 --- a/input/drivers/linuxraw_input.c +++ b/input/drivers/linuxraw_input.c @@ -87,8 +87,6 @@ static bool linuxraw_is_pressed(linuxraw_input_t *linuxraw, if (id >= RARCH_BIND_LIST_END) return false; - if (!bind) - return false; return bind->valid && linuxraw_key_pressed(linuxraw, binds[id].key); } diff --git a/input/drivers_joypad/parport_joypad.c b/input/drivers_joypad/parport_joypad.c index 115c46d26f..9493a2356f 100644 --- a/input/drivers_joypad/parport_joypad.c +++ b/input/drivers_joypad/parport_joypad.c @@ -327,16 +327,12 @@ static void parport_joypad_destroy(void) static bool parport_joypad_button(unsigned port, uint16_t joykey) { const struct parport_joypad *pad = (const struct parport_joypad*)&parport_pads[port]; - if (!pad) - return false; return joykey < PARPORT_NUM_BUTTONS && BIT64_GET(pad->buttons, joykey); } static uint64_t parport_joypad_get_buttons(unsigned port) { const struct parport_joypad *pad = (const struct parport_joypad*)&parport_pads[port]; - if (!pad) - return false; return pad->buttons; } diff --git a/input/input_config.c b/input/input_config.c index 8ae3435193..1d5c5d86e4 100644 --- a/input/input_config.c +++ b/input/input_config.c @@ -136,11 +136,7 @@ const struct input_bind_map input_config_bind_map[RARCH_BIND_LIST_END_NULL] = { static const void *input_config_bind_map_get(unsigned i) { - const struct input_bind_map *keybind = - (const struct input_bind_map*)&input_config_bind_map[i]; - if (!keybind) - return NULL; - return keybind; + return (const struct input_bind_map*)&input_config_bind_map[i]; } bool input_config_bind_map_get_valid(unsigned i) diff --git a/input/input_overlay.c b/input/input_overlay.c index 813d312756..6a2e9282ec 100644 --- a/input/input_overlay.c +++ b/input/input_overlay.c @@ -754,9 +754,6 @@ void input_state_overlay(int16_t *ret, unsigned port, unsigned device, unsigned { input_overlay_state_t *ol_state = &overlay_st_ptr; - if (!ol_state) - return; - if (port != 0) return; diff --git a/libretro-common/net/net_ifinfo.c b/libretro-common/net/net_ifinfo.c index 63bbb90413..7559387f4f 100644 --- a/libretro-common/net/net_ifinfo.c +++ b/libretro-common/net/net_ifinfo.c @@ -56,9 +56,6 @@ void net_ifinfo_free(net_ifinfo_t *list) struct net_ifinfo_entry *ptr = (struct net_ifinfo_entry*)&list->entries[k]; - if (!ptr) - continue; - if (*ptr->name) free(ptr->name); if (*ptr->host) diff --git a/list_special.c b/list_special.c index 72a1864969..0c1a0003d8 100644 --- a/list_special.c +++ b/list_special.c @@ -260,9 +260,8 @@ struct string_list *string_list_new_special(enum string_list_type type, for (i = 0; i < *list_size; i++) { - const char *opt = NULL; const core_info_t *info = (const core_info_t*)&core_info[i]; - opt = info ? info->display_name : NULL; + const char *opt = info->display_name; if (!opt) goto error; diff --git a/managers/core_option_manager.c b/managers/core_option_manager.c index f5075a9365..d163142974 100644 --- a/managers/core_option_manager.c +++ b/managers/core_option_manager.c @@ -55,9 +55,6 @@ static bool core_option_manager_parse_variable(core_option_manager_t *opt, size_ char *config_val = NULL; struct core_option *option = (struct core_option*)&opt->opts[idx]; - if (!option) - return false; - option->key = strdup(var->key); value = strdup(var->value); desc_end = strstr(value, "; "); @@ -327,8 +324,6 @@ const char *core_option_manager_get_val(core_option_manager_t *opt, size_t idx) if (!opt) return NULL; option = (struct core_option*)&opt->opts[idx]; - if (!option) - return NULL; return option->vals->elems[option->index].data; } diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index 1c5e314a52..234824669e 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -3387,9 +3387,6 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data) menu_displaylist_ctx_parse_entry_t *entry = (menu_displaylist_ctx_parse_entry_t*)data; - if (!entry) - goto error; - if (menu_displaylist_parse_settings(entry->data, entry->info, entry->info_label, diff --git a/tasks/task_decompress.c b/tasks/task_decompress.c index 85bc3a3ce3..745c330efb 100644 --- a/tasks/task_decompress.c +++ b/tasks/task_decompress.c @@ -328,7 +328,5 @@ bool rarch_task_push_decompress( error: if (s) free(s); - if (t) - free(t); return false; } diff --git a/tasks/task_http.c b/tasks/task_http.c index 29a2d685ec..3d9ff0e9b3 100644 --- a/tasks/task_http.c +++ b/tasks/task_http.c @@ -296,8 +296,6 @@ void *rarch_task_push_http_transfer(const char *url, const char *type, error: if (conn) net_http_connection_free(conn); - if (t) - free(t); if (http) free(http); diff --git a/tasks/task_image.c b/tasks/task_image.c index 9489ffb6c4..fc340af8d6 100644 --- a/tasks/task_image.c +++ b/tasks/task_image.c @@ -392,8 +392,6 @@ bool rarch_task_push_image_load(const char *fullpath, error: rarch_task_image_load_free(t); - if (t) - free(t); nbio_free(handle); if (nbio) free(nbio); diff --git a/tasks/task_overlay.c b/tasks/task_overlay.c index 27bbbe66e2..9455b8fd6c 100644 --- a/tasks/task_overlay.c +++ b/tasks/task_overlay.c @@ -412,9 +412,6 @@ static void rarch_task_overlay_deferred_load(overlay_loader_t *loader) overlay = &loader->overlays[loader->pos]; - if (!overlay) - continue; - snprintf(overlay->config.descs.key, sizeof(overlay->config.descs.key), "overlay%u_descs", loader->pos);