ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Replace strstrs where possible

This commit is contained in:
twinaphex 2020-05-22 21:11:35 +02:00
parent 31674f9246
commit eaba575c9e
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
menu/cbs/menu_cbs_deferred_push.c
View File

@ -895,7 +895,7 @@ static int menu_cbs_init_bind_deferred_push_compare_label(
* treatment, since the label has the format: * treatment, since the label has the format:
* <MENU_ENUM_LABEL_DEFERRED_RDB_ENTRY_DETAIL>|<entry_name> * <MENU_ENUM_LABEL_DEFERRED_RDB_ENTRY_DETAIL>|<entry_name>
* i.e. cannot use a normal string_is_equal() */ * i.e. cannot use a normal string_is_equal() */
if (strstr(label, msg_hash_to_str(MENU_ENUM_LABEL_DEFERRED_RDB_ENTRY_DETAIL))) if (string_starts_with(label, msg_hash_to_str(MENU_ENUM_LABEL_DEFERRED_RDB_ENTRY_DETAIL)))
{ {
BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_rdb_entry_detail); BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_rdb_entry_detail);
} }

4
menu/menu_displaylist.c
View File

@ -10570,7 +10570,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
{ {
menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list); menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list);
if (strstr(info->path, "core_option_")) if (string_starts_with(info->path, "core_option_"))
{ {
struct string_list *tmp_str_list = string_split(info->path, "_"); struct string_list *tmp_str_list = string_split(info->path, "_");
@ -10988,7 +10988,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
case DISPLAYLIST_DROPDOWN_LIST_SPECIAL: case DISPLAYLIST_DROPDOWN_LIST_SPECIAL:
menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list); menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list);
if (strstr(info->path, "core_option_")) if (string_starts_with(info->path, "core_option_"))
{ {
struct string_list *tmp_str_list = string_split(info->path, "_"); struct string_list *tmp_str_list = string_split(info->path, "_");

6
menu/menu_networking.c
View File

@ -152,7 +152,8 @@ void cb_net_generic_subdir(retro_task_t *task,
subdir_path[data->len] = '\0'; subdir_path[data->len] = '\0';
finish: finish:
if (!err && !strstr(subdir_path, file_path_str(FILE_PATH_INDEX_DIRS_URL))) if (!err && !string_ends_with(subdir_path,
file_path_str(FILE_PATH_INDEX_DIRS_URL)))
{ {
char parent_dir[PATH_MAX_LENGTH]; char parent_dir[PATH_MAX_LENGTH];
@ -219,7 +220,8 @@ finish:
free(data); free(data);
} }
if (!err && !strstr(state->path, file_path_str(FILE_PATH_INDEX_DIRS_URL))) if (!err &&
!string_ends_with(state->path, file_path_str(FILE_PATH_INDEX_DIRS_URL)))
{ {
char *parent_dir = (char*)malloc(PATH_MAX_LENGTH * sizeof(char)); char *parent_dir = (char*)malloc(PATH_MAX_LENGTH * sizeof(char));
char *parent_dir_encoded = (char*)malloc(PATH_MAX_LENGTH * sizeof(char)); char *parent_dir_encoded = (char*)malloc(PATH_MAX_LENGTH * sizeof(char));

2
tasks/task_http.c
View File

@ -353,7 +353,7 @@ void* task_push_http_transfer_file(const char* url, bool mute,
strlcpy(tmp, msg_hash_to_str(MSG_DOWNLOADING), sizeof(tmp)); strlcpy(tmp, msg_hash_to_str(MSG_DOWNLOADING), sizeof(tmp));
strlcat(tmp, " ", sizeof(tmp)); strlcat(tmp, " ", sizeof(tmp));
if (strstr(s, ".index")) if (string_ends_with(s, ".index"))
strlcat(tmp, msg_hash_to_str(MSG_INDEX_FILE), sizeof(tmp)); strlcat(tmp, msg_hash_to_str(MSG_INDEX_FILE), sizeof(tmp));
else else
strlcat(tmp, s, sizeof(tmp)); strlcat(tmp, s, sizeof(tmp));