From 91bad2b25d328366a2576df7d0c11a709c0a4b36 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sat, 9 Aug 2014 03:25:11 +0200
Subject: [PATCH] (PS3) Build fixes

---
 frontend/frontend.c                         |  3 ++-
 frontend/menu/backend/menu_common_backend.c |  2 +-
 frontend/menu/disp/rmenu.c                  |  2 +-
 settings_data.c                             | 23 +++++++++++----------
 4 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/frontend/frontend.c b/frontend/frontend.c
index 9a7f868376..8e01a85674 100644
--- a/frontend/frontend.c
+++ b/frontend/frontend.c
@@ -280,7 +280,7 @@ bool main_load_content(int argc, char **argv, args_type() args, environment_get_
    char **rarch_argv_ptr;
    struct rarch_main_wrap *wrap_args;
    bool retval = true;
-   int i, ret, rarch_argc = 0;
+   int i, ret = 0, rarch_argc = 0;
    char *rarch_argv[MAX_ARGS] = {NULL};
    char *argv_copy [MAX_ARGS] = {NULL};
 
@@ -289,6 +289,7 @@ bool main_load_content(int argc, char **argv, args_type() args, environment_get_
 
    (void)rarch_argc_ptr;
    (void)rarch_argv_ptr;
+   (void)ret;
 
    wrap_args = (struct rarch_main_wrap*)calloc(1, sizeof(*wrap_args));
    rarch_assert(wrap_args);
diff --git a/frontend/menu/backend/menu_common_backend.c b/frontend/menu/backend/menu_common_backend.c
index c8943a8a29..4bfce535e3 100644
--- a/frontend/menu/backend/menu_common_backend.c
+++ b/frontend/menu/backend/menu_common_backend.c
@@ -1998,7 +1998,7 @@ static int menu_custom_bind_iterate(void *data, unsigned action)
    if (driver.video_data && driver.menu_ctx && driver.menu_ctx->render_messagebox)
       driver.menu_ctx->render_messagebox(msg);
 
-   struct menu_bind_state binds = (struct menu_bind_state)menu->binds;
+   struct menu_bind_state binds = menu->binds;
    menu_poll_bind_state(&binds);
 
    if ((binds.skip && !menu->binds.skip) || menu_poll_find_trigger(&menu->binds, &binds))
diff --git a/frontend/menu/disp/rmenu.c b/frontend/menu/disp/rmenu.c
index 81f26403b5..95b937237e 100644
--- a/frontend/menu/disp/rmenu.c
+++ b/frontend/menu/disp/rmenu.c
@@ -366,7 +366,7 @@ static void rmenu_render(void)
          if (type == MENU_FILE_PLAIN)
          {
             strlcpy(type_str, "(CORE)", sizeof(type_str));
-            file_list_get_alt_at_offset(menu->selection_buf, i, &path, setting);
+            file_list_get_alt_at_offset(menu->selection_buf, i, &path);
             w = 6;
          }
          else
diff --git a/settings_data.c b/settings_data.c
index 150a6fbd1c..41a3a07291 100644
--- a/settings_data.c
+++ b/settings_data.c
@@ -277,31 +277,32 @@ bool setting_data_save_config(const rarch_setting_t* settings, config_file_t* co
 
 rarch_setting_t* setting_data_find_setting(rarch_setting_t* settings, const char* name)
 {
+   bool found = false;
    rarch_setting_t *setting = NULL;
 
    if (!name)
-      goto notfound;
+      return NULL;
 
    for (setting = settings; setting->type != ST_NONE; setting++)
    {
       if (setting->type <= ST_GROUP && strcmp(setting->name, name) == 0)
       {
-         goto found;
+         found = true;
          break;
       }
    }
     
-   goto notfound;
-found:
-    if (setting->short_description && setting->short_description[0] == '\0')
-       goto notfound;
-    
-    if (setting->read_handler)
-        setting->read_handler(setting);
+   if (found)
+   {
+      if (setting->short_description && setting->short_description[0] == '\0')
+         return NULL;
 
-   return setting;
+      if (setting->read_handler)
+         setting->read_handler(setting);
+
+      return setting;
+   }
 
-notfound:
    return NULL;
 }