From 296b359ba134ed248ed8f4c6d86fa756d0a7217e Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 1 Jun 2015 15:16:54 +0200 Subject: [PATCH] Rename menu_entry_get_label to menu_entry_get_path --- menu/drivers/glui.c | 6 +++--- menu/drivers/rgui.c | 6 +++--- menu/drivers/rmenu.c | 6 +++--- menu/drivers/rmenu_xui.cpp | 6 +++--- menu/drivers/xmb.c | 8 ++++---- menu/menu_entry.c | 4 ++-- menu/menu_entry.h | 2 +- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/menu/drivers/glui.c b/menu/drivers/glui.c index df8fdf4e33..8f4d7f0e12 100644 --- a/menu/drivers/glui.c +++ b/menu/drivers/glui.c @@ -293,17 +293,17 @@ static void glui_render_menu_list(glui_handle_t *glui, for (i = 0; i < end; i++) { unsigned y; - char entry_label[PATH_MAX_LENGTH], entry_value[PATH_MAX_LENGTH]; + char entry_path[PATH_MAX_LENGTH], entry_value[PATH_MAX_LENGTH]; char message[PATH_MAX_LENGTH], entry_title_buf[PATH_MAX_LENGTH], type_str_buf[PATH_MAX_LENGTH]; bool selected = false; selected = menu_entry_is_currently_selected(i); menu_entry_get_value(i, entry_value, sizeof(entry_value)); - menu_entry_get_label(i, entry_label, sizeof(entry_label)); + menu_entry_get_path(i, entry_path, sizeof(entry_path)); menu_animation_ticker_line(entry_title_buf, glui->ticker_limit, - frame_count / 100, entry_label, selected); + frame_count / 100, entry_path, selected); menu_animation_ticker_line(type_str_buf, glui->ticker_limit, frame_count / 100, entry_value, selected); diff --git a/menu/drivers/rgui.c b/menu/drivers/rgui.c index ea9c0153fe..4d576b8c0e 100644 --- a/menu/drivers/rgui.c +++ b/menu/drivers/rgui.c @@ -441,7 +441,7 @@ static void rgui_render(void) for (; i < end; i++, y += FONT_HEIGHT_STRIDE) { - char entry_label[PATH_MAX_LENGTH], entry_value[PATH_MAX_LENGTH]; + char entry_path[PATH_MAX_LENGTH], entry_value[PATH_MAX_LENGTH]; char message[PATH_MAX_LENGTH], entry_title_buf[PATH_MAX_LENGTH], type_str_buf[PATH_MAX_LENGTH]; unsigned entry_spacing = menu_entry_get_spacing(i); @@ -451,10 +451,10 @@ static void rgui_render(void) continue; menu_entry_get_value(i, entry_value, sizeof(entry_value)); - menu_entry_get_label(i, entry_label, sizeof(entry_label)); + menu_entry_get_path(i, entry_path, sizeof(entry_path)); menu_animation_ticker_line(entry_title_buf, RGUI_TERM_WIDTH - (entry_spacing + 1 + 2), - frame_count / RGUI_TERM_START_X, entry_label, entry_selected); + frame_count / RGUI_TERM_START_X, entry_path, entry_selected); menu_animation_ticker_line(type_str_buf, entry_spacing, frame_count / RGUI_TERM_START_X, entry_value, entry_selected); diff --git a/menu/drivers/rmenu.c b/menu/drivers/rmenu.c index c975b7b83c..0d43e4e5f1 100644 --- a/menu/drivers/rmenu.c +++ b/menu/drivers/rmenu.c @@ -189,17 +189,17 @@ static void rmenu_render(void) for (i = begin; i < end; i++, j++) { - char entry_label[PATH_MAX_LENGTH], entry_value[PATH_MAX_LENGTH]; + char entry_path[PATH_MAX_LENGTH], entry_value[PATH_MAX_LENGTH]; char message[PATH_MAX_LENGTH], entry_title_buf[PATH_MAX_LENGTH], type_str_buf[PATH_MAX_LENGTH]; unsigned entry_spacing = menu_entry_get_spacing(i); bool entry_selected = menu_entry_is_currently_selected(i); menu_entry_get_value(i, entry_value, sizeof(entry_value)); - menu_entry_get_label(i, entry_label, sizeof(entry_label)); + menu_entry_get_path(i, entry_path, sizeof(entry_path)); menu_animation_ticker_line(entry_title_buf, RMENU_TERM_WIDTH - (entry_spacing + 1 + 2), - frame_count / 15, entry_label, entry_selected); + frame_count / 15, entry_path, entry_selected); menu_animation_ticker_line(type_str_buf, entry_spacing, frame_count / 15, entry_value, entry_selected); diff --git a/menu/drivers/rmenu_xui.cpp b/menu/drivers/rmenu_xui.cpp index 8372dc8d89..3a4e930420 100644 --- a/menu/drivers/rmenu_xui.cpp +++ b/menu/drivers/rmenu_xui.cpp @@ -567,14 +567,14 @@ static void rmenu_xui_render(void) for (i = 0; i < end; i++) { menu_entry_t entry; - char entry_label[PATH_MAX_LENGTH], entry_value[PATH_MAX_LENGTH]; + char entry_path[PATH_MAX_LENGTH], entry_value[PATH_MAX_LENGTH]; wchar_t msg_left[PATH_MAX_LENGTH], msg_right[PATH_MAX_LENGTH]; menu_entry_get(&entry, i, NULL, true); menu_entry_get_value(i, entry_value, sizeof(entry_value)); - menu_entry_get_label(i, entry_label, sizeof(entry_label)); + menu_entry_get_path(i, entry_path, sizeof(entry_path)); - mbstowcs(msg_left, entry_label, sizeof(msg_left) / sizeof(wchar_t)); + mbstowcs(msg_left, entry_path, sizeof(msg_left) / sizeof(wchar_t)); mbstowcs(msg_right, entry_value, sizeof(msg_right) / sizeof(wchar_t)); rmenu_xui_set_list_text(i, msg_left, msg_right); } diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c index 5b52b695cf..73d3f0b4bf 100644 --- a/menu/drivers/xmb.c +++ b/menu/drivers/xmb.c @@ -981,7 +981,7 @@ static void xmb_draw_items(xmb_handle_t *xmb, gl_t *gl, for (i = 0; i < end; i++) { menu_entry_t entry; - char entry_label[PATH_MAX_LENGTH], entry_value[PATH_MAX_LENGTH]; + char entry_path[PATH_MAX_LENGTH], entry_value[PATH_MAX_LENGTH]; float icon_x, icon_y; char name[PATH_MAX_LENGTH], value[PATH_MAX_LENGTH]; GLuint texture_switch = 0; @@ -1004,10 +1004,10 @@ static void xmb_draw_items(xmb_handle_t *xmb, gl_t *gl, continue; menu_entry_get(&entry, i, list, true); - menu_entry_get_label(i, entry_label, sizeof(entry_label)); + menu_entry_get_path(i, entry_path, sizeof(entry_path)); if (entry.type == MENU_FILE_CONTENTLIST_ENTRY) - strlcpy(entry_label, path_basename(entry_label), sizeof(entry_label)); + strlcpy(entry_path, path_basename(entry_path), sizeof(entry_path)); icon = xmb_icon_get_type(xmb, core_node, entry.type); @@ -1033,7 +1033,7 @@ static void xmb_draw_items(xmb_handle_t *xmb, gl_t *gl, icon = xmb->textures.list[XMB_TEXTURE_RESUME].id; menu_animation_ticker_line(name, 35, - frame_count / 20, entry_label, + frame_count / 20, entry_path, (i == current)); xmb_draw_text(menu, xmb, name, diff --git a/menu/menu_entry.c b/menu/menu_entry.c index d6dedafb06..f31c0d480d 100644 --- a/menu/menu_entry.c +++ b/menu/menu_entry.c @@ -193,12 +193,12 @@ enum menu_entry_type menu_entry_get_type(uint32_t i) return MENU_ENTRY_ACTION; } -void menu_entry_get_label(uint32_t i, char *label, size_t sizeof_label) +void menu_entry_get_path(uint32_t i, char *s, size_t len) { menu_entry_t entry; menu_entry_get(&entry, i, NULL, true); - strlcpy(label, entry.path, sizeof_label); + strlcpy(s, entry.path, len); } unsigned menu_entry_get_spacing(uint32_t i) diff --git a/menu/menu_entry.h b/menu/menu_entry.h index 2ebd5bffca..9d1756f8d1 100644 --- a/menu/menu_entry.h +++ b/menu/menu_entry.h @@ -63,7 +63,7 @@ rarch_setting_t *menu_entry_get_setting(uint32_t i); enum menu_entry_type menu_entry_get_type(uint32_t i); -void menu_entry_get_label(uint32_t i, char *label, size_t sizeof_label); +void menu_entry_get_path(uint32_t i, char *label, size_t sizeof_label); unsigned menu_entry_get_spacing(uint32_t i);