From 1cc2ae692bc5431519222b378b4c08005bc85e56 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Fri, 1 Jul 2016 19:26:27 +0200 Subject: [PATCH] Cleanups --- menu/cbs/menu_cbs_left.c | 6 +++--- menu/cbs/menu_cbs_right.c | 6 +++--- menu/menu_cbs.c | 4 ++-- menu/menu_cbs.h | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/menu/cbs/menu_cbs_left.c b/menu/cbs/menu_cbs_left.c index 86dad88eab..b3c6272ca8 100644 --- a/menu/cbs/menu_cbs_left.c +++ b/menu/cbs/menu_cbs_left.c @@ -386,7 +386,7 @@ static int bind_left_generic(unsigned type, const char *label, static int menu_cbs_init_bind_left_compare_label(menu_file_list_cbs_t *cbs, const char *label, uint32_t label_hash, const char *menu_label, - uint32_t menu_label_hash, const char *elem0) + uint32_t menu_label_hash) { unsigned i; @@ -595,7 +595,7 @@ static int menu_cbs_init_bind_left_compare_type(menu_file_list_cbs_t *cbs, int menu_cbs_init_bind_left(menu_file_list_cbs_t *cbs, const char *path, const char *label, unsigned type, size_t idx, - const char *elem0, const char *elem1, const char *menu_label, + const char *menu_label, uint32_t label_hash, uint32_t menu_label_hash) { if (!cbs) @@ -618,7 +618,7 @@ int menu_cbs_init_bind_left(menu_file_list_cbs_t *cbs, } } - if (menu_cbs_init_bind_left_compare_label(cbs, label, label_hash, menu_label, menu_label_hash, elem0) == 0) + if (menu_cbs_init_bind_left_compare_label(cbs, label, label_hash, menu_label, menu_label_hash) == 0) return 0; if (menu_cbs_init_bind_left_compare_type(cbs, type, label_hash, menu_label, menu_label_hash) == 0) diff --git a/menu/cbs/menu_cbs_right.c b/menu/cbs/menu_cbs_right.c index a01c078be4..7488133a1a 100644 --- a/menu/cbs/menu_cbs_right.c +++ b/menu/cbs/menu_cbs_right.c @@ -506,7 +506,7 @@ static int menu_cbs_init_bind_right_compare_type(menu_file_list_cbs_t *cbs, static int menu_cbs_init_bind_right_compare_label(menu_file_list_cbs_t *cbs, const char *label, uint32_t label_hash, const char *menu_label, - uint32_t menu_label_hash, const char *elem0) + uint32_t menu_label_hash) { unsigned i; @@ -618,7 +618,7 @@ static int menu_cbs_init_bind_right_compare_label(menu_file_list_cbs_t *cbs, int menu_cbs_init_bind_right(menu_file_list_cbs_t *cbs, const char *path, const char *label, unsigned type, size_t idx, - const char *elem0, const char *elem1, const char *menu_label, + const char *menu_label, uint32_t label_hash, uint32_t menu_label_hash) { if (!cbs) @@ -642,7 +642,7 @@ int menu_cbs_init_bind_right(menu_file_list_cbs_t *cbs, } if (menu_cbs_init_bind_right_compare_label(cbs, label, label_hash, menu_label, - menu_label_hash, elem0) == 0) + menu_label_hash) == 0) return 0; if (menu_cbs_init_bind_right_compare_type(cbs, type, label_hash, menu_label, menu_label_hash) == 0) diff --git a/menu/menu_cbs.c b/menu/menu_cbs.c index 7422658510..45e94b5cbd 100644 --- a/menu/menu_cbs.c +++ b/menu/menu_cbs.c @@ -117,11 +117,11 @@ void menu_cbs_init(void *data, menu_cbs_init_log(repr_label, "DOWN", cbs->action_down_ident); - menu_cbs_init_bind_left(cbs, path, label, type, idx, elem0, elem1, menu_label, label_hash, menu_label_hash); + menu_cbs_init_bind_left(cbs, path, label, type, idx, menu_label, label_hash, menu_label_hash); menu_cbs_init_log(repr_label, "LEFT", cbs->action_left_ident); - menu_cbs_init_bind_right(cbs, path, label, type, idx, elem0, elem1, menu_label, label_hash, menu_label_hash); + menu_cbs_init_bind_right(cbs, path, label, type, idx, menu_label, label_hash, menu_label_hash); menu_cbs_init_log(repr_label, "RIGHT", cbs->action_right_ident); diff --git a/menu/menu_cbs.h b/menu/menu_cbs.h index b403db3747..4f74b6be03 100644 --- a/menu/menu_cbs.h +++ b/menu/menu_cbs.h @@ -117,12 +117,12 @@ int action_right_cheat(unsigned type, const char *label, int menu_cbs_init_bind_left(menu_file_list_cbs_t *cbs, const char *path, const char *label, unsigned type, size_t idx, - const char *elem0, const char *elem1, const char *menu_label, + const char *menu_label, uint32_t label_hash, uint32_t menu_label_hash); int menu_cbs_init_bind_right(menu_file_list_cbs_t *cbs, const char *path, const char *label, unsigned type, size_t idx, - const char *elem0, const char *elem1, const char *menu_label, + const char *menu_label, uint32_t label_hash, uint32_t menu_label_hash); int menu_cbs_init_bind_refresh(menu_file_list_cbs_t *cbs,