From d4db5b764726845d926a66a17a067fc66bfbfd00 Mon Sep 17 00:00:00 2001
From: plutoo <plutoo@universe>
Date: Sat, 20 Jan 2018 19:33:53 +0100
Subject: [PATCH] Stylefix

---
 nx/include/switch/runtime/env.h | 2 +-
 nx/source/runtime/argv.c        | 2 +-
 nx/source/runtime/env.c         | 2 +-
 nx/source/runtime/init.c        | 7 +++----
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/nx/include/switch/runtime/env.h b/nx/include/switch/runtime/env.h
index d009d77b..1d2b0659 100644
--- a/nx/include/switch/runtime/env.h
+++ b/nx/include/switch/runtime/env.h
@@ -27,7 +27,7 @@ enum {
 
 typedef void NORETURN (*LoaderReturnFn)(int result_code);
 
-void envParse(void* ctx, Handle main_thread, LoaderReturnFn saved_lr);
+void envSetup(void* ctx, Handle main_thread, LoaderReturnFn saved_lr);
 
 Handle envGetMainThreadHandle(void);
 bool envIsNso(void);
diff --git a/nx/source/runtime/argv.c b/nx/source/runtime/argv.c
index 02e00e00..2936353e 100644
--- a/nx/source/runtime/argv.c
+++ b/nx/source/runtime/argv.c
@@ -12,7 +12,7 @@ extern char* fake_heap_end;
 
 extern u32 __argdata__;
 
-void __system_initArgv(void)
+void argvSetup(void)
 {
     Result rc=0;
     MemoryInfo meminfo;
diff --git a/nx/source/runtime/env.c b/nx/source/runtime/env.c
index 6e38436c..8917444a 100644
--- a/nx/source/runtime/env.c
+++ b/nx/source/runtime/env.c
@@ -15,7 +15,7 @@ static char*  g_nextLoadArgv = NULL;
 
 extern __attribute__((weak)) u32 __nx_applet_type;
 
-void envParse(void* ctx, Handle main_thread, LoaderReturnFn saved_lr)
+void envSetup(void* ctx, Handle main_thread, LoaderReturnFn saved_lr)
 {
     // If we're running under NSO, we should just call svcExitProcess.
     // Otherwise we should return to loader via LR.
diff --git a/nx/source/runtime/init.c b/nx/source/runtime/init.c
index 5e89b6db..2dcd7f63 100644
--- a/nx/source/runtime/init.c
+++ b/nx/source/runtime/init.c
@@ -4,8 +4,7 @@ void __nx_exit(int rc);
 
 void virtmemSetup(void);
 void newlibSetup(void);
-
-void __system_initArgv(void);
+void argvSetup(void);
 
 extern u32 __nx_applet_type;
 
@@ -102,13 +101,13 @@ void __attribute__((weak)) __libnx_init(void* ctx, Handle main_thread, void* sav
     // Called by crt0.
 
     // Libnx initialization goes here.
-    envParse(ctx, main_thread, saved_lr);
+    envSetup(ctx, main_thread, saved_lr);
     newlibSetup();
     virtmemSetup();
     __libnx_initheap();
 
     // Build argc/argv if present
-    __system_initArgv();
+    argvSetup();
 
     // Initialize services.
     __appInit();