From 13cf0fc79c92b8be1a251f0926b6180544de20d2 Mon Sep 17 00:00:00 2001 From: libretroadmin Date: Mon, 9 Sep 2024 20:19:29 +0200 Subject: [PATCH] Add more TODO/FIXME notes --- retroarch.c | 7 +++---- tasks/task_content.c | 14 ++++++-------- tasks/task_content_disc.c | 6 +++--- tasks/task_database.c | 8 ++++---- tasks/task_movie.c | 4 ++-- 5 files changed, 18 insertions(+), 21 deletions(-) diff --git a/retroarch.c b/retroarch.c index a621c880af..26a7e1d583 100644 --- a/retroarch.c +++ b/retroarch.c @@ -2165,7 +2165,7 @@ struct string_list *dir_list_new_special(const char *input_dir, bool show_hidden_files) { #if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_SLANG) || defined(HAVE_HLSL) - char ext_shaders[256]; + char ext_shaders[NAME_MAX_LENGTH]; #endif char ext_name[16]; const char *exts = NULL; @@ -3240,7 +3240,7 @@ bool command_event(enum event_command cmd, void *data) if (settings->bools.run_ahead_enabled) { - char msg[256]; + char msg[128]; if (settings->bools.run_ahead_secondary_instance) snprintf(msg, sizeof(msg), msg_hash_to_str(MSG_RUNAHEAD_ENABLED_WITH_SECOND_INSTANCE), @@ -3284,8 +3284,7 @@ bool command_event(enum event_command cmd, void *data) NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO); else if (runloop_st->preempt_data) { - char msg[256]; - + char msg[128]; snprintf(msg, sizeof(msg), msg_hash_to_str(MSG_PREEMPT_ENABLED), settings->uints.run_ahead_frames); runloop_msg_queue_push( diff --git a/tasks/task_content.c b/tasks/task_content.c index 1b38d0fbbd..cb36bcb25c 100644 --- a/tasks/task_content.c +++ b/tasks/task_content.c @@ -771,12 +771,10 @@ static bool content_file_extract_from_archive( const char **content_path, char **error_string) { - char msg[1024]; const char *tmp_path_ptr = NULL; char tmp_path[PATH_MAX_LENGTH]; tmp_path[0] = '\0'; - msg[0] = '\0'; /* TODO/FIXME - localize */ RARCH_LOG("[Content]: Core requires uncompressed content - " @@ -789,6 +787,7 @@ static bool content_file_extract_from_archive( NULL : content_ctx->directory_cache, tmp_path, sizeof(tmp_path))) { + char msg[1024]; snprintf(msg, sizeof(msg), "%s: \"%s\".\n", msg_hash_to_str(MSG_FAILED_TO_EXTRACT_CONTENT_FROM_COMPRESSED_FILE), *content_path); @@ -940,7 +939,6 @@ static bool content_file_load( const struct retro_subsystem_info *special) { size_t i; - char msg[1024]; retro_ctx_load_content_info_t load_info; bool used_vfs_fallback_copy = false; #ifdef __WINRT__ @@ -948,8 +946,6 @@ static bool content_file_load( #endif enum rarch_content_type first_content_type = RARCH_CONTENT_NONE; - msg[0] = '\0'; - for (i = 0; i < content->size; i++) { const char *content_path = NULL; @@ -995,6 +991,7 @@ static bool content_file_load( content_compressed, i, first_content_type, &content_data, &content_size)) { + char msg[1024]; snprintf(msg, sizeof(msg), "%s \"%s\"\n", msg_hash_to_str(MSG_COULD_NOT_READ_CONTENT_FILE), content_path); @@ -1074,6 +1071,7 @@ static bool content_file_load( * (This disclaimer is out dated but I don't want to remove it)*/ if (!CopyFileFromAppW(wcontent_path, wnew_path, false)) { + char msg[1024]; /* TODO/FIXME - localize */ snprintf(msg, sizeof(msg), "%s \"%s\". (during copy read or write)\n", msg_hash_to_str(MSG_COULD_NOT_READ_CONTENT_FILE), @@ -1168,16 +1166,14 @@ static const struct retro_subsystem_info *content_file_init_subsystem( char **error_string, bool *ret) { - char msg[1024]; struct string_list *subsystem = path_get_subsystem_list(); const struct retro_subsystem_info *special = libretro_find_subsystem_info( subsystem_data, (unsigned)subsystem_current_count, path_get(RARCH_PATH_SUBSYSTEM)); - msg[0] = '\0'; - if (!special) { + char msg[1024]; /* TODO/FIXME - localize */ snprintf(msg, sizeof(msg), "Failed to find subsystem \"%s\" in libretro implementation.\n", @@ -1196,6 +1192,7 @@ static const struct retro_subsystem_info *content_file_init_subsystem( if (special->num_roms != subsystem->size) { + char msg[1024]; /* TODO/FIXME - localize */ snprintf(msg, sizeof(msg), "Libretro core requires %u content files for " @@ -1208,6 +1205,7 @@ static const struct retro_subsystem_info *content_file_init_subsystem( } else if (subsystem && subsystem->size) { + char msg[1024]; /* TODO/FIXME - localize */ snprintf(msg, sizeof(msg), "Libretro core takes no content for subsystem \"%s\", " diff --git a/tasks/task_content_disc.c b/tasks/task_content_disc.c index 1be59699ef..59d2b5a687 100755 --- a/tasks/task_content_disc.c +++ b/tasks/task_content_disc.c @@ -89,7 +89,7 @@ typedef struct unsigned char cur_track; char drive_letter[2]; char cdrom_path[64]; - char title[512]; + char title[NAME_MAX_LENGTH]; bool next; } task_cdrom_dump_state_t; @@ -143,7 +143,7 @@ static void task_cdrom_dump_handler(retro_task_t *task) char output_file[PATH_MAX_LENGTH]; char cue_filename[PATH_MAX_LENGTH]; settings_t *settings = config_get_ptr(); - const char *directory_core_assets = settings + const char *directory_core_assets = settings ? settings->paths.directory_core_assets : NULL; /* write cuesheet to a file */ int64_t cue_size = filestream_get_size(state->file); @@ -257,7 +257,7 @@ static void task_cdrom_dump_handler(retro_task_t *task) char output_path[PATH_MAX_LENGTH]; char track_filename[PATH_MAX_LENGTH]; settings_t *settings = config_get_ptr(); - const char *directory_core_assets = settings + const char *directory_core_assets = settings ? settings->paths.directory_core_assets : NULL; track_filename[0] = '\0'; diff --git a/tasks/task_database.c b/tasks/task_database.c index 52cc1a6773..b21bbe6dae 100644 --- a/tasks/task_database.c +++ b/tasks/task_database.c @@ -53,8 +53,8 @@ typedef struct database_state_handle size_t entry_index; uint32_t crc; uint32_t archive_crc; - char archive_name[511]; - char serial[4096]; + char archive_name[512]; /* TODO/FIXME - check size */ + char serial[4096]; /* TODO/FIXME - check size */ } database_state_handle_t; enum db_flags_enum @@ -108,9 +108,9 @@ static const char *database_info_get_current_element_name( static void task_database_scan_console_output(const char *label, const char *db_name, bool add) { + char string[32]; const char *prefix = (add) ? "++" : (db_name) ? "==" : "??"; const char *no_color = getenv("NO_COLOR"); - char string[32]; bool color = (no_color && no_color[0] != '0') ? false : true; /* Colorize prefix (add = green, dupe = yellow, not found = red) */ @@ -166,7 +166,7 @@ static int task_database_iterate_start(retro_task_t *task, database_info_handle_t *db, const char *name) { - char msg[256]; + char msg[128]; const char *basename_path = !string_is_empty(name) ? path_basename_nocompression(name) : ""; diff --git a/tasks/task_movie.c b/tasks/task_movie.c index 1877a21a11..dd0b8495a0 100644 --- a/tasks/task_movie.c +++ b/tasks/task_movie.c @@ -249,7 +249,7 @@ error: static bool bsv_movie_start_record(input_driver_state_t * input_st, char *path) { size_t _len; - char msg[8192]; + char msg[8192]; /* TODO/FIXME - check size */ bsv_movie_t *state = NULL; const char *movie_rec_str = NULL; @@ -446,7 +446,7 @@ error: bool movie_start_record(input_driver_state_t *input_st, char*path) { size_t _len; - char msg[8192]; + char msg[8192]; /* TODO/FIXME - check size */ const char *movie_rec_str = msg_hash_to_str(MSG_STARTING_MOVIE_RECORD_TO); retro_task_t *task = task_init(); moviectl_task_state_t *state = (moviectl_task_state_t *)calloc(1, sizeof(*state));