File tree 4 files changed +6
-20
lines changed
4 files changed +6
-20
lines changed Original file line number Diff line number Diff line change @@ -6611,12 +6611,10 @@ static void retroarch_parse_input_libretro_path(
6611
6611
else
6612
6612
{
6613
6613
size_t _len ;
6614
- const char * slash = strrchr (path , '/' );
6615
- const char * backslash = strrchr (path , '\\' );
6616
6614
/* If path has no extension and contains no path
6617
6615
* delimiters, check if it is a core 'name', matching
6618
6616
* an existing file in the cores directory */
6619
- if (((! slash || ( backslash > slash )) ? ( char * ) backslash : ( char * ) slash ))
6617
+ if (find_last_slash ( path ))
6620
6618
goto end ;
6621
6619
6622
6620
/* First check for built-in cores */
Original file line number Diff line number Diff line change @@ -602,9 +602,7 @@ static bool content_file_list_set_info(
602
602
if (!string_is_empty (dir ))
603
603
{
604
604
/* 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 );
608
606
if (last_slash && (last_slash [1 ] == '\0' ))
609
607
* last_slash = '\0' ;
610
608
Original file line number Diff line number Diff line change @@ -1287,9 +1287,7 @@ static void task_database_handler(retro_task_t *task)
1287
1287
1288
1288
if (!string_is_empty (db -> fullpath ))
1289
1289
{
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 );
1293
1291
dirname = last_slash + 1 ;
1294
1292
}
1295
1293
@@ -1298,20 +1296,14 @@ static void task_database_handler(retro_task_t *task)
1298
1296
for (i = 0 ; i < dbstate -> list -> size ; i ++ )
1299
1297
{
1300
1298
char * last_slash ;
1301
- const char * slash ;
1302
- const char * backslash ;
1303
1299
const char * data = dbstate -> list -> elems [i ].data ;
1304
- char * dbname = NULL ;
1305
1300
bool strmatch = false;
1306
1301
char * dbpath = strdup (data );
1307
1302
1308
1303
path_remove_extension (dbpath );
1309
1304
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 ;
1315
1307
1316
1308
free (dbpath );
1317
1309
Original file line number Diff line number Diff line change @@ -501,9 +501,7 @@ void rarch_log_file_init(
501
501
{
502
502
/* Get log directory */
503
503
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 );
507
505
508
506
if (last_slash )
509
507
{
You can’t perform that action at this time.
0 commit comments