Skip to content

Commit f429b15

Browse files
LibretroAdminLibretroAdmin
committedDec 22, 2024·
Cleanups
·
v1.20.0
1 parent 70f55f5 commit f429b15

File tree

3 files changed

+52
-47
lines changed

3 files changed

+52
-47
lines changed
 

‎list_special.h

-3
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,6 @@ struct string_list *dir_list_new_special(const char *input_dir,
6868
enum dir_list_type type, const char *filter,
6969
bool show_hidden_files);
7070

71-
struct string_list *string_list_new_special(enum string_list_type type,
72-
void *data, unsigned *len, size_t *list_size);
73-
7471
const char *char_list_new_special(enum string_list_type type, void *data);
7572

7673
RETRO_END_DECLS

‎retroarch.c

+50-43
Original file line numberDiff line numberDiff line change
@@ -2222,7 +2222,8 @@ struct string_list *dir_list_new_special(const char *input_dir,
22222222
type == DIR_LIST_CORE_INFO, recursive);
22232223
}
22242224

2225-
struct string_list *string_list_new_special(enum string_list_type type,
2225+
static struct string_list *string_list_new_special(
2226+
enum string_list_type type,
22262227
void *data, unsigned *len, size_t *list_size)
22272228
{
22282229
union string_list_elem_attr attr;
@@ -2506,22 +2507,17 @@ char *path_get_ptr(enum rarch_path_type type)
25062507
const char *path_get(enum rarch_path_type type)
25072508
{
25082509
struct rarch_state *p_rarch = &rarch_st;
2509-
runloop_state_t *runloop_st = runloop_state_get_ptr();
25102510

25112511
switch (type)
25122512
{
25132513
case RARCH_PATH_CONTENT:
25142514
return p_rarch->path_content;
25152515
case RARCH_PATH_DEFAULT_SHADER_PRESET:
25162516
return p_rarch->path_default_shader_preset;
2517-
case RARCH_PATH_BASENAME:
2518-
return runloop_st->runtime_content_path_basename;
25192517
case RARCH_PATH_CORE_OPTIONS:
25202518
if (!path_is_empty(RARCH_PATH_CORE_OPTIONS))
25212519
return p_rarch->path_core_options_file;
25222520
break;
2523-
case RARCH_PATH_SUBSYSTEM:
2524-
return runloop_st->subsystem_path;
25252521
case RARCH_PATH_CONFIG:
25262522
if (!path_is_empty(RARCH_PATH_CONFIG))
25272523
return p_rarch->path_config_file;
@@ -2539,6 +2535,10 @@ const char *path_get(enum rarch_path_type type)
25392535
case RARCH_PATH_NONE:
25402536
case RARCH_PATH_NAMES:
25412537
break;
2538+
case RARCH_PATH_BASENAME:
2539+
return runloop_state_get_ptr()->runtime_content_path_basename;
2540+
case RARCH_PATH_SUBSYSTEM:
2541+
return runloop_state_get_ptr()->subsystem_path;
25422542
}
25432543

25442544
return NULL;
@@ -2554,12 +2554,8 @@ size_t path_get_realsize(enum rarch_path_type type)
25542554
return sizeof(p_rarch->path_content);
25552555
case RARCH_PATH_DEFAULT_SHADER_PRESET:
25562556
return sizeof(p_rarch->path_default_shader_preset);
2557-
case RARCH_PATH_BASENAME:
2558-
return sizeof(runloop_state_get_ptr()->runtime_content_path_basename);
25592557
case RARCH_PATH_CORE_OPTIONS:
25602558
return sizeof(p_rarch->path_core_options_file);
2561-
case RARCH_PATH_SUBSYSTEM:
2562-
return sizeof(runloop_state_get_ptr()->subsystem_path);
25632559
case RARCH_PATH_CONFIG:
25642560
return sizeof(p_rarch->path_config_file);
25652561
case RARCH_PATH_CONFIG_APPEND:
@@ -2571,6 +2567,10 @@ size_t path_get_realsize(enum rarch_path_type type)
25712567
case RARCH_PATH_NONE:
25722568
case RARCH_PATH_NAMES:
25732569
break;
2570+
case RARCH_PATH_BASENAME:
2571+
return sizeof(runloop_state_get_ptr()->runtime_content_path_basename);
2572+
case RARCH_PATH_SUBSYSTEM:
2573+
return sizeof(runloop_state_get_ptr()->subsystem_path);
25742574
}
25752575

25762576
return 0;
@@ -2620,6 +2620,8 @@ bool path_set(enum rarch_path_type type, const char *path)
26202620
strlcpy(p_rarch->path_content, path,
26212621
sizeof(p_rarch->path_content));
26222622
break;
2623+
case RARCH_PATH_NONE:
2624+
break;
26232625
case RARCH_PATH_BASENAME:
26242626
runloop_st = runloop_state_get_ptr();
26252627
strlcpy(runloop_st->runtime_content_path_basename, path,
@@ -2630,8 +2632,6 @@ bool path_set(enum rarch_path_type type, const char *path)
26302632
strlcpy(runloop_st->subsystem_path, path,
26312633
sizeof(runloop_st->subsystem_path));
26322634
break;
2633-
case RARCH_PATH_NONE:
2634-
break;
26352635
}
26362636

26372637
return true;
@@ -3060,7 +3060,7 @@ bool command_event(enum event_command cmd, void *data)
30603060
#endif
30613061
video_driver_state_t *video_st = video_state_get_ptr();
30623062
settings_t *settings = config_get_ptr();
3063-
recording_state_t *recording_st = recording_state_get_ptr();
3063+
recording_state_t *rec_st = recording_state_get_ptr();
30643064

30653065
switch (cmd)
30663066
{
@@ -3186,7 +3186,7 @@ bool command_event(enum event_command cmd, void *data)
31863186
break;
31873187
}
31883188
case CMD_EVENT_STREAMING_TOGGLE:
3189-
if (recording_st->streaming_enable)
3189+
if (rec_st->streaming_enable)
31903190
command_event(CMD_EVENT_RECORD_DEINIT, NULL);
31913191
else
31923192
{
@@ -3296,7 +3296,7 @@ bool command_event(enum event_command cmd, void *data)
32963296
#endif
32973297
break;
32983298
case CMD_EVENT_RECORDING_TOGGLE:
3299-
if (recording_st->enable)
3299+
if (rec_st->enable)
33003300
command_event(CMD_EVENT_RECORD_DEINIT, NULL);
33013301
else
33023302
command_event(CMD_EVENT_RECORD_INIT, NULL);
@@ -3338,7 +3338,7 @@ bool command_event(enum event_command cmd, void *data)
33383338
{
33393339
rarch_system_info_t *sys_info = &runloop_st->system;
33403340
struct retro_system_info *sysinfo = &sys_info->info;
3341-
const char *core_path = path_get(RARCH_PATH_CORE);
3341+
const char *core_path = p_rarch->path_libretro;
33423342

33433343
#if defined(HAVE_DYNAMIC)
33443344
if (string_is_empty(core_path))
@@ -3596,7 +3596,7 @@ bool command_event(enum event_command cmd, void *data)
35963596
const char *dir_screenshot = settings->paths.directory_screenshot;
35973597
video_driver_state_t *video_st = video_state_get_ptr();
35983598
if (!take_screenshot(dir_screenshot,
3599-
path_get(RARCH_PATH_BASENAME),
3599+
runloop_st->runtime_content_path_basename,
36003600
false,
36013601
video_st->frame_cache_data && (video_st->frame_cache_data == RETRO_HW_FRAME_BUFFER_VALID),
36023602
false,
@@ -4018,13 +4018,13 @@ bool command_event(enum event_command cmd, void *data)
40184018
#endif
40194019
break;
40204020
case CMD_EVENT_RECORD_DEINIT:
4021-
recording_st->enable = false;
4021+
rec_st->enable = false;
40224022
streaming_set_state(false);
40234023
if (!recording_deinit())
40244024
return false;
40254025
break;
40264026
case CMD_EVENT_RECORD_INIT:
4027-
recording_st->enable = true;
4027+
rec_st->enable = true;
40284028
if (!recording_init())
40294029
{
40304030
command_event(CMD_EVENT_RECORD_DEINIT, NULL);
@@ -4610,7 +4610,7 @@ bool command_event(enum event_command cmd, void *data)
46104610
#ifdef HAVE_CONFIGFILE
46114611
if (!command_event_save_core_config(
46124612
settings->paths.directory_menu_config,
4613-
path_get(RARCH_PATH_CONFIG)))
4613+
p_rarch->path_config_file))
46144614
return false;
46154615
#endif
46164616
break;
@@ -5784,8 +5784,8 @@ void main_exit(void *args)
57845784
#endif
57855785
frontend_driver_deinit(args);
57865786
frontend_driver_exitspawn(
5787-
path_get_ptr(RARCH_PATH_CORE),
5788-
path_get_realsize(RARCH_PATH_CORE),
5787+
p_rarch->path_libretro,
5788+
sizeof(p_rarch->path_libretro),
57895789
p_rarch->launch_arguments);
57905790

57915791
p_rarch->flags &= ~RARCH_FLAGS_HAS_SET_USERNAME;
@@ -6567,7 +6567,9 @@ static void retroarch_print_help(const char *arg0)
65676567
}
65686568

65696569
#ifdef HAVE_DYNAMIC
6570-
static void retroarch_parse_input_libretro_path(const char *path, size_t path_len)
6570+
static void retroarch_parse_input_libretro_path(
6571+
struct rarch_state *p_rarch,
6572+
const char *path, size_t path_len)
65716573
{
65726574
settings_t *settings = config_get_ptr();
65736575
int path_stats = 0;
@@ -6709,7 +6711,8 @@ static void retroarch_parse_input_libretro_path(const char *path, size_t path_le
67096711
end:
67106712
if (!string_is_empty(core_path))
67116713
{
6712-
path_set(RARCH_PATH_CORE, core_path);
6714+
strlcpy(p_rarch->path_libretro, core_path,
6715+
sizeof(p_rarch->path_libretro));
67136716
retroarch_override_setting_set(RARCH_OVERRIDE_SETTING_LIBRETRO, NULL);
67146717

67156718
/* We requested an explicit core, so use PLAIN core type. */
@@ -6753,7 +6756,7 @@ static bool retroarch_parse_input_and_config(
67536756
bool cli_active = false;
67546757
bool cli_core_set = false;
67556758
bool cli_content_set = false;
6756-
recording_state_t *recording_st = recording_state_get_ptr();
6759+
recording_state_t *rec_st = recording_state_get_ptr();
67576760
video_driver_state_t *video_st = video_state_get_ptr();
67586761
runloop_state_t *runloop_st = runloop_state_get_ptr();
67596762
settings_t *settings = config_get_ptr();
@@ -6956,10 +6959,12 @@ static bool retroarch_parse_input_and_config(
69566959

69576960
#ifdef HAVE_CONFIGFILE
69586961
case 'c':
6959-
path_set(RARCH_PATH_CONFIG, optarg);
6962+
strlcpy(p_rarch->path_config_file, optarg,
6963+
sizeof(p_rarch->path_config_file));
69606964
break;
69616965
case RA_OPT_APPENDCONFIG:
6962-
path_set(RARCH_PATH_CONFIG_APPEND, optarg);
6966+
strlcpy(p_rarch->path_config_append_file, optarg,
6967+
sizeof(p_rarch->path_config_append_file));
69636968
break;
69646969
#endif
69656970

@@ -7145,10 +7150,9 @@ static bool retroarch_parse_input_and_config(
71457150
break;
71467151

71477152
case 'r':
7148-
strlcpy(recording_st->path, optarg,
7149-
sizeof(recording_st->path));
7150-
if (recording_st->enable)
7151-
recording_st->enable = true;
7153+
strlcpy(rec_st->path, optarg, sizeof(rec_st->path));
7154+
if (rec_st->enable)
7155+
rec_st->enable = true;
71527156
break;
71537157

71547158
case RA_OPT_SET_SHADER:
@@ -7173,7 +7177,7 @@ static bool retroarch_parse_input_and_config(
71737177

71747178
#ifdef HAVE_DYNAMIC
71757179
case 'L':
7176-
retroarch_parse_input_libretro_path(optarg, strlen(optarg));
7180+
retroarch_parse_input_libretro_path(p_rarch, optarg, strlen(optarg));
71777181
break;
71787182
#endif
71797183
case 'P':
@@ -7324,8 +7328,7 @@ static bool retroarch_parse_input_and_config(
73247328

73257329
case RA_OPT_SIZE:
73267330
if (sscanf(optarg, "%ux%u",
7327-
&recording_st->width,
7328-
&recording_st->height) != 2)
7331+
&rec_st->width, &rec_st->height) != 2)
73297332
{
73307333
RARCH_ERR("Wrong format for --size.\n");
73317334
retroarch_print_help(argv[0]);
@@ -7334,8 +7337,7 @@ static bool retroarch_parse_input_and_config(
73347337
break;
73357338

73367339
case RA_OPT_RECORDCONFIG:
7337-
strlcpy(recording_st->config, optarg,
7338-
sizeof(recording_st->config));
7340+
strlcpy(rec_st->config, optarg, sizeof(rec_st->config));
73397341
break;
73407342

73417343
case RA_OPT_MAX_FRAMES:
@@ -7357,7 +7359,8 @@ static bool retroarch_parse_input_and_config(
73577359
break;
73587360

73597361
case RA_OPT_SUBSYSTEM:
7360-
path_set(RARCH_PATH_SUBSYSTEM, optarg);
7362+
strlcpy(runloop_st->subsystem_path, optarg,
7363+
sizeof(runloop_st->subsystem_path));
73617364
break;
73627365

73637366
case RA_OPT_EOF_EXIT:
@@ -7479,7 +7482,12 @@ static bool retroarch_parse_input_and_config(
74797482
runloop_set_current_core_type(CORE_TYPE_PLAIN, false);
74807483

74817484
if (subsystem_path_is_empty)
7482-
path_set(RARCH_PATH_NAMES, (const char*)argv[optind]);
7485+
{
7486+
runloop_path_set_basename((const char*)argv[optind]);
7487+
runloop_path_set_names();
7488+
runloop_path_set_redirect(settings, p_rarch->dir_savefile,
7489+
p_rarch->dir_savestate);
7490+
}
74837491
else
74847492
runloop_path_set_special(argv + optind, argc - optind);
74857493

@@ -7581,8 +7589,7 @@ bool retroarch_main_init(int argc, char *argv[])
75817589
*input_st = input_state_get_ptr();
75827590
video_driver_state_t*video_st = video_state_get_ptr();
75837591
settings_t *settings = config_get_ptr();
7584-
recording_state_t
7585-
*recording_st = recording_state_get_ptr();
7592+
recording_state_t *rec_st = recording_state_get_ptr();
75867593
global_t *global = global_get_ptr();
75877594
#ifdef HAVE_ACCESSIBILITY
75887595
access_state_t *access_st = access_state_get_ptr();
@@ -7704,7 +7711,7 @@ bool retroarch_main_init(int argc, char *argv[])
77047711
retroarch_init_task_queue();
77057712

77067713
{
7707-
const char *fullpath = path_get(RARCH_PATH_CONTENT);
7714+
const char *fullpath = p_rarch->path_content;
77087715

77097716
if (!string_is_empty(fullpath))
77107717
{
@@ -7883,7 +7890,7 @@ bool retroarch_main_init(int argc, char *argv[])
78837890
command_event(CMD_EVENT_REWIND_INIT, NULL);
78847891
#endif
78857892
command_event(CMD_EVENT_CONTROLLER_INIT, NULL);
7886-
if (!string_is_empty(recording_st->path))
7893+
if (!string_is_empty(rec_st->path))
78877894
command_event(CMD_EVENT_RECORD_INIT, NULL);
78887895

78897896
command_event(CMD_EVENT_SET_PER_GAME_RESOLUTION, NULL);
@@ -7981,7 +7988,7 @@ bool retroarch_ctl(enum rarch_ctl_state state, void *data)
79817988
{
79827989
/* Get loaded core file name */
79837990
const char *loaded_core_file = path_basename_nocompression(
7984-
path_get(RARCH_PATH_CORE));
7991+
p_rarch->path_libretro);
79857992
/* Check whether specified core and currently
79867993
* loaded core are the same */
79877994
if (!string_is_empty(loaded_core_file))

‎runloop.c

+2-1
Original file line numberDiff line numberDiff line change
@@ -7841,7 +7841,8 @@ void runloop_path_set_basename(const char *path)
78417841
char *dst = NULL;
78427842

78437843
path_set(RARCH_PATH_CONTENT, path);
7844-
path_set(RARCH_PATH_BASENAME, path);
7844+
strlcpy(runloop_st->runtime_content_path_basename, path,
7845+
sizeof(runloop_st->runtime_content_path_basename));
78457846

78467847
#ifdef HAVE_COMPRESSION
78477848
/* Removing extension is a bit tricky for compressed files.

0 commit comments

Comments
 (0)
Please sign in to comment.