From aa386698b343533fd54db19522005e111ac91332 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 31 Aug 2014 21:56:36 +0200 Subject: [PATCH] (Menu) Cut down on unused variables --- frontend/menu/backend/menu_common_backend.c | 6 ++---- playlist.c | 3 ++- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/frontend/menu/backend/menu_common_backend.c b/frontend/menu/backend/menu_common_backend.c index 79fa54e9cc..c37e8b8979 100644 --- a/frontend/menu/backend/menu_common_backend.c +++ b/frontend/menu/backend/menu_common_backend.c @@ -1700,11 +1700,10 @@ static void menu_parse_and_resolve(unsigned menu_type) { char fill_buf[PATH_MAX]; const char *path = NULL; - const char *core_path = NULL; const char *core_name = NULL; content_playlist_get_index(g_extern.history, i, - &path, &core_path, &core_name); + &path, NULL, &core_name); if (path) { @@ -1910,10 +1909,9 @@ static void menu_parse_and_resolve(unsigned menu_type) { char core_path[PATH_MAX], display_name[256]; const char *path = NULL; - const char *label = NULL; unsigned type = 0; - file_list_get_at_offset(list, i, &path, &label, &type); + file_list_get_at_offset(list, i, &path, NULL, &type); if (type != MENU_FILE_PLAIN) continue; diff --git a/playlist.c b/playlist.c index 56ea6c2fbf..f7b9f7f96f 100644 --- a/playlist.c +++ b/playlist.c @@ -51,7 +51,8 @@ void content_playlist_get_index(content_playlist_t *playlist, return; *path = playlist->entries[index].path; - *core_path = playlist->entries[index].core_path; + if (core_path) + *core_path = playlist->entries[index].core_path; *core_name = playlist->entries[index].core_name; }