From 546f01eea3ab780e07c4858fd8fedcb732631b76 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sun, 16 Oct 2016 01:45:50 +0200
Subject: [PATCH] Prevent some more implicit memsets

---
 menu/drivers/xmb.c  | 21 +++++++++++++++------
 menu/menu_setting.c |  2 +-
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c
index 068087c224..04dfc41d5a 100644
--- a/menu/drivers/xmb.c
+++ b/menu/drivers/xmb.c
@@ -773,7 +773,10 @@ static void xmb_update_thumbnail_path(void *data, unsigned i)
 
    if (tmp)
    {
-      char tmp_new[PATH_MAX_LENGTH] = {0};
+      char tmp_new[PATH_MAX_LENGTH];
+
+      tmp_new[0] = '\0';
+
       fill_pathname_join(tmp_new, xmb->thumbnail_file_path, tmp, sizeof(tmp_new));
       strlcpy(xmb->thumbnail_file_path, tmp_new, sizeof(xmb->thumbnail_file_path));
       free(tmp);
@@ -2188,8 +2191,8 @@ static void xmb_frame(void *data)
    float item_color[16], coord_black[16], coord_white[16];
    menu_display_ctx_rotate_draw_t rotate_draw;
    char msg[PATH_MAX_LENGTH];
-   char title_msg[256]                     = {0};
-   char title_truncated[256]               = {0};
+   char title_msg[256];
+   char title_truncated[256];
    bool render_background                  = false;
    file_list_t *selection_buf              = NULL;
    file_list_t *menu_stack                 = NULL;
@@ -2289,7 +2292,9 @@ static void xmb_frame(void *data)
    if (settings->menu.timedate_enable)
    {
       menu_display_ctx_datetime_t datetime;
-      char timedate[256] = {0};
+      char timedate[256];
+
+      timedate[0]        = '\0';
 
       datetime.s         = timedate;
       datetime.len       = sizeof(timedate);
@@ -2953,9 +2958,11 @@ static void xmb_context_reset_textures(
 
 static void xmb_context_reset_background(const char *iconpath)
 {
-   char path[PATH_MAX_LENGTH]  = {0};
+   char path[PATH_MAX_LENGTH];
    settings_t *settings        = config_get_ptr();
 
+   path[0] = '\0';
+
    fill_pathname_join(path, iconpath, "bg.png", sizeof(path));
 
    if (!string_is_empty(settings->path.menu_wallpaper))
@@ -2970,11 +2977,13 @@ static void xmb_context_reset_background(const char *iconpath)
 
 static void xmb_context_reset(void *data)
 {
-   char iconpath[PATH_MAX_LENGTH]  = {0};
+   char iconpath[PATH_MAX_LENGTH];
    xmb_handle_t *xmb               = (xmb_handle_t*)data;
    if (!xmb)
       return;
 
+   iconpath[0] = '\0';
+
    fill_pathname_application_special(xmb->background_file_path,
          sizeof(xmb->background_file_path),
          APPLICATION_SPECIAL_DIRECTORY_ASSETS_XMB_BG);
diff --git a/menu/menu_setting.c b/menu/menu_setting.c
index ca2c0b958d..620fc43208 100644
--- a/menu/menu_setting.c
+++ b/menu/menu_setting.c
@@ -1472,7 +1472,6 @@ void general_read_handler(void *data)
 void general_write_handler(void *data)
 {
    enum event_command rarch_cmd = CMD_EVENT_NONE;
-   menu_displaylist_info_t info = {0};
    rarch_setting_t *setting     = (rarch_setting_t*)data;
    settings_t *settings         = config_get_ptr();
    global_t *global             = global_get_ptr();
@@ -1532,6 +1531,7 @@ void general_write_handler(void *data)
       case MENU_ENUM_LABEL_HELP:
          if (*setting->value.target.boolean)
          {
+            menu_displaylist_info_t info = {0};
             info.list          = menu_stack;
             info.type          = 0; 
             info.directory_ptr = 0;