From 93ae6746246267aea7ec3c112150942389a0d93e Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Fri, 29 May 2020 10:33:07 +0200
Subject: [PATCH] Cleanups

---
 menu/cbs/menu_cbs_deferred_push.c | 51 ++++++++++++++++---------------
 1 file changed, 26 insertions(+), 25 deletions(-)

diff --git a/menu/cbs/menu_cbs_deferred_push.c b/menu/cbs/menu_cbs_deferred_push.c
index e97883bd30..e1962582cc 100644
--- a/menu/cbs/menu_cbs_deferred_push.c
+++ b/menu/cbs/menu_cbs_deferred_push.c
@@ -39,6 +39,32 @@
 #define BIND_ACTION_DEFERRED_PUSH(cbs, name) (cbs)->action_deferred_push = (name)
 #endif
 
+#define generic_deferred_push(name, type) \
+static int (name)(menu_displaylist_info_t *info) \
+{ \
+   return deferred_push_dlist(info, type); \
+}
+
+#define generic_deferred_cursor_manager(name, type) \
+static int (name)(menu_displaylist_info_t *info) \
+{ \
+   return deferred_push_cursor_manager_list_generic(info, type); \
+}
+
+#define generic_deferred_push_general(name, a, b) \
+static int (name)(menu_displaylist_info_t *info) \
+{ \
+   return general_push(info, a, b); \
+}
+
+#define generic_deferred_push_clear_general(name, a, b) \
+static int (name)(menu_displaylist_info_t *info) \
+{ \
+   menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list); \
+   return general_push(info, a, b); \
+}
+
+
 enum
 {
    PUSH_ARCHIVE_OPEN_DETECT_CORE = 0,
@@ -69,12 +95,6 @@ static int deferred_push_database_manager_list_deferred(
    return deferred_push_dlist(info, DISPLAYLIST_DATABASE_QUERY);
 }
 
-#define generic_deferred_push(name, type) \
-static int (name)(menu_displaylist_info_t *info) \
-{ \
-   return deferred_push_dlist(info, type); \
-}
-
 static int deferred_push_remappings_port(menu_displaylist_info_t *info)
 {
    return deferred_push_dlist(info, DISPLAYLIST_OPTIONS_REMAPPINGS_PORT);
@@ -331,12 +351,6 @@ end:
    return ret;
 }
 
-#define generic_deferred_cursor_manager(name, type) \
-static int (name)(menu_displaylist_info_t *info) \
-{ \
-   return deferred_push_cursor_manager_list_generic(info, type); \
-}
-
 generic_deferred_cursor_manager(deferred_push_cursor_manager_list_deferred_query_rdb_entry_max_users, DATABASE_QUERY_ENTRY_MAX_USERS)
 generic_deferred_cursor_manager(deferred_push_cursor_manager_list_deferred_query_rdb_entry_famitsu_magazine_rating, DATABASE_QUERY_ENTRY_FAMITSU_MAGAZINE_RATING)
 generic_deferred_cursor_manager(deferred_push_cursor_manager_list_deferred_query_rdb_entry_edge_magazine_rating, DATABASE_QUERY_ENTRY_EDGE_MAGAZINE_RATING)
@@ -637,19 +651,6 @@ static int general_push(menu_displaylist_info_t *info,
    return deferred_push_dlist(info, state);
 }
 
-#define generic_deferred_push_general(name, a, b) \
-static int (name)(menu_displaylist_info_t *info) \
-{ \
-   return general_push(info, a, b); \
-}
-
-#define generic_deferred_push_clear_general(name, a, b) \
-static int (name)(menu_displaylist_info_t *info) \
-{ \
-   menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list); \
-   return general_push(info, a, b); \
-}
-
 generic_deferred_push_general(deferred_push_detect_core_list, PUSH_DETECT_CORE_LIST, DISPLAYLIST_CORES_DETECTED)
 generic_deferred_push_general(deferred_archive_open_detect_core, PUSH_ARCHIVE_OPEN_DETECT_CORE, DISPLAYLIST_DEFAULT)
 generic_deferred_push_general(deferred_archive_open, PUSH_ARCHIVE_OPEN, DISPLAYLIST_DEFAULT)