From c2dd8b884e875674531a2909f8a699190765837a Mon Sep 17 00:00:00 2001 From: twinaphex Date: Fri, 3 Jun 2016 04:18:28 +0200 Subject: [PATCH] Cleanups --- menu/drivers/nuklear.c | 8 +++++--- menu/drivers/zarch.c | 16 ++++++++-------- menu/menu_content.c | 16 ++++++++++------ menu/menu_shader.c | 22 +++++++++++----------- 4 files changed, 34 insertions(+), 28 deletions(-) diff --git a/menu/drivers/nuklear.c b/menu/drivers/nuklear.c index 826eacae91..b8f0fbcacf 100644 --- a/menu/drivers/nuklear.c +++ b/menu/drivers/nuklear.c @@ -226,7 +226,8 @@ static void nk_menu_layout(nk_menu_handle_t *nk) static void nk_menu_init_device(nk_menu_handle_t *nk) { - char buf[PATH_MAX_LENGTH]; + char buf[PATH_MAX_LENGTH] = {0}; + fill_pathname_join(buf, nk->assets_directory, "DroidSans.ttf", sizeof(buf)); @@ -348,9 +349,10 @@ static void nk_menu_context_destroy(void *data) static void nk_menu_context_reset(void *data) { char iconpath[PATH_MAX_LENGTH] = {0}; - nk_menu_handle_t *nk = (nk_menu_handle_t*)data; + nk_menu_handle_t *nk = (nk_menu_handle_t*)data; settings_t *settings = config_get_ptr(); - unsigned width, height = 0; + unsigned width = 0; + unsigned height = 0; video_driver_get_size(&width, &height); diff --git a/menu/drivers/zarch.c b/menu/drivers/zarch.c index 1591930354..0c44ed33c6 100644 --- a/menu/drivers/zarch.c +++ b/menu/drivers/zarch.c @@ -339,8 +339,8 @@ static bool zarch_zui_list_item(zui_t *zui, struct zui_tabbed *tab, int x1, int const char *label, unsigned item_id, const char *entry, bool selected) { menu_animation_ctx_ticker_t ticker; - char title_buf[PATH_MAX_LENGTH]; unsigned ticker_size; + char title_buf[PATH_MAX_LENGTH] = {0}; uint64_t *frame_count = NULL; unsigned id = zarch_zui_hash(zui, label); int x2 = x1 + zui->width - 290 - 40; @@ -586,9 +586,9 @@ static void zarch_zui_render_lay_root_load_set_new_path(zui_t *zui, static int zarch_zui_render_lay_root_load(zui_t *zui, struct zui_tabbed *tabbed) { - char parent_dir[PATH_MAX_LENGTH]; - settings_t *settings = config_get_ptr(); - core_info_list_t *list = NULL; + char parent_dir[PATH_MAX_LENGTH] = {0}; + settings_t *settings = config_get_ptr(); + core_info_list_t *list = NULL; if (zarch_zui_tab(zui, tabbed, "Load", 1)) { @@ -650,9 +650,9 @@ static int zarch_zui_render_lay_root_load(zui_t *zui, for (i = skip + zui->load_dlist_first; i < size; ++i) { - char label[PATH_MAX_LENGTH]; - const char *path = NULL; - const char *basename = NULL; + char label[PATH_MAX_LENGTH] = {0}; + const char *path = NULL; + const char *basename = NULL; if (j > 10) break; @@ -727,7 +727,7 @@ static int zarch_zui_render_lay_root_downloads( static int zarch_zui_render_lay_root(zui_t *zui) { - char item[PATH_MAX_LENGTH]; + char item[PATH_MAX_LENGTH] = {0}; static struct zui_tabbed tabbed = {~0U}; zarch_zui_tabbed_begin(zui, &tabbed, 0, 0); diff --git a/menu/menu_content.c b/menu/menu_content.c index 427d4e6632..165fcde7b3 100644 --- a/menu/menu_content.c +++ b/menu/menu_content.c @@ -129,13 +129,17 @@ static bool menu_content_find_first_core(menu_content_ctx_defer_info_t *def_info { char new_core_path[PATH_MAX_LENGTH] = {0}; const core_info_t *info = NULL; + core_info_list_t *core_info = NULL; + const char *default_info_dir = NULL; size_t supported = 0; - core_info_list_t *core_info = def_info ? - (core_info_list_t*)def_info->data : NULL; - uint32_t menu_label_hash = - menu_hash_calculate(def_info->menu_label); - const char *default_info_dir = def_info ? - def_info->dir : NULL; + uint32_t menu_label_hash = 0; + + if (def_info) + { + menu_label_hash = menu_hash_calculate(def_info->menu_label); + core_info = (core_info_list_t*)def_info->data; + default_info_dir = def_info->dir; + } if (!string_is_empty(default_info_dir)) { diff --git a/menu/menu_shader.c b/menu/menu_shader.c index f8a01b27ce..607c661c03 100644 --- a/menu/menu_shader.c +++ b/menu/menu_shader.c @@ -214,17 +214,17 @@ void menu_shader_manager_save_preset( const char *basename, bool apply) { #ifdef HAVE_SHADER_MANAGER - char buffer[PATH_MAX_LENGTH]; - char config_directory[PATH_MAX_LENGTH]; - char preset_path[PATH_MAX_LENGTH]; - unsigned d, type = RARCH_SHADER_NONE; - const char *dirs[3] = {0}; - config_file_t *conf = NULL; - bool ret = false; - struct video_shader *shader = NULL; - global_t *global = global_get_ptr(); - settings_t *settings = config_get_ptr(); - menu_handle_t *menu = NULL; + char buffer[PATH_MAX_LENGTH] = {0}; + char config_directory[PATH_MAX_LENGTH] = {0}; + char preset_path[PATH_MAX_LENGTH] = {0}; + unsigned d, type = RARCH_SHADER_NONE; + const char *dirs[3] = {0}; + config_file_t *conf = NULL; + bool ret = false; + struct video_shader *shader = NULL; + global_t *global = global_get_ptr(); + settings_t *settings = config_get_ptr(); + menu_handle_t *menu = NULL; if (!menu_driver_ctl(RARCH_MENU_CTL_DRIVER_DATA_GET, &menu)) {