From 86f2ef2ae84afb6ea387b59a1b538b9a04e046c3 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Mon, 28 Jul 2014 01:28:48 +0200
Subject: [PATCH] Get rid of free_args

---
 frontend/frontend.c | 16 +++-------------
 frontend/frontend.h |  1 -
 2 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/frontend/frontend.c b/frontend/frontend.c
index 0ed6bc4d18..f151526546 100644
--- a/frontend/frontend.c
+++ b/frontend/frontend.c
@@ -270,17 +270,6 @@ void main_exit(args_type() args)
       driver.frontend_ctx->shutdown(false);
 }
 
-void free_args(void *data, char **argv_copy, unsigned argv_size)
-{
-   unsigned i;
-   struct rarch_main_wrap *wrap_args = (struct rarch_main_wrap*)data;
-   if (!wrap_args || !wrap_args->touched)
-      return;
-
-   for (i = 0; i < argv_size; i++)
-      free(argv_copy[i]);
-}
-
 static void check_defaults_dirs(void)
 {
    if (*g_defaults.autoconfig_dir)
@@ -314,7 +303,7 @@ bool main_load_content(int argc, char **argv, environment_get_t environ_get,
    int *rarch_argc_ptr;
    char **rarch_argv_ptr;
    struct rarch_main_wrap *wrap_args;
-   int ret, rarch_argc = 0;
+   int i, ret, rarch_argc = 0;
    char *rarch_argv[MAX_ARGS] = {NULL};
    char *argv_copy[MAX_ARGS] = {NULL};
 
@@ -355,7 +344,8 @@ bool main_load_content(int argc, char **argv, environment_get_t environ_get,
       process_args(rarch_argc_ptr, rarch_argv_ptr);
 
 error:
-   free_args(wrap_args, argv_copy, ARRAY_SIZE(argv_copy));
+   for (i = 0; i < ARRAY_SIZE(argv_copy); i++)
+      free(argv_copy[i]);
    free(wrap_args);
    return retval;
 }
diff --git a/frontend/frontend.h b/frontend/frontend.h
index 3974d60d08..c1add009e1 100644
--- a/frontend/frontend.h
+++ b/frontend/frontend.h
@@ -40,7 +40,6 @@ extern "C" {
 int main_entry_iterate(signature(), args_type() args);
 void main_exit(args_type() args);
 returntype main_entry(signature());
-void free_args(void *data, char **argv_copy, unsigned argv_size);
 bool main_load_content(int argc, char **argv, environment_get_t environ_get,
       process_args_t process_args);