From f7de1a18d612e70d034170c750633b89eee45adc Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Tue, 12 May 2015 12:43:08 +0200
Subject: [PATCH] Move and rename - menu_database_push_query

---
 menu/menu_database.c | 35 ++++++++++++++++++++++++++++++++++-
 menu/menu_entries.c  | 34 ----------------------------------
 menu/menu_entries.h  |  5 -----
 3 files changed, 34 insertions(+), 40 deletions(-)

diff --git a/menu/menu_database.c b/menu/menu_database.c
index a3ea910d43..9387ef26ab 100644
--- a/menu/menu_database.c
+++ b/menu/menu_database.c
@@ -20,6 +20,39 @@
 #include "../playlist.h"
 #include <string.h>
 
+#ifdef HAVE_LIBRETRODB
+static int menu_database_push_query(libretrodb_t *db,
+   libretrodb_cursor_t *cur, file_list_t *list)
+{
+   unsigned i;
+   struct rmsgpack_dom_value item;
+    
+   while (libretrodb_cursor_read_item(cur, &item) == 0)
+   {
+      if (item.type != RDT_MAP)
+         continue;
+        
+      for (i = 0; i < item.map.len; i++)
+      {
+         struct rmsgpack_dom_value *key = &item.map.items[i].key;
+         struct rmsgpack_dom_value *val = &item.map.items[i].value;
+
+         if (!key || !val)
+            continue;
+            
+         if (!strcmp(key->string.buff, "name"))
+         {
+            menu_list_push(list, val->string.buff, db->path,
+            MENU_FILE_RDB_ENTRY, 0);
+            break;
+         }
+      }
+   }
+    
+   return 0;
+}
+#endif
+
 int menu_database_populate_query(file_list_t *list, const char *path,
     const char *query)
 {
@@ -31,7 +64,7 @@ int menu_database_populate_query(file_list_t *list, const char *path,
       return -1;
    if ((database_open_cursor(&db, &cur, query) != 0))
       return -1;
-   if ((menu_entries_push_query(&db, &cur, list)) != 0)
+   if ((menu_database_push_query(&db, &cur, list)) != 0)
       return -1;
 
    libretrodb_cursor_close(&cur);
diff --git a/menu/menu_entries.c b/menu/menu_entries.c
index 3f85472014..3e5e3b4122 100644
--- a/menu/menu_entries.c
+++ b/menu/menu_entries.c
@@ -48,40 +48,6 @@ int menu_entries_setting_set_flags(rarch_setting_t *setting)
    return 0;
 }
 
-#ifdef HAVE_LIBRETRODB
-int menu_entries_push_query(libretrodb_t *db,
-   libretrodb_cursor_t *cur, file_list_t *list)
-{
-   unsigned i;
-   struct rmsgpack_dom_value item;
-    
-   while (libretrodb_cursor_read_item(cur, &item) == 0)
-   {
-      if (item.type != RDT_MAP)
-         continue;
-        
-      for (i = 0; i < item.map.len; i++)
-      {
-         struct rmsgpack_dom_value *key = &item.map.items[i].key;
-         struct rmsgpack_dom_value *val = &item.map.items[i].value;
-
-         if (!key || !val)
-            continue;
-            
-         if (!strcmp(key->string.buff, "name"))
-         {
-            menu_list_push(list, val->string.buff, db->path,
-            MENU_FILE_RDB_ENTRY, 0);
-            break;
-         }
-      }
-   }
-    
-   return 0;
-}
-#endif
-
-
 static void menu_entries_content_list_push(
       file_list_t *list, core_info_t *info, const char* path)
 {
diff --git a/menu/menu_entries.h b/menu/menu_entries.h
index 0e8f3e8051..b776e2123d 100644
--- a/menu/menu_entries.h
+++ b/menu/menu_entries.h
@@ -55,11 +55,6 @@ int menu_entries_push_horizontal_menu_list(menu_handle_t *menu,
       const char *path, const char *label,
       unsigned menu_type);
 
-#ifdef HAVE_LIBRETRODB
-int menu_entries_push_query(libretrodb_t *db,
-   libretrodb_cursor_t *cur, file_list_t *list);
-#endif
-
 #ifdef __cplusplus
 }
 #endif