From f9f0d4abb6bfd8c5890c5b11ae1f6e7e06790b3f Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Wed, 3 Feb 2016 15:47:57 +0100
Subject: [PATCH] Refactor

---
 menu/cbs/menu_cbs_deferred_push.c | 47 -------------------------------
 menu/cbs/menu_cbs_ok.c            | 46 +++++++++++++++++++++++++++++-
 menu/menu_cbs.h                   |  5 ++--
 3 files changed, 47 insertions(+), 51 deletions(-)

diff --git a/menu/cbs/menu_cbs_deferred_push.c b/menu/cbs/menu_cbs_deferred_push.c
index 6bd914bc74..36da17311d 100644
--- a/menu/cbs/menu_cbs_deferred_push.c
+++ b/menu/cbs/menu_cbs_deferred_push.c
@@ -299,50 +299,6 @@ static int deferred_push_disk_options(menu_displaylist_info_t *info)
 }
 
 #ifdef HAVE_NETWORKING
-/* HACK - we have to find some way to pass state inbetween
- * function pointer callback functions that don't necessarily
- * call each other. */
-char *core_buf;
-size_t core_len;
-
-void cb_net_generic(void *task_data, void *user_data, const char *err)
-{
-   bool refresh = false;
-   http_transfer_data_t *data = (http_transfer_data_t*)task_data;
-
-   if (core_buf)
-      free(core_buf);
-
-   core_buf = NULL;
-   core_len = 0;
-
-   if (!data || err)
-      goto finish;
-
-   core_buf = (char*)malloc((data->len+1) * sizeof(char));
-
-   if (!core_buf)
-      goto finish;
-
-   memcpy(core_buf, data->data, data->len * sizeof(char));
-   core_buf[data->len] = '\0';
-   core_len      = data->len;
-
-finish:
-   refresh = true;
-   menu_entries_ctl(MENU_ENTRIES_CTL_UNSET_REFRESH, &refresh);
-
-   if (err)
-      RARCH_ERR("Download failed: %s\n", err);
-
-   if (data)
-   {
-      if (data->data)
-         free(data->data);
-      free(data);
-   }
-}
-
 static void cb_decompressed(void *task_data, void *user_data, const char *err)
 {
    decompress_task_data_t *dec = (decompress_task_data_t*)task_data;
@@ -371,9 +327,6 @@ static void cb_decompressed(void *task_data, void *user_data, const char *err)
 
 /* expects http_transfer_t*, menu_file_transfer_t* */
 void cb_generic_download(void *task_data, void *user_data, const char *err)
-#if 0
-(void *data, size_t len, const char *dir_path)
-#endif
 {
    char output_path[PATH_MAX_LENGTH];
    char shaderdir[PATH_MAX_LENGTH];
diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c
index c47756dcef..06c30808c1 100644
--- a/menu/cbs/menu_cbs_ok.c
+++ b/menu/cbs/menu_cbs_ok.c
@@ -51,8 +51,52 @@ char detect_content_path[PATH_MAX_LENGTH];
 unsigned rdb_entry_start_game_selection_ptr, rpl_entry_selection_ptr;
 size_t hack_shader_pass = 0;
 
+#ifdef HAVE_NETWORKING
+/* HACK - we have to find some way to pass state inbetween
+ * function pointer callback functions that don't necessarily
+ * call each other. */
+char *core_buf;
+size_t core_len;
+
 /* defined in menu_cbs_deferred_push */
-void cb_net_generic(void *task_data, void *user_data, const char *err);
+void cb_net_generic(void *task_data, void *user_data, const char *err)
+{
+   bool refresh = false;
+   http_transfer_data_t *data = (http_transfer_data_t*)task_data;
+
+   if (core_buf)
+      free(core_buf);
+
+   core_buf = NULL;
+   core_len = 0;
+
+   if (!data || err)
+      goto finish;
+
+   core_buf = (char*)malloc((data->len+1) * sizeof(char));
+
+   if (!core_buf)
+      goto finish;
+
+   memcpy(core_buf, data->data, data->len * sizeof(char));
+   core_buf[data->len] = '\0';
+   core_len      = data->len;
+
+finish:
+   refresh = true;
+   menu_entries_ctl(MENU_ENTRIES_CTL_UNSET_REFRESH, &refresh);
+
+   if (err)
+      RARCH_ERR("Download failed: %s\n", err);
+
+   if (data)
+   {
+      if (data->data)
+         free(data->data);
+      free(data);
+   }
+}
+#endif
 
 int generic_action_ok_displaylist_push(const char *path,
       const char *label, unsigned type, size_t idx, size_t entry_idx,
diff --git a/menu/menu_cbs.h b/menu/menu_cbs.h
index 0023f3cf22..5210a550bc 100644
--- a/menu/menu_cbs.h
+++ b/menu/menu_cbs.h
@@ -204,9 +204,8 @@ bool menu_playlist_find_associated_core(const char *path, char *s, size_t len);
 
 
 #ifdef HAVE_NETWORKING
-void cb_net_generic(void *task_data, void *user_data, const char *err);
-
-typedef struct {
+typedef struct
+{
     uint32_t type_hash;
     char path[PATH_MAX_LENGTH];
 } menu_file_transfer_t;