ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Get rid of free_args

This commit is contained in:
twinaphex 2014-07-28 01:28:48 +02:00
parent 458e4d83f4
commit 86f2ef2ae8
2 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
frontend/frontend.c
View File

@ -270,17 +270,6 @@ void main_exit(args_type() args)
driver.frontend_ctx->shutdown(false); 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) static void check_defaults_dirs(void)
{ {
if (*g_defaults.autoconfig_dir) 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; int *rarch_argc_ptr;
char **rarch_argv_ptr; char **rarch_argv_ptr;
struct rarch_main_wrap *wrap_args; struct rarch_main_wrap *wrap_args;
int ret, rarch_argc = 0; int i, ret, rarch_argc = 0;
char *rarch_argv[MAX_ARGS] = {NULL}; char *rarch_argv[MAX_ARGS] = {NULL};
char *argv_copy[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); process_args(rarch_argc_ptr, rarch_argv_ptr);
error: 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); free(wrap_args);
return retval; return retval;
} }

1
frontend/frontend.h
View File

@ -40,7 +40,6 @@ extern "C" {
int main_entry_iterate(signature(), args_type() args); int main_entry_iterate(signature(), args_type() args);
void main_exit(args_type() args); void main_exit(args_type() args);
returntype main_entry(signature()); 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, bool main_load_content(int argc, char **argv, environment_get_t environ_get,
process_args_t process_args); process_args_t process_args);