From 9f53ad9c4522616b36752eea7e3a27f57168495c Mon Sep 17 00:00:00 2001 From: twinaphex Date: Fri, 1 Jul 2016 19:59:47 +0200 Subject: [PATCH] (menu_cbs.c) Remove arguments --- menu/cbs/menu_cbs_scan.c | 1 - menu/cbs/menu_cbs_select.c | 5 ++--- menu/cbs/menu_cbs_start.c | 1 - menu/menu_cbs.c | 6 +++--- menu/menu_cbs.h | 3 --- 5 files changed, 5 insertions(+), 11 deletions(-) diff --git a/menu/cbs/menu_cbs_scan.c b/menu/cbs/menu_cbs_scan.c index 609b875f81..5eebfcbfa0 100644 --- a/menu/cbs/menu_cbs_scan.c +++ b/menu/cbs/menu_cbs_scan.c @@ -135,7 +135,6 @@ 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, - const char *elem0, const char *elem1, uint32_t label_hash, uint32_t menu_label_hash) { if (!cbs) diff --git a/menu/cbs/menu_cbs_select.c b/menu/cbs/menu_cbs_select.c index 89448775ff..705aa5b050 100644 --- a/menu/cbs/menu_cbs_select.c +++ b/menu/cbs/menu_cbs_select.c @@ -179,14 +179,13 @@ static int menu_cbs_init_bind_select_compare_type( } static int menu_cbs_init_bind_select_compare_label(menu_file_list_cbs_t *cbs, - const char *label, uint32_t hash, const char *elem0) + const char *label, uint32_t hash) { return -1; } int menu_cbs_init_bind_select(menu_file_list_cbs_t *cbs, const char *path, const char *label, unsigned type, size_t idx, - const char *elem0, const char *elem1, uint32_t label_hash, uint32_t menu_label_hash) { if (!cbs) @@ -211,7 +210,7 @@ int menu_cbs_init_bind_select(menu_file_list_cbs_t *cbs, return 0; } - if (menu_cbs_init_bind_select_compare_label(cbs, label, label_hash, elem0) == 0) + if (menu_cbs_init_bind_select_compare_label(cbs, label, label_hash) == 0) return 0; if (menu_cbs_init_bind_select_compare_type(cbs, type) == 0) diff --git a/menu/cbs/menu_cbs_start.c b/menu/cbs/menu_cbs_start.c index 469f7488de..db881a2ef8 100644 --- a/menu/cbs/menu_cbs_start.c +++ b/menu/cbs/menu_cbs_start.c @@ -433,7 +433,6 @@ 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, - const char *elem0, const char *elem1, uint32_t label_hash, uint32_t menu_label_hash) { if (!cbs) diff --git a/menu/menu_cbs.c b/menu/menu_cbs.c index 6cf6d30a1a..623ef0a9fc 100644 --- a/menu/menu_cbs.c +++ b/menu/menu_cbs.c @@ -89,15 +89,15 @@ void menu_cbs_init(void *data, menu_cbs_init_log(repr_label, "CANCEL", cbs->action_cancel_ident); - menu_cbs_init_bind_scan(cbs, path, label, type, idx, elem0, elem1, label_hash, menu_label_hash); + menu_cbs_init_bind_scan(cbs, path, label, type, idx, label_hash, menu_label_hash); menu_cbs_init_log(repr_label, "SCAN", cbs->action_scan_ident); - menu_cbs_init_bind_start(cbs, path, label, type, idx, elem0, elem1, label_hash, menu_label_hash); + menu_cbs_init_bind_start(cbs, path, label, type, idx, label_hash, menu_label_hash); menu_cbs_init_log(repr_label, "START", cbs->action_start_ident); - menu_cbs_init_bind_select(cbs, path, label, type, idx, elem0, elem1, label_hash, menu_label_hash); + menu_cbs_init_bind_select(cbs, path, label, type, idx, label_hash, menu_label_hash); menu_cbs_init_log(repr_label, "SELECT", cbs->action_select_ident); diff --git a/menu/menu_cbs.h b/menu/menu_cbs.h index b9b3f25f38..1858db6ef5 100644 --- a/menu/menu_cbs.h +++ b/menu/menu_cbs.h @@ -145,7 +145,6 @@ int menu_cbs_init_bind_info(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, - const char *elem0, const char *elem1, uint32_t label_hash, uint32_t menu_label_hash); int menu_cbs_init_bind_content_list_switch(menu_file_list_cbs_t *cbs, @@ -167,12 +166,10 @@ int menu_cbs_init_bind_deferred_push(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, - const char *elem0, const char *elem1, uint32_t label_hash, uint32_t menu_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, - const char *elem0, const char *elem1, uint32_t label_hash, uint32_t menu_label_hash); int menu_cbs_init_bind_title(menu_file_list_cbs_t *cbs,