From c215fef8dd52ca226070c8bde124923b8d934410 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Tue, 21 Feb 2017 18:58:03 +0100
Subject: [PATCH] Updates

---
 gfx/common/win32_common.cpp |  2 +-
 menu/drivers/zarch.c        |  2 +-
 tasks/task_content.c        | 10 +++++-----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/gfx/common/win32_common.cpp b/gfx/common/win32_common.cpp
index f9a2998906..64192c9c96 100644
--- a/gfx/common/win32_common.cpp
+++ b/gfx/common/win32_common.cpp
@@ -333,7 +333,7 @@ static int win32_drag_query_file(HWND hwnd, WPARAM wparam)
          const core_info_t *info = (const core_info_t*)&core_info[0];
 
          if (info)
-            task_push_content_load_content_with_new_core_from_companion_ui(
+            task_push_load_content_with_new_core_from_companion_ui(
                   info->path, NULL,
                   &content_info,
                   NULL, NULL);
diff --git a/menu/drivers/zarch.c b/menu/drivers/zarch.c
index b3fa050a28..fee42c01a1 100644
--- a/menu/drivers/zarch.c
+++ b/menu/drivers/zarch.c
@@ -787,7 +787,7 @@ static int zarch_zui_load_content(zui_t *zui, unsigned i)
 {
    content_ctx_info_t content_info = {0};
 
-   task_push_content_load_content_with_new_core_from_menu(
+   task_push_load_content_with_new_core_from_menu(
          zui->pick_cores[i].path,
          zui->pick_content,
          &content_info,
diff --git a/tasks/task_content.c b/tasks/task_content.c
index 85f059fbdf..234e882542 100644
--- a/tasks/task_content.c
+++ b/tasks/task_content.c
@@ -973,7 +973,7 @@ static bool command_event_cmd_exec(const char *data,
    return true;
 }
 
-static bool task_push_content_update_firmware_status(
+static bool firmware_update_status(
       content_information_ctx_t *content_ctx)
 {
    char s[PATH_MAX_LENGTH];
@@ -1211,7 +1211,7 @@ bool task_push_start_current_core(content_ctx_info_t *content_info)
    retroarch_set_current_core_type(CORE_TYPE_PLAIN, true);
 
    /* Load content */
-   if (task_push_content_update_firmware_status(&content_ctx))
+   if (firmware_update_status(&content_ctx))
       return true;
 
    if (!task_load_content(content_info, &content_ctx,
@@ -1323,7 +1323,7 @@ bool task_push_load_content_with_new_core_from_menu(
    if (!content_info->environ_get)
       content_info->environ_get = menu_content_environment_get;
 
-   if (task_push_content_update_firmware_status(&content_ctx))
+   if (firmware_update_status(&content_ctx))
       return true;
 
    if (!task_load_content(content_info, &content_ctx,
@@ -1396,7 +1396,7 @@ static bool task_load_content_callback(content_ctx_info_t *content_info,
       content_info->environ_get = menu_content_environment_get;
 #endif
 
-   if (task_push_content_update_firmware_status(&content_ctx))
+   if (firmware_update_status(&content_ctx))
       return true;
 
    ret = task_load_content(content_info, &content_ctx, true, loading_from_cli, &error_string);
@@ -1419,7 +1419,7 @@ static bool task_load_content_callback(content_ctx_info_t *content_info,
    return true;
 }
 
-bool task_push_content_load_content_with_new_core_from_companion_ui(
+bool task_push_load_content_with_new_core_from_companion_ui(
       const char *core_path,
       const char *fullpath,
       content_ctx_info_t *content_info,