From 9596c7b3c48a84ac9281d3441643362e2084e0fa Mon Sep 17 00:00:00 2001 From: twinaphex Date: Fri, 1 Jul 2016 20:57:23 +0200 Subject: [PATCH] Cleanups --- menu/cbs/menu_cbs_cancel.c | 2 +- menu/cbs/menu_cbs_deferred_push.c | 2 +- menu/cbs/menu_cbs_down.c | 2 +- menu/cbs/menu_cbs_left.c | 11 +++++------ menu/cbs/menu_cbs_right.c | 14 ++++++-------- menu/cbs/menu_cbs_scan.c | 2 +- menu/cbs/menu_cbs_select.c | 2 +- menu/cbs/menu_cbs_start.c | 2 +- menu/cbs/menu_cbs_title.c | 2 +- menu/cbs/menu_cbs_up.c | 2 +- menu/menu_cbs.c | 20 ++++++++++---------- menu/menu_cbs.h | 20 ++++++++++---------- 12 files changed, 39 insertions(+), 42 deletions(-) diff --git a/menu/cbs/menu_cbs_cancel.c b/menu/cbs/menu_cbs_cancel.c index dba66f781e..293a3a20f3 100644 --- a/menu/cbs/menu_cbs_cancel.c +++ b/menu/cbs/menu_cbs_cancel.c @@ -69,7 +69,7 @@ static int menu_cbs_init_bind_cancel_compare_type( int menu_cbs_init_bind_cancel(menu_file_list_cbs_t *cbs, const char *path, const char *label, unsigned type, size_t idx, const char *menu_label, - uint32_t label_hash, uint32_t menu_label_hash) + uint32_t label_hash) { if (!cbs) return -1; diff --git a/menu/cbs/menu_cbs_deferred_push.c b/menu/cbs/menu_cbs_deferred_push.c index 2445acda2b..b1a773cf45 100644 --- a/menu/cbs/menu_cbs_deferred_push.c +++ b/menu/cbs/menu_cbs_deferred_push.c @@ -1110,7 +1110,7 @@ static int menu_cbs_init_bind_deferred_push_compare_type( int menu_cbs_init_bind_deferred_push(menu_file_list_cbs_t *cbs, const char *path, const char *label, unsigned type, size_t idx, - uint32_t label_hash, uint32_t menu_label_hash) + uint32_t label_hash) { if (!cbs) return -1; diff --git a/menu/cbs/menu_cbs_down.c b/menu/cbs/menu_cbs_down.c index d18cd37ade..0f5a03b6cd 100644 --- a/menu/cbs/menu_cbs_down.c +++ b/menu/cbs/menu_cbs_down.c @@ -42,7 +42,7 @@ static int action_bind_down_generic(unsigned type, const char *label) int menu_cbs_init_bind_down(menu_file_list_cbs_t *cbs, const char *path, const char *label, unsigned type, size_t idx, - uint32_t label_hash, uint32_t menu_label_hash) + uint32_t label_hash) { if (!cbs) return -1; diff --git a/menu/cbs/menu_cbs_left.c b/menu/cbs/menu_cbs_left.c index b3c6272ca8..2a06a0ef30 100644 --- a/menu/cbs/menu_cbs_left.c +++ b/menu/cbs/menu_cbs_left.c @@ -385,8 +385,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 *label, uint32_t label_hash, const char *menu_label) { unsigned i; @@ -498,7 +497,7 @@ static int menu_cbs_init_bind_left_compare_label(menu_file_list_cbs_t *cbs, } static int menu_cbs_init_bind_left_compare_type(menu_file_list_cbs_t *cbs, - unsigned type, uint32_t label_hash, const char *menu_label, uint32_t menu_label_hash) + unsigned type, uint32_t label_hash, const char *menu_label) { if (type >= MENU_SETTINGS_CHEAT_BEGIN && type <= MENU_SETTINGS_CHEAT_END) @@ -596,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 *menu_label, - uint32_t label_hash, uint32_t menu_label_hash) + uint32_t label_hash) { if (!cbs) return -1; @@ -618,10 +617,10 @@ 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) == 0) + if (menu_cbs_init_bind_left_compare_label(cbs, label, label_hash, menu_label) == 0) return 0; - if (menu_cbs_init_bind_left_compare_type(cbs, type, label_hash, menu_label, menu_label_hash) == 0) + if (menu_cbs_init_bind_left_compare_type(cbs, type, label_hash, menu_label) == 0) return 0; return -1; diff --git a/menu/cbs/menu_cbs_right.c b/menu/cbs/menu_cbs_right.c index 7488133a1a..e4d98e4eb4 100644 --- a/menu/cbs/menu_cbs_right.c +++ b/menu/cbs/menu_cbs_right.c @@ -407,8 +407,7 @@ int bind_right_generic(unsigned type, const char *label, } static int menu_cbs_init_bind_right_compare_type(menu_file_list_cbs_t *cbs, - unsigned type, uint32_t label_hash, const char *menu_label, - uint32_t menu_label_hash) + unsigned type, uint32_t label_hash, const char *menu_label) { if (type >= MENU_SETTINGS_CHEAT_BEGIN && type <= MENU_SETTINGS_CHEAT_END) @@ -505,8 +504,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 *label, uint32_t label_hash, const char *menu_label) { unsigned i; @@ -619,7 +617,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 *menu_label, - uint32_t label_hash, uint32_t menu_label_hash) + uint32_t label_hash) { if (!cbs) return menu_cbs_exit(); @@ -641,11 +639,11 @@ 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) == 0) + if (menu_cbs_init_bind_right_compare_label(cbs, label, label_hash, menu_label + ) == 0) return 0; - if (menu_cbs_init_bind_right_compare_type(cbs, type, label_hash, menu_label, menu_label_hash) == 0) + if (menu_cbs_init_bind_right_compare_type(cbs, type, label_hash, menu_label ) == 0) return 0; return menu_cbs_exit(); diff --git a/menu/cbs/menu_cbs_scan.c b/menu/cbs/menu_cbs_scan.c index 5eebfcbfa0..181717654e 100644 --- a/menu/cbs/menu_cbs_scan.c +++ b/menu/cbs/menu_cbs_scan.c @@ -135,7 +135,7 @@ static int menu_cbs_init_bind_scan_compare_type(menu_file_list_cbs_t *cbs, int menu_cbs_init_bind_scan(menu_file_list_cbs_t *cbs, const char *path, const char *label, unsigned type, size_t idx, - uint32_t label_hash, uint32_t menu_label_hash) + uint32_t label_hash) { if (!cbs) return -1; diff --git a/menu/cbs/menu_cbs_select.c b/menu/cbs/menu_cbs_select.c index 705aa5b050..da6d1b42ab 100644 --- a/menu/cbs/menu_cbs_select.c +++ b/menu/cbs/menu_cbs_select.c @@ -186,7 +186,7 @@ static int menu_cbs_init_bind_select_compare_label(menu_file_list_cbs_t *cbs, int menu_cbs_init_bind_select(menu_file_list_cbs_t *cbs, const char *path, const char *label, unsigned type, size_t idx, - uint32_t label_hash, uint32_t menu_label_hash) + uint32_t label_hash) { if (!cbs) return -1; diff --git a/menu/cbs/menu_cbs_start.c b/menu/cbs/menu_cbs_start.c index db881a2ef8..fcff5d50e1 100644 --- a/menu/cbs/menu_cbs_start.c +++ b/menu/cbs/menu_cbs_start.c @@ -433,7 +433,7 @@ static int menu_cbs_init_bind_start_compare_type(menu_file_list_cbs_t *cbs, int menu_cbs_init_bind_start(menu_file_list_cbs_t *cbs, const char *path, const char *label, unsigned type, size_t idx, - uint32_t label_hash, uint32_t menu_label_hash) + uint32_t label_hash) { if (!cbs) return -1; diff --git a/menu/cbs/menu_cbs_title.c b/menu/cbs/menu_cbs_title.c index 57684e3117..f7ee849215 100644 --- a/menu/cbs/menu_cbs_title.c +++ b/menu/cbs/menu_cbs_title.c @@ -1343,7 +1343,7 @@ static int menu_cbs_init_bind_title_compare_type(menu_file_list_cbs_t *cbs, int menu_cbs_init_bind_title(menu_file_list_cbs_t *cbs, const char *path, const char *label, unsigned type, size_t idx, - uint32_t label_hash, uint32_t menu_label_hash) + uint32_t label_hash) { if (!cbs) return -1; diff --git a/menu/cbs/menu_cbs_up.c b/menu/cbs/menu_cbs_up.c index 582d076f25..0cd12caaae 100644 --- a/menu/cbs/menu_cbs_up.c +++ b/menu/cbs/menu_cbs_up.c @@ -42,7 +42,7 @@ static int action_bind_up_generic(unsigned type, const char *label) int menu_cbs_init_bind_up(menu_file_list_cbs_t *cbs, const char *path, const char *label, unsigned type, size_t idx, - uint32_t label_hash, uint32_t menu_label_hash) + uint32_t label_hash) { if (!cbs) return -1; diff --git a/menu/menu_cbs.c b/menu/menu_cbs.c index 07031091ff..54c10d4019 100644 --- a/menu/menu_cbs.c +++ b/menu/menu_cbs.c @@ -70,19 +70,19 @@ void menu_cbs_init(void *data, menu_cbs_init_log(repr_label, "OK", cbs->action_ok_ident); - menu_cbs_init_bind_cancel(cbs, path, label, type, idx, menu_label, label_hash, menu_label_hash); + menu_cbs_init_bind_cancel(cbs, path, label, type, idx, menu_label, label_hash); menu_cbs_init_log(repr_label, "CANCEL", cbs->action_cancel_ident); - menu_cbs_init_bind_scan(cbs, path, label, type, idx, label_hash, menu_label_hash); + menu_cbs_init_bind_scan(cbs, path, label, type, idx, label_hash); menu_cbs_init_log(repr_label, "SCAN", cbs->action_scan_ident); - menu_cbs_init_bind_start(cbs, path, label, type, idx, label_hash, menu_label_hash); + menu_cbs_init_bind_start(cbs, path, label, type, idx, label_hash); menu_cbs_init_log(repr_label, "START", cbs->action_start_ident); - menu_cbs_init_bind_select(cbs, path, label, type, idx, label_hash, menu_label_hash); + menu_cbs_init_bind_select(cbs, path, label, type, idx, label_hash); menu_cbs_init_log(repr_label, "SELECT", cbs->action_select_ident); @@ -94,23 +94,23 @@ void menu_cbs_init(void *data, menu_cbs_init_log(repr_label, "CONTENT SWITCH", cbs->action_content_list_switch_ident); - menu_cbs_init_bind_up(cbs, path, label, type, idx, label_hash, menu_label_hash); + menu_cbs_init_bind_up(cbs, path, label, type, idx, label_hash); menu_cbs_init_log(repr_label, "UP", cbs->action_up_ident); - menu_cbs_init_bind_down(cbs, path, label, type, idx, label_hash, menu_label_hash); + menu_cbs_init_bind_down(cbs, path, label, type, idx, label_hash); menu_cbs_init_log(repr_label, "DOWN", cbs->action_down_ident); - menu_cbs_init_bind_left(cbs, path, label, type, idx, menu_label, label_hash, menu_label_hash); + menu_cbs_init_bind_left(cbs, path, label, type, idx, menu_label, label_hash); menu_cbs_init_log(repr_label, "LEFT", cbs->action_left_ident); - menu_cbs_init_bind_right(cbs, path, label, type, idx, menu_label, label_hash, menu_label_hash); + menu_cbs_init_bind_right(cbs, path, label, type, idx, menu_label, label_hash); menu_cbs_init_log(repr_label, "RIGHT", cbs->action_right_ident); - menu_cbs_init_bind_deferred_push(cbs, path, label, type, idx, label_hash, menu_label_hash); + menu_cbs_init_bind_deferred_push(cbs, path, label, type, idx, label_hash); menu_cbs_init_log(repr_label, "DEFERRED PUSH", cbs->action_deferred_push_ident); @@ -122,7 +122,7 @@ void menu_cbs_init(void *data, menu_cbs_init_log(repr_label, "GET VALUE", cbs->action_get_value_ident); - menu_cbs_init_bind_title(cbs, path, label, type, idx, label_hash, menu_label_hash); + menu_cbs_init_bind_title(cbs, path, label, type, idx, label_hash); menu_cbs_init_log(repr_label, "GET TITLE", cbs->action_get_title_ident); diff --git a/menu/menu_cbs.h b/menu/menu_cbs.h index bfa7b736d7..268b65000b 100644 --- a/menu/menu_cbs.h +++ b/menu/menu_cbs.h @@ -118,12 +118,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 *menu_label, - uint32_t label_hash, uint32_t menu_label_hash); + uint32_t 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 *menu_label, - uint32_t label_hash, uint32_t menu_label_hash); + uint32_t label_hash); int menu_cbs_init_bind_refresh(menu_file_list_cbs_t *cbs, const char *path, const char *label, unsigned type, size_t idx); @@ -134,18 +134,18 @@ int menu_cbs_init_bind_get_string_representation(menu_file_list_cbs_t *cbs, int menu_cbs_init_bind_up(menu_file_list_cbs_t *cbs, const char *path, const char *label, unsigned type, size_t idx, - uint32_t label_hash, uint32_t menu_label_hash); + uint32_t label_hash); int menu_cbs_init_bind_down(menu_file_list_cbs_t *cbs, const char *path, const char *label, unsigned type, size_t idx, - uint32_t label_hash, uint32_t menu_label_hash); + uint32_t label_hash); int menu_cbs_init_bind_info(menu_file_list_cbs_t *cbs, const char *path, const char *label, unsigned type, size_t idx); int menu_cbs_init_bind_start(menu_file_list_cbs_t *cbs, const char *path, const char *label, unsigned type, size_t idx, - uint32_t label_hash, uint32_t menu_label_hash); + uint32_t label_hash); int menu_cbs_init_bind_content_list_switch(menu_file_list_cbs_t *cbs, const char *path, const char *label, unsigned type, size_t idx); @@ -153,7 +153,7 @@ int menu_cbs_init_bind_content_list_switch(menu_file_list_cbs_t *cbs, int menu_cbs_init_bind_cancel(menu_file_list_cbs_t *cbs, const char *path, const char *label, unsigned type, size_t idx, const char *menu_label, - uint32_t label_hash, uint32_t menu_label_hash); + uint32_t label_hash); int menu_cbs_init_bind_ok(menu_file_list_cbs_t *cbs, const char *path, const char *label, unsigned type, size_t idx, @@ -161,19 +161,19 @@ int menu_cbs_init_bind_ok(menu_file_list_cbs_t *cbs, int menu_cbs_init_bind_deferred_push(menu_file_list_cbs_t *cbs, const char *path, const char *label, unsigned type, size_t idx, - uint32_t label_hash, uint32_t menu_label_hash); + uint32_t label_hash); int menu_cbs_init_bind_select(menu_file_list_cbs_t *cbs, const char *path, const char *label, unsigned type, size_t idx, - uint32_t label_hash, uint32_t menu_label_hash); + uint32_t label_hash); int menu_cbs_init_bind_scan(menu_file_list_cbs_t *cbs, const char *path, const char *label, unsigned type, size_t idx, - uint32_t label_hash, uint32_t menu_label_hash); + uint32_t label_hash); int menu_cbs_init_bind_title(menu_file_list_cbs_t *cbs, const char *path, const char *label, unsigned type, size_t idx, - uint32_t label_hash, uint32_t menu_label_hash); + uint32_t label_hash); #ifdef HAVE_LIBRETRODB int action_scan_directory(const char *path,