From 9d66e2d5e186c3798e3bbafabafa190d16573984 Mon Sep 17 00:00:00 2001 From: LibretroAdmin Date: Mon, 1 Aug 2022 21:31:45 +0200 Subject: [PATCH] General cleanups - * struct was erroneously named 'catagory' - changed to 'category' * Removed some strlcpys that were just setting the string to a fixed constant value * Random nits --- core_info.c | 107 ++++++++++++++++---------------------- core_option_manager.c | 109 ++++++++++++++++----------------------- core_option_manager.h | 8 +-- gfx/gfx_thumbnail_path.c | 15 ++++-- 4 files changed, 104 insertions(+), 135 deletions(-) diff --git a/core_info.c b/core_info.c index 0b5fc57804..40dcfbab33 100644 --- a/core_info.c +++ b/core_info.c @@ -1986,8 +1986,7 @@ static core_info_list_t *core_info_list_new(const char *path, if (!path_list) goto error; - core_info_list = (core_info_list_t*)malloc(sizeof(*core_info_list)); - if (!core_info_list) + if (!(core_info_list = (core_info_list_t*)malloc(sizeof(*core_info_list)))) goto error; core_info_list->list = NULL; @@ -1995,10 +1994,8 @@ static core_info_list_t *core_info_list_new(const char *path, core_info_list->info_count = 0; core_info_list->all_ext = NULL; - core_info = (core_info_t*)calloc(path_list->core_list->size, - sizeof(*core_info)); - - if (!core_info) + if (!(core_info = (core_info_t*)calloc(path_list->core_list->size, + sizeof(*core_info)))) { core_info_list_free(core_info_list); goto error; @@ -2074,7 +2071,7 @@ static core_info_list_t *core_info_list_new(const char *path, } /* Cache core path */ - info->path = strdup(base_path); + info->path = strdup(base_path); /* Get core lock status */ info->is_locked = core_info_path_is_locked( @@ -2085,9 +2082,7 @@ static core_info_list_t *core_info_list_new(const char *path, info->core_file_id.hash = core_info_hash_string(core_file_id); /* Parse core info file */ - conf = core_info_get_config_file(core_file_id, info_dir); - - if (conf) + if ((conf = core_info_get_config_file(core_file_id, info_dir))) { core_info_parse_config_file(core_info_list, info, conf); config_file_free(conf); @@ -2232,10 +2227,8 @@ static bool core_info_list_update_missing_firmware_internal( if (!core_info_list) return false; - info = core_info_find_internal( - core_info_list, core_path); - - if (!info) + if (!(info = core_info_find_internal( + core_info_list, core_path))) return false; for (i = 0; i < info->firmware_count; i++) @@ -2359,21 +2352,21 @@ bool core_info_get_list(core_info_list_t **core) size_t core_info_count(void) { core_info_state_t *p_coreinfo = &core_info_st; - if (!p_coreinfo || !p_coreinfo->curr_list) - return 0; - return p_coreinfo->curr_list->count; + if (p_coreinfo && p_coreinfo->curr_list) + return p_coreinfo->curr_list->count; + return 0; } bool core_info_list_update_missing_firmware( core_info_ctx_firmware_t *info, bool *set_missing_bios) { core_info_state_t *p_coreinfo = &core_info_st; - if (!info) - return false; - return core_info_list_update_missing_firmware_internal( - p_coreinfo->curr_list, - info->path, info->directory.system, - set_missing_bios); + if (info) + return core_info_list_update_missing_firmware_internal( + p_coreinfo->curr_list, + info->path, info->directory.system, + set_missing_bios); + return false; } bool core_info_load(const char *core_path) @@ -2405,9 +2398,7 @@ bool core_info_find(const char *core_path, if (!core_info || !p_coreinfo->curr_list) return false; - info = core_info_find_internal(p_coreinfo->curr_list, core_path); - - if (!info) + if (!(info = core_info_find_internal(p_coreinfo->curr_list, core_path))) return false; *core_info = info; @@ -2624,15 +2615,11 @@ core_updater_info_t *core_info_get_core_updater_info( return NULL; /* Read config file */ - conf = config_file_new_from_path_to_string(info_path); - - if (!conf) + if (!(conf = config_file_new_from_path_to_string(info_path))) return NULL; /* Create info struct */ - info = (core_updater_info_t*)malloc(sizeof(*info)); - - if (!info) + if (!(info = (core_updater_info_t*)malloc(sizeof(*info)))) return NULL; info->is_experimental = false; @@ -2700,49 +2687,42 @@ void core_info_free_core_updater_info(core_updater_info_t *info) static int core_info_qsort_func_path(const core_info_t *a, const core_info_t *b) { - if (!a || !b) + if (!a || !b || string_is_empty(a->path) || string_is_empty(b->path)) return 0; - - if (string_is_empty(a->path) || string_is_empty(b->path)) - return 0; - return strcasecmp(a->path, b->path); } static int core_info_qsort_func_display_name(const core_info_t *a, const core_info_t *b) { - if (!a || !b) - return 0; - - if ( string_is_empty(a->display_name) + if ( !a + || !b + || string_is_empty(a->display_name) || string_is_empty(b->display_name)) return 0; - return strcasecmp(a->display_name, b->display_name); } static int core_info_qsort_func_core_name(const core_info_t *a, const core_info_t *b) { - if (!a || !b) + if ( !a + || !b + || string_is_empty(a->core_name) + || string_is_empty(b->core_name)) return 0; - - if (string_is_empty(a->core_name) || string_is_empty(b->core_name)) - return 0; - return strcasecmp(a->core_name, b->core_name); } static int core_info_qsort_func_system_name(const core_info_t *a, const core_info_t *b) { - if (!a || !b) + if ( + !a + || !b + || string_is_empty(a->systemname) + || string_is_empty(b->systemname)) return 0; - - if (string_is_empty(a->systemname) || string_is_empty(b->systemname)) - return 0; - return strcasecmp(a->systemname, b->systemname); } @@ -2900,9 +2880,10 @@ bool core_info_set_core_lock(const char *core_path, bool lock) #endif /* Search for specified core */ - if (string_is_empty(core_path) || - !core_info_find(core_path, &core_info) || - string_is_empty(core_info->path)) + if ( + string_is_empty(core_path) + || !core_info_find(core_path, &core_info) + || string_is_empty(core_info->path)) return false; /* Get lock file path */ @@ -2994,10 +2975,10 @@ bool core_info_set_core_standalone_exempt(const char *core_path, bool exempt) char exempt_file_path[PATH_MAX_LENGTH]; /* Search for specified core */ - if (string_is_empty(core_path) || - !core_info_find(core_path, &core_info) || - string_is_empty(core_info->path) || - !core_info->supports_no_game) + if ( string_is_empty(core_path) + || !core_info_find(core_path, &core_info) + || string_is_empty(core_info->path) + || !core_info->supports_no_game) return false; /* Get 'standalone exempt' file path */ @@ -3035,10 +3016,10 @@ bool core_info_get_core_standalone_exempt(const char *core_path) char exempt_file_path[PATH_MAX_LENGTH]; /* Search for specified core */ - if (string_is_empty(core_path) || - !core_info_find(core_path, &core_info) || - string_is_empty(core_info->path) || - !core_info->supports_no_game) + if ( string_is_empty(core_path) + || !core_info_find(core_path, &core_info) + || string_is_empty(core_info->path) + || !core_info->supports_no_game) return false; /* Get 'standalone exempt' file path */ diff --git a/core_option_manager.c b/core_option_manager.c index 6371ab9f3b..f7495a2fee 100644 --- a/core_option_manager.c +++ b/core_option_manager.c @@ -70,9 +70,8 @@ struct retro_core_options_v2 *core_option_manager_convert_v1( return NULL; /* Allocate output retro_core_options_v2 struct */ - options_v2 = (struct retro_core_options_v2 *) - malloc(sizeof(*options_v2)); - if (!options_v2) + if (!(options_v2 = (struct retro_core_options_v2 *) + malloc(sizeof(*options_v2)))) return NULL; /* Note: v1 options have no concept of @@ -85,10 +84,8 @@ struct retro_core_options_v2 *core_option_manager_convert_v1( * > One extra entry required for terminating NULL entry * > Note that calloc() sets terminating NULL entry and * correctly 'nullifies' each values array */ - option_v2_defs = (struct retro_core_option_v2_definition *) - calloc(num_options + 1, sizeof(*option_v2_defs)); - - if (!option_v2_defs) + if (!(option_v2_defs = (struct retro_core_option_v2_definition *) + calloc(num_options + 1, sizeof(*option_v2_defs)))) { free(options_v2); return NULL; @@ -103,7 +100,7 @@ struct retro_core_options_v2 *core_option_manager_convert_v1( size_t num_values = 0; /* Set key */ - option_v2_defs[i].key = options_v1[i].key; + option_v2_defs[i].key = options_v1[i].key; /* Set default value */ option_v2_defs[i].default_value = options_v1[i].default_value; @@ -186,9 +183,8 @@ struct retro_core_options_v2 *core_option_manager_convert_v1_intl( return NULL; /* Allocate output retro_core_options_v2 struct */ - options_v2 = (struct retro_core_options_v2 *) - malloc(sizeof(*options_v2)); - if (!options_v2) + if (!(options_v2 = (struct retro_core_options_v2 *) + malloc(sizeof(*options_v2)))) return NULL; /* Note: v1 options have no concept of @@ -201,10 +197,8 @@ struct retro_core_options_v2 *core_option_manager_convert_v1_intl( * > One extra entry required for terminating NULL entry * > Note that calloc() sets terminating NULL entry and * correctly 'nullifies' each values array */ - option_v2_defs = (struct retro_core_option_v2_definition *) - calloc(num_options + 1, sizeof(*option_v2_defs)); - - if (!option_v2_defs) + if (!(option_v2_defs = (struct retro_core_option_v2_definition *) + calloc(num_options + 1, sizeof(*option_v2_defs)))) { core_option_manager_free_converted(options_v2); return NULL; @@ -374,9 +368,8 @@ struct retro_core_options_v2 *core_option_manager_convert_v2_intl( return NULL; /* Allocate output retro_core_options_v2 struct */ - options_v2 = (struct retro_core_options_v2 *) - malloc(sizeof(*options_v2)); - if (!options_v2) + if (!(options_v2 = (struct retro_core_options_v2 *) + malloc(sizeof(*options_v2)))) return NULL; options_v2->categories = NULL; @@ -387,10 +380,8 @@ struct retro_core_options_v2 *core_option_manager_convert_v2_intl( * > Note that calloc() sets terminating NULL entry */ if (num_categories > 0) { - option_v2_cats = (struct retro_core_option_v2_category *) - calloc(num_categories + 1, sizeof(*option_v2_cats)); - - if (!option_v2_cats) + if (!(option_v2_cats = (struct retro_core_option_v2_category *) + calloc(num_categories + 1, sizeof(*option_v2_cats)))) { core_option_manager_free_converted(options_v2); return NULL; @@ -403,10 +394,8 @@ struct retro_core_options_v2 *core_option_manager_convert_v2_intl( * > One extra entry required for terminating NULL entry * > Note that calloc() sets terminating NULL entry and * correctly 'nullifies' each values array */ - option_v2_defs = (struct retro_core_option_v2_definition *) - calloc(num_options + 1, sizeof(*option_v2_defs)); - - if (!option_v2_defs) + if (!(option_v2_defs = (struct retro_core_option_v2_definition *) + calloc(num_options + 1, sizeof(*option_v2_defs)))) { core_option_manager_free_converted(options_v2); return NULL; @@ -741,8 +730,8 @@ static bool core_option_manager_parse_variable( option->vals->elems[i].userdata = (void*)value_hash; /* Redundant safely check... */ - value_label = string_is_empty(value_label) ? - value : value_label; + if (string_is_empty(value_label)) + value_label = value; /* Append value label string */ string_list_append(option->val_labels, value_label, attr); @@ -819,9 +808,7 @@ core_option_manager_t *core_option_manager_new_vars( if (!vars) return NULL; - opt = (core_option_manager_t*)malloc(sizeof(*opt)); - - if (!opt) + if (!(opt = (core_option_manager_t*)malloc(sizeof(*opt)))) return NULL; opt->conf = NULL; @@ -859,8 +846,7 @@ core_option_manager_t *core_option_manager_new_vars( goto error; /* Create options array */ - opt->opts = (struct core_option*)calloc(size, sizeof(*opt->opts)); - if (!opt->opts) + if (!(opt->opts = (struct core_option*)calloc(size, sizeof(*opt->opts)))) goto error; opt->size = size; @@ -1028,8 +1014,8 @@ static bool core_option_manager_parse_option( value, value_label); /* > Redundant safely check... */ - value_label = string_is_empty(value_label) ? - value : value_label; + if (string_is_empty(value_label)) + value_label = value; /* Append value label string */ string_list_append(option->val_labels, value_label, attr); @@ -1113,9 +1099,7 @@ core_option_manager_t *core_option_manager_new( option_cats = options_v2->categories; option_defs = options_v2->definitions; - opt = (core_option_manager_t*)malloc(sizeof(*opt)); - - if (!opt) + if (!(opt = (core_option_manager_t*)malloc(sizeof(*opt)))) return NULL; opt->conf = NULL; @@ -1166,8 +1150,8 @@ core_option_manager_t *core_option_manager_new( /* Create categories array */ if (cats_size > 0) { - opt->cats = (struct core_catagory*)calloc(size, sizeof(*opt->cats)); - if (!opt->cats) + if (!(opt->cats = (struct core_category*)calloc(size, + sizeof(*opt->cats)))) goto error; opt->cats_size = cats_size; @@ -1190,8 +1174,7 @@ core_option_manager_t *core_option_manager_new( } /* Create options array */ - opt->opts = (struct core_option*)calloc(size, sizeof(*opt->opts)); - if (!opt->opts) + if (!(opt->opts = (struct core_option*)calloc(size, sizeof(*opt->opts)))) goto error; opt->size = size; @@ -1338,21 +1321,21 @@ const char *core_option_manager_get_category_desc(core_option_manager_t *opt, uint32_t key_hash; size_t i; - if (!opt || - string_is_empty(key)) + if ( !opt + || string_is_empty(key)) return NULL; key_hash = core_option_manager_hash_string(key); for (i = 0; i < opt->cats_size; i++) { - struct core_catagory *catagory = &opt->cats[i]; + struct core_category *category = &opt->cats[i]; - if ((key_hash == catagory->key_hash) && - !string_is_empty(catagory->key) && - string_is_equal(key, catagory->key)) + if ((key_hash == category->key_hash) && + !string_is_empty(category->key) && + string_is_equal(key, category->key)) { - return catagory->desc; + return category->desc; } } @@ -1387,13 +1370,13 @@ const char *core_option_manager_get_category_info(core_option_manager_t *opt, for (i = 0; i < opt->cats_size; i++) { - struct core_catagory *catagory = &opt->cats[i]; + struct core_category *category = &opt->cats[i]; - if ((key_hash == catagory->key_hash) && - !string_is_empty(catagory->key) && - string_is_equal(key, catagory->key)) + if ((key_hash == category->key_hash) && + !string_is_empty(category->key) && + string_is_equal(key, category->key)) { - return catagory->info; + return category->info; } } @@ -1412,7 +1395,7 @@ const char *core_option_manager_get_category_info(core_option_manager_t *opt, * be visible if at least one of the options * in the category is visible) * - * Returns: true if option category should be + * @return true if option category should be * displayed by the frontend, otherwise false. **/ bool core_option_manager_get_category_visible(core_option_manager_t *opt, @@ -1429,16 +1412,12 @@ bool core_option_manager_get_category_visible(core_option_manager_t *opt, return false; /* Fetch category item from map */ - category_item = nested_list_get_item(opt->option_map, - key, NULL); - - if (!category_item) + if (!(category_item = nested_list_get_item(opt->option_map, + key, NULL))) return false; /* Get child options of specified category */ - option_list = nested_list_item_get_children(category_item); - - if (!option_list) + if (!(option_list = nested_list_item_get_children(category_item))) return false; /* Loop over child options */ @@ -1472,7 +1451,7 @@ bool core_option_manager_get_category_visible(core_option_manager_t *opt, * Fetches the index of the core option identified * by the specified @key. * - * Returns: true if option matching the specified + * @return true if option matching the specified * key was found, otherwise false. **/ bool core_option_manager_get_idx(core_option_manager_t *opt, @@ -1703,8 +1682,8 @@ const char *core_option_manager_get_val_label(core_option_manager_t *opt, bool core_option_manager_get_visible(core_option_manager_t *opt, size_t idx) { - if (!opt || - (idx >= opt->size)) + if ( !opt + || (idx >= opt->size)) return false; return opt->opts[idx].visible; diff --git a/core_option_manager.h b/core_option_manager.h index 157621b27c..5d775736ec 100644 --- a/core_option_manager.h +++ b/core_option_manager.h @@ -51,7 +51,7 @@ struct core_option bool visible; }; -struct core_catagory +struct core_category { char *key; char *desc; @@ -68,7 +68,7 @@ struct core_option_manager config_file_t *conf; char conf_path[PATH_MAX_LENGTH]; - struct core_catagory *cats; + struct core_category *cats; struct core_option *opts; nested_list_t *option_map; @@ -252,7 +252,7 @@ const char *core_option_manager_get_category_info(core_option_manager_t *opt, * be visible if at least one of the options * in the category is visible) * - * Returns: true if option category should be + * @return true if option category should be * displayed by the frontend, otherwise false. **/ bool core_option_manager_get_category_visible(core_option_manager_t *opt, @@ -274,7 +274,7 @@ bool core_option_manager_get_category_visible(core_option_manager_t *opt, * Fetches the index of the core option identified * by the specified @key. * - * Returns: true if option matching the specified + * @return true if option matching the specified * key was found, otherwise false. **/ bool core_option_manager_get_idx(core_option_manager_t *opt, diff --git a/gfx/gfx_thumbnail_path.c b/gfx/gfx_thumbnail_path.c index 1a537b1e41..2226bc5c08 100644 --- a/gfx/gfx_thumbnail_path.c +++ b/gfx/gfx_thumbnail_path.c @@ -254,7 +254,12 @@ bool gfx_thumbnail_set_system(gfx_thumbnail_path_data_t *path_data, /* Hack: There is only one MAME thumbnail repo, * so filter any input starting with 'MAME...' */ if (strncmp(system, "MAME", 4) == 0) - strlcpy(path_data->system, "MAME", sizeof(path_data->system)); + { + path_data->system[0] = path_data->system[2] = 'M'; + path_data->system[1] = 'A'; + path_data->system[3] = 'E'; + path_data->system[4] = '\0'; + } else strlcpy(path_data->system, system, sizeof(path_data->system)); @@ -508,8 +513,12 @@ bool gfx_thumbnail_set_content_playlist( /* Hack: There is only one MAME thumbnail repo, * so filter any input starting with 'MAME...' */ if (strncmp(db_name, "MAME", 4) == 0) - strlcpy(path_data->content_db_name, "MAME", - sizeof(path_data->content_db_name)); + { + path_data->content_db_name[0] = path_data->content_db_name[2] = 'M'; + path_data->content_db_name[1] = 'A'; + path_data->content_db_name[3] = 'E'; + path_data->content_db_name[4] = '\0'; + } else { char *db_name_no_ext = NULL;