Use fill_short_pathname_representation

This commit is contained in:
twinaphex 2015-06-22 19:39:56 +02:00
parent 1b17c7cd8a
commit 5f67c53e6a
5 changed files with 8 additions and 9 deletions

View File

@ -146,8 +146,8 @@ static void menu_action_setting_disp_set_label_filter(
strlcpy(s, menu_hash_to_str(MENU_VALUE_NOT_AVAILABLE), len);
if (*settings->video.softfilter_plugin)
strlcpy(s, path_basename(settings->video.softfilter_plugin),
len);
fill_short_pathname_representation(s,
settings->video.softfilter_plugin, len);
}
static void menu_action_setting_disp_set_label_shader_num_passes(

View File

@ -1145,7 +1145,8 @@ static void xmb_draw_items(xmb_handle_t *xmb, gl_t *gl,
hash_value = menu_hash_calculate(entry.value);
if (entry.type == MENU_FILE_CONTENTLIST_ENTRY)
strlcpy(entry.path, path_basename(entry.path), sizeof(entry.path));
fill_short_pathname_representation(entry.path, entry.path,
sizeof(entry.path));
icon = xmb_icon_get_id(xmb, core_node, node, entry.type, (i == current));

View File

@ -888,7 +888,8 @@ static int menu_displaylist_parse_database_entry(menu_displaylist_info_t *info)
if (!(db_info = database_info_list_new(info->path, query)))
goto error;
strlcpy(path_base, path_basename(info->path), sizeof(path_base));
fill_short_pathname_representation(path_base, info->path,
sizeof(path_base));
path_remove_extension(path_base);
strlcat(path_base, ".lpl", sizeof(path_base));

View File

@ -1365,7 +1365,7 @@ static void setting_get_string_representation_st_path(void *data,
rarch_setting_t *setting = (rarch_setting_t*)data;
if (setting)
strlcpy(s, path_basename(setting->value.string), len);
fill_short_pathname_representation(s, setting->value.string, len);
}
static void setting_get_string_representation_st_string(void *data,

View File

@ -168,16 +168,13 @@ static int database_info_list_iterate_found_match(
char db_playlist_path[PATH_MAX_LENGTH] = {0};
char db_playlist_base_str[PATH_MAX_LENGTH] = {0};
char entry_path_str[PATH_MAX_LENGTH] = {0};
const char *db_playlist_base = NULL;
content_playlist_t *playlist = NULL;
settings_t *settings = config_get_ptr();
const char *db_path = db_state->list->elems[db_state->list_index].data;
const char *entry_path = db ? db->list->elems[db->list_ptr].data : NULL;
database_info_t *db_info_entry = &db_state->info->list[db_state->entry_index];
db_playlist_base = path_basename(db_path);
strlcpy(db_playlist_base_str, db_playlist_base, sizeof(db_playlist_base_str));
fill_short_pathname_representation(db_playlist_base_str, db_path, sizeof(db_playlist_base_str));
path_remove_extension(db_playlist_base_str);