Skip to content

Commit dda78a4

Browse files
committedJan 17, 2025·
Use find_last_slash where possible
1 parent b47e095 commit dda78a4

File tree

4 files changed

+6
-20
lines changed

4 files changed

+6
-20
lines changed
 

‎retroarch.c

+1-3
Original file line numberDiff line numberDiff line change
@@ -6611,12 +6611,10 @@ static void retroarch_parse_input_libretro_path(
66116611
else
66126612
{
66136613
size_t _len;
6614-
const char *slash = strrchr(path, '/');
6615-
const char *backslash = strrchr(path, '\\');
66166614
/* If path has no extension and contains no path
66176615
* delimiters, check if it is a core 'name', matching
66186616
* an existing file in the cores directory */
6619-
if (((!slash || (backslash > slash)) ? (char*)backslash : (char*)slash))
6617+
if (find_last_slash(path))
66206618
goto end;
66216619

66226620
/* First check for built-in cores */

‎tasks/task_content.c

+1-3
Original file line numberDiff line numberDiff line change
@@ -602,9 +602,7 @@ static bool content_file_list_set_info(
602602
if (!string_is_empty(dir))
603603
{
604604
/* Remove any trailing slash */
605-
const char *slash = strrchr(dir, '/');
606-
const char *backslash = strrchr(dir, '\\');
607-
char *last_slash = (!slash || (backslash > slash)) ? (char*)backslash : (char*)slash;
605+
char *last_slash = find_last_slash(dir);
608606
if (last_slash && (last_slash[1] == '\0'))
609607
*last_slash = '\0';
610608

‎tasks/task_database.c

+3-11
Original file line numberDiff line numberDiff line change
@@ -1287,9 +1287,7 @@ static void task_database_handler(retro_task_t *task)
12871287

12881288
if (!string_is_empty(db->fullpath))
12891289
{
1290-
const char *slash = strrchr(db->fullpath, '/');
1291-
const char *backslash = strrchr(db->fullpath, '\\');
1292-
char *last_slash = (!slash || (backslash > slash)) ? (char*)backslash : (char*)slash;
1290+
char *last_slash = find_last_slash(db->fullpath);
12931291
dirname = last_slash + 1;
12941292
}
12951293

@@ -1298,20 +1296,14 @@ static void task_database_handler(retro_task_t *task)
12981296
for (i = 0; i < dbstate->list->size; i++)
12991297
{
13001298
char *last_slash;
1301-
const char *slash;
1302-
const char *backslash;
13031299
const char *data = dbstate->list->elems[i].data;
1304-
char *dbname = NULL;
13051300
bool strmatch = false;
13061301
char *dbpath = strdup(data);
13071302

13081303
path_remove_extension(dbpath);
13091304

1310-
slash = strrchr(dbpath, '/');
1311-
backslash = strrchr(dbpath, '\\');
1312-
last_slash = (!slash || (backslash > slash)) ? (char*)backslash : (char*)slash;
1313-
dbname = last_slash + 1;
1314-
strmatch = strcasecmp(dbname, dirname) == 0;
1305+
last_slash = find_last_slash(dbpath);
1306+
strmatch = strcasecmp(last_slash + 1, dirname) == 0;
13151307

13161308
free(dbpath);
13171309

‎verbosity.c

+1-3
Original file line numberDiff line numberDiff line change
@@ -501,9 +501,7 @@ void rarch_log_file_init(
501501
{
502502
/* Get log directory */
503503
const char *override_path = g_verbosity->override_path;
504-
const char *slash = strrchr(override_path, '/');
505-
const char *backslash = strrchr(override_path, '\\');
506-
const char *last_slash = (!slash || (backslash > slash)) ? (char*)backslash : (char*)slash;
504+
const char *last_slash = find_last_slash(override_path);
507505

508506
if (last_slash)
509507
{

0 commit comments

Comments
 (0)
Please sign in to comment.