From 4b8de5887832d16bee28cd508eeb0c3e5ded1995 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sun, 22 Mar 2015 03:41:20 +0100
Subject: [PATCH] Rename functions

---
 driver.c       |  4 ++--
 retroarch.c    |  4 ++--
 runloop.c      | 14 +++++++-------
 runloop.h      |  6 +++---
 runloop_data.c |  8 ++++----
 5 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/driver.c b/driver.c
index 9b9965ff4f..2879541aa2 100644
--- a/driver.c
+++ b/driver.c
@@ -42,7 +42,7 @@ void driver_free(void)
    free(driver);
 }
 
-static driver_t *driver_alloc(void)
+static driver_t *driver_new(void)
 {
    driver_t *driver = (driver_t*)calloc(1, sizeof(driver_t));
 
@@ -55,7 +55,7 @@ static driver_t *driver_alloc(void)
 void driver_clear_state(void)
 {
    driver_free();
-   g_driver  = driver_alloc();
+   g_driver  = driver_new();
 }
 
 driver_t *driver_get_ptr(void)
diff --git a/retroarch.c b/retroarch.c
index 43308a2bf0..6b515dfbba 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -1731,8 +1731,8 @@ void rarch_main_free(void)
    rarch_main_command(RARCH_CMD_LOG_FILE_DEINIT);
    rarch_main_command(RARCH_CMD_DRIVERS_DEINIT);
 
-   rarch_main_state_deinit();
-   rarch_main_global_deinit();
+   rarch_main_state_free();
+   rarch_main_global_free();
    config_free();
 }
 
diff --git a/runloop.c b/runloop.c
index 7a43e712d0..369d9c22da 100644
--- a/runloop.c
+++ b/runloop.c
@@ -920,7 +920,7 @@ static int rarch_main_iterate_quit(void)
    if (global->core_shutdown_initiated
          && settings->load_dummy_on_core_shutdown)
    {
-      rarch_main_data_deinit();
+      rarch_main_data_free();
       if (!rarch_main_command(RARCH_CMD_PREPARE_DUMMY))
          return -1;
 
@@ -1010,7 +1010,7 @@ runloop_t *rarch_main_get_ptr(void)
 }
 
 
-void rarch_main_state_deinit(void)
+void rarch_main_state_free(void)
 {
    runloop_t *runloop = rarch_main_get_ptr();
 
@@ -1020,7 +1020,7 @@ void rarch_main_state_deinit(void)
    free(runloop);
 }
 
-void rarch_main_global_deinit(void)
+void rarch_main_global_free(void)
 {
    global_t *global = NULL;
    
@@ -1053,7 +1053,7 @@ FILE *rarch_main_log_file(void)
    return global->log_file;
 }
 
-static global_t *rarch_main_global_init(void)
+static global_t *rarch_main_global_new(void)
 {
    global_t *global = (global_t*)calloc(1, sizeof(global_t));
 
@@ -1077,11 +1077,11 @@ void rarch_main_clear_state(void)
 {
    driver_clear_state();
 
-   rarch_main_state_deinit();
+   rarch_main_state_free();
    g_runloop = rarch_main_state_init();
 
-   rarch_main_global_deinit();
-   g_extern  = rarch_main_global_init();
+   rarch_main_global_free();
+   g_extern  = rarch_main_global_new();
 }
 
 bool rarch_main_is_idle(void)
diff --git a/runloop.h b/runloop.h
index 1ea0345603..7cc569881b 100644
--- a/runloop.h
+++ b/runloop.h
@@ -482,11 +482,11 @@ void rarch_main_data_clear_state(void);
 
 void rarch_main_data_iterate(void);
 
-void rarch_main_state_deinit(void);
+void rarch_main_state_free(void);
 
-void rarch_main_global_deinit(void);
+void rarch_main_global_free(void);
 
-void rarch_main_data_deinit(void);
+void rarch_main_data_free(void);
 
 void rarch_main_data_init_queues(void);
 
diff --git a/runloop_data.c b/runloop_data.c
index 982aada914..77fc5b0921 100644
--- a/runloop_data.c
+++ b/runloop_data.c
@@ -780,7 +780,7 @@ static void data_runloop_thread_deinit(data_runloop_t *runloop)
 }
 #endif
 
-void rarch_main_data_deinit(void)
+void rarch_main_data_free(void)
 {
    data_runloop_t *data_runloop = (data_runloop_t*)rarch_main_data_get_ptr();
 
@@ -898,7 +898,7 @@ void rarch_main_data_iterate(void)
    data_runloop_iterate(false, data_runloop);
 }
 
-static data_runloop_t *rarch_main_data_init(void)
+static data_runloop_t *rarch_main_data_new(void)
 {
    data_runloop_t *data_runloop = (data_runloop_t*)calloc(1, sizeof(data_runloop_t));
 
@@ -917,8 +917,8 @@ static data_runloop_t *rarch_main_data_init(void)
 
 void rarch_main_data_clear_state(void)
 {
-   rarch_main_data_deinit();
-   g_data_runloop = rarch_main_data_init();
+   rarch_main_data_free();
+   g_data_runloop = rarch_main_data_new();
 }