Get rid of path_get_content

dynamic.c

@@ -1026,8 +1026,8 @@ bool rarch_environment_cb(unsigned cmd, void *data)
       case RETRO_ENVIRONMENT_GET_SYSTEM_DIRECTORY:
          if (string_is_empty(settings->directory.system))
          {
-            char *fullpath = NULL;
+            const char *fullpath = path_get(RARCH_PATH_CONTENT);
-            if (path_get_content(&fullpath) && fullpath)
+            if (!string_is_empty(fullpath))
             {
                char temp_path[PATH_MAX_LENGTH] = {0};
 

menu/menu_displaylist.c

@@ -2701,15 +2701,13 @@ static int menu_displaylist_parse_horizontal_content_actions(
    const char *core_path           = NULL;
    const char *core_name           = NULL;
    const char *db_name             = NULL;
-   char *fullpath                  = NULL;
    playlist_t *playlist            = NULL;
    settings_t *settings            = config_get_ptr();
+   const char *fullpath            = path_get(RARCH_PATH_CONTENT);
 
    if (!menu_driver_ctl(RARCH_MENU_CTL_DRIVER_DATA_GET, &menu))
       return -1;
 
-   path_get_content(&fullpath);
-
    if (!rarch_ctl(RARCH_CTL_IS_DUMMY_CORE, NULL)
          && string_is_equal(menu->deferred_path, fullpath))
       menu_displaylist_parse_load_content_settings(info);

paths.c

@@ -658,21 +658,6 @@ void path_clear_all(void)
    path_clear(RARCH_PATH_BASENAME);
 }
 
-/* Core options file path */
-
-
-/* Append config file path */
-
-
-bool path_get_content(char **fullpath)
-{
-   if (!fullpath)
-      return false;
-   *fullpath       = (char*)path_content;
-
-   return true;
-}
-
 enum rarch_content_type path_is_media_type(const char *path)
 {
    char ext_lower[PATH_MAX_LENGTH] = {0};

paths.h

@@ -82,8 +82,6 @@ struct string_list *path_get_subsystem_list(void);
 
 const char *path_get(enum rarch_path_type type);
 
-bool path_get_content(char **fullpath);
-
 const char *path_get_current_savefile_dir(void);
 
 bool path_get_default_shader_preset(char **preset);

retroarch.c

@@ -955,8 +955,8 @@ static void retroarch_validate_cpu_features(void)
 
 static void retroarch_main_init_media(void)
 {
-   char    *fullpath    = NULL;
+   settings_t *settings    = config_get_ptr();
-   settings_t *settings = config_get_ptr();
+   const char    *fullpath = path_get(RARCH_PATH_CONTENT);
 
    if (!settings)
       return;
@@ -966,9 +966,6 @@ static void retroarch_main_init_media(void)
       )
       return;
 
-   if (!path_get_content(&fullpath))
-      return;
-
    if (string_is_empty(fullpath))
       return;
 

tasks/task_content.c

@@ -668,7 +668,6 @@ static bool init_content_file_set_attribs(
    }
    else
    {
-      char       *fullpath        = NULL;
       rarch_system_info_t *system = NULL;
       settings_t *settings        = config_get_ptr();
 
@@ -681,14 +680,14 @@ static bool init_content_file_set_attribs(
       }
       attr.i              |= (!content_does_not_need_content())  << 2;
 
-      if (!path_get_content(&fullpath)
+      if (path_is_empty(RARCH_PATH_CONTENT)
             && content_does_not_need_content()
             && settings->set_supports_no_game_enable)
          string_list_append(content, "", attr);
       else
       {
-         if(fullpath)
+         if (!path_is_empty(RARCH_PATH_CONTENT))
-            string_list_append(content, fullpath, attr);
+            string_list_append(content, path_get(RARCH_PATH_CONTENT), attr);
       }
    }
 
@@ -825,14 +824,11 @@ error:
 static void menu_content_environment_get(int *argc, char *argv[],
       void *args, void *params_data)
 {
-   char *fullpath                    = NULL;
    struct rarch_main_wrap *wrap_args = (struct rarch_main_wrap*)params_data;
 
    if (!wrap_args)
       return;
 
-   path_get_content(&fullpath);
-
    wrap_args->no_content       = menu_driver_ctl(
          RARCH_MENU_CTL_HAS_LOAD_NO_CONTENT, NULL);
 
@@ -851,8 +847,8 @@ static void menu_content_environment_get(int *argc, char *argv[],
       wrap_args->sram_path     = dir_get(RARCH_DIR_SAVEFILE);
    if (!dir_is_empty(RARCH_DIR_SAVESTATE))
       wrap_args->state_path    = dir_get(RARCH_DIR_SAVESTATE);
-   if (fullpath && *fullpath)
+   if (!path_is_empty(RARCH_PATH_CONTENT))
-      wrap_args->content_path  = fullpath;
+      wrap_args->content_path  = path_get(RARCH_PATH_CONTENT);
    if (!retroarch_override_setting_is_set(RARCH_OVERRIDE_SETTING_LIBRETRO, NULL))
       wrap_args->libretro_path = string_is_empty(path_get(RARCH_PATH_CORE)) ? NULL :
          path_get(RARCH_PATH_CORE);
@@ -874,9 +870,6 @@ static bool task_load_content(content_ctx_info_t *content_info,
 {
    char name[PATH_MAX_LENGTH]                 = {0};
    char msg[PATH_MAX_LENGTH]                  = {0};
-   char *fullpath                             = NULL;
-
-   path_get_content(&fullpath);
 
    if (launched_from_menu)
    {
@@ -885,12 +878,12 @@ static bool task_load_content(content_ctx_info_t *content_info,
       menu_display_set_msg_force(true);
       menu_driver_ctl(RARCH_MENU_CTL_RENDER, NULL);
 
-      if (!string_is_empty(fullpath))
+      if (!path_is_empty(RARCH_PATH_CONTENT))
-         fill_pathname_base(name, fullpath, sizeof(name));
+         fill_pathname_base(name, path_get(RARCH_PATH_CONTENT), sizeof(name));
 #endif
 
       /** Show loading OSD message */
-      if (!string_is_empty(fullpath))
+      if (!string_is_empty(path_get(RARCH_PATH_CONTENT)))
       {
          snprintf(msg, sizeof(msg), "%s %s ...",
                msg_hash_to_str(MSG_LOADING),
@@ -918,7 +911,7 @@ static bool task_load_content(content_ctx_info_t *content_info,
          menu_driver_ctl(RARCH_MENU_CTL_SYSTEM_INFO_GET, &info);
 #endif
 
-      strlcpy(tmp, fullpath, sizeof(tmp));
+      strlcpy(tmp, path_get(RARCH_PATH_CONTENT), sizeof(tmp));
 
       if (!launched_from_menu)
       {
@@ -974,7 +967,7 @@ static bool task_load_content(content_ctx_info_t *content_info,
 error:
    if (launched_from_menu)
    {
-      if (!string_is_empty(fullpath) && !string_is_empty(name))
+      if (!path_is_empty(RARCH_PATH_CONTENT) && !string_is_empty(name))
       {
          snprintf(msg, sizeof(msg), "%s %s.\n",
                msg_hash_to_str(MSG_FAILED_TO_LOAD),
@@ -991,7 +984,6 @@ static bool command_event_cmd_exec(const char *data,
 #if defined(HAVE_DYNAMIC)
    content_ctx_info_t content_info;
 #endif
-   char *fullpath           = NULL;
 
 #if defined(HAVE_DYNAMIC)
    content_info.argc        = 0;
@@ -1004,9 +996,7 @@ static bool command_event_cmd_exec(const char *data,
 #endif
 #endif
 
-   path_get_content(&fullpath);
+   if (path_get(RARCH_PATH_CONTENT) != (void*)data)
-
-   if (fullpath != (void*)data)
    {
       path_clear(RARCH_PATH_CONTENT);
       if (!string_is_empty(data))
@@ -1247,13 +1237,8 @@ bool task_push_content_load_default(
          break;
 #ifndef HAVE_DYNAMIC
       case CONTENT_MODE_LOAD_CONTENT_WITH_NEW_CORE_FROM_MENU:
-         {
+         command_event_cmd_exec(path_get(RARCH_PATH_CONTENT), mode);
-            char *fullpath       = NULL;
+         command_event(CMD_EVENT_QUIT, NULL);
-
-            path_get_content(&fullpath);
-            command_event_cmd_exec(fullpath, mode);
-            command_event(CMD_EVENT_QUIT, NULL);
-         }
          break;
 #endif
       case CONTENT_MODE_LOAD_NONE: