(PS3/360) Refactor rarch_manage_libretro_install

360/main.c

@@ -324,10 +324,21 @@ int main(int argc, char *argv[])
    char full_path[1024];
    snprintf(full_path, sizeof(full_path), "game:\\CORE.xex");
 
-   bool load_libretro_path = rarch_manage_libretro_install(full_path, "game:\\", ".xex");
+   g_extern.verbose = true;
+
+   const char *libretro_core_installed = rarch_manage_libretro_install(full_path, "game:\\", ".xex");
+
+   g_extern.verbose = false;
+
+   bool find_libretro_file = false;
+
+   if(libretro_core_installed != NULL)
+      strlcpy(g_settings.libretro, libretro_core_installed, sizeof(g_settings.libretro));
+   else
+      find_libretro_file = true;
 
    set_default_settings();
-   init_settings(load_libretro_path);
+   init_settings(find_libretro_file);
    init_libretro_sym();
 
    video_xdk360.start();

console/libretro_mgmt.c

@@ -18,13 +18,12 @@
 
 #include "console_ext.h"
 
-bool rarch_manage_libretro_install(const char *full_path, const char *path, const char *exe_ext)
+const char *rarch_manage_libretro_install(const char *full_path, const char *path, const char *exe_ext)
 {
-   g_extern.verbose = true;
-   bool return_code;
-
-   bool set_libretro_path = false;
+   int ret;
+   const char *retstr = NULL;
    char tmp_path2[1024], tmp_pathnewfile[1024];
+
    RARCH_LOG("Assumed path of CORE executable: [%s]\n", full_path);
 
    if (path_file_exists(full_path))
@@ -33,8 +32,6 @@ bool rarch_manage_libretro_install(const char *full_path, const char *path, cons
       // a new libretro port and therefore we need to change it to a more
       // sane name.
 
-      int ret;
-
       rarch_console_name_from_id(tmp_path2, sizeof(tmp_path2));
       strlcat(tmp_path2, exe_ext, sizeof(tmp_path2));
       snprintf(tmp_pathnewfile, sizeof(tmp_pathnewfile), "%s%s", path, tmp_path2);
@@ -50,14 +47,14 @@ bool rarch_manage_libretro_install(const char *full_path, const char *path, cons
          ret = cellFsUnlink(tmp_pathnewfile);
          if (ret == CELL_FS_SUCCEEDED)
 #elif defined(_XBOX)
-            ret = DeleteFile(tmp_pathnewfile);
+         ret = DeleteFile(tmp_pathnewfile);
          if (ret != 0)
 #endif
          {
             RARCH_LOG("Succeeded in removing pre-existing libretro core: [%s].\n", tmp_pathnewfile);
          }
          else
-            RARCH_LOG("Failed to remove pre-existing libretro core: [%s].\n", tmp_pathnewfile);
+            RARCH_ERR("Failed to remove pre-existing libretro core: [%s].\n", tmp_pathnewfile);
       }
 
       //now attempt the renaming.
@@ -75,34 +72,17 @@ bool rarch_manage_libretro_install(const char *full_path, const char *path, cons
       else
       {
          RARCH_LOG("Libsnes core [%s] renamed to: [%s].\n", full_path, tmp_pathnewfile);
-         set_libretro_path = true;
+	 retstr = tmp_pathnewfile;
+         goto done;
       }
    }
-   else
-   {
-      RARCH_LOG("CORE executable was not found, libretro core path will be loaded from config file.\n");
-   }
 
-   if (set_libretro_path)
-   {
-      // CORE executable has been renamed, libretro path will now be set to the recently
-      // renamed new libretro core.
-      strlcpy(g_settings.libretro, tmp_pathnewfile, sizeof(g_settings.libretro));
-      return_code = 0;
-   }
-   else
-   {
-      // There was no CORE executable present, or the CORE executable file was not renamed.
-      // The libretro core path will still be loaded from the config file.
-      return_code = 1;
-   }
-
-   g_extern.verbose = false;
-
-   return return_code;
+   RARCH_WARN("CORE executable was not found, or some other errors occurred. Will attempt to load libretro core path from config file.\n");
+done:
+   return retstr;
 }
 
-const char * rarch_manage_libretro_set_first_file(const char *libretro_path, const char * exe_ext)
+const char *rarch_manage_libretro_set_first_file(const char *libretro_path, const char * exe_ext)
 {
    //We need to set libretro to the first entry in the cores
    //directory so that it will be saved to the config file

console/libretro_mgmt.h

@@ -19,7 +19,7 @@
 
 #include "../boolean.h"
 
-bool rarch_manage_libretro_install(const char *full_path, const char *path, const char *exe_ext);
-const char * rarch_manage_libretro_set_first_file(const char *libretro_path, const char * exe_ext);
+const char *rarch_manage_libretro_install(const char *full_path, const char *path, const char *exe_ext);
+const char *rarch_manage_libretro_set_first_file(const char *libretro_path, const char * exe_ext);
 
 #endif

ps3/main.c

@@ -389,10 +389,22 @@ int main(int argc, char *argv[])
    char full_path[1024], tmp_path[1024];
    snprintf(full_path, sizeof(full_path), "%s/%s/CORE.SELF", usrDirPath, EMULATOR_CORE_DIR);
    snprintf(tmp_path, sizeof(tmp_path), "%s/%s/", usrDirPath, EMULATOR_CORE_DIR);
-   bool load_libretro_path = rarch_manage_libretro_install(full_path, tmp_path, ".SELF");
+
+   g_extern.verbose = true;
+
+   const char *libretro_core_installed = rarch_manage_libretro_install(full_path, tmp_path, ".SELF");
+
+   g_extern.verbose = false;
+
+   bool find_libretro_file = false;
+
+   if(libretro_core_installed != NULL)
+      strlcpy(g_settings.libretro, libretro_core_installed, sizeof(g_settings.libretro));
+   else
+      find_libretro_file = true;
 
    set_default_settings();
-   init_settings(load_libretro_path);
+   init_settings(find_libretro_file);
    init_libretro_sym();
 
 #if(CELL_SDK_VERSION > 0x340000)