Overall style change, small fixes

 - Tweak sink switch_to() order.

Signed-off-by: Andrew Opalach <andrew@akon.city>

1 files changed, 18 insertions, 15 deletions

diff --git a/src/fruits/cmv/cmv.c b/src/fruits/cmv/cmv.c
index 86b6f75..274319a 100644
--- a/src/fruits/cmv/cmv.c
+++ b/src/fruits/cmv/cmv.c
@@ -46,9 +46,9 @@ static nn_thread_result NNWT_THREADCALL event_loop_thread(void *userdata)
 static bool parse_exe_name_params(str *exe_name, str *addr, struct lia_prefs *prefs)
 {
     u32 index = al_str_rfind(exe_name, '/');
-    if (index == al_str_npos) {
+    if (index == AL_STR_NPOS) {
         index = al_str_rfind(exe_name, '\\');
-        if (index == al_str_npos) goto def;
+        if (index == AL_STR_NPOS) goto def;
     }
 
     str sub = al_str_substr(exe_name, index + 1, exe_name->length);
@@ -59,19 +59,19 @@ static bool parse_exe_name_params(str *exe_name, str *addr, struct lia_prefs *pr
 
     // Skip version.
     index = al_str_find(&sub, '-');
-    if (index == al_str_npos) goto def;
+    if (index == AL_STR_NPOS) goto def;
     sub = al_str_substr(&sub, index + 1, sub.length);
 
     index = al_str_find(&sub, '-');
-    if (index == al_str_npos) goto def;
+    if (index == AL_STR_NPOS) goto def;
     *addr = al_str_substr(&sub, 0, index);
 
     for (;;) {
         sub = al_str_substr(&sub, index + 1, sub.length);
         index = al_str_find(&sub, '-');
-        if (index == al_str_npos) {
+        if (index == AL_STR_NPOS) {
             index = al_str_find(&sub, '.');
-            if (index == al_str_npos) {
+            if (index == AL_STR_NPOS) {
                 index = sub.length;
             } else {
                 sub.length = index;
@@ -104,8 +104,10 @@ def:
 
 static struct cmv c = { 0 };
 
-s32 window_system_main(s32 argc, str *argv)
+s32 window_system_main(u32 argc, str *argv, void *extra)
 {
+    (void)extra;
+
 #ifdef CAMU_HAVE_FFMPEG
     camu_ff_common_init();
 #endif
@@ -180,7 +182,7 @@ s32 window_system_main(s32 argc, str *argv)
 
 #ifndef CAMU_SINK_ONLY
     if (local) {
-        for (s32 i = 1; i < argc; i++) {
+        for (u32 i = 1; i < argc; i++) {
             struct nn_packet *packet = nn_packet_create();
 #if defined CAMU_HAVE_PORTAL
             if (al_str_at(&argv[i], 0) == ';' || camu_is_url(&argv[i], 0)) {
@@ -231,12 +233,12 @@ static void sigint_handler(int signum)
 }
 
 #ifdef NAUNET_ON_WINDOWS
-s32 wmain(s32 argc, wchar_t **wargv)
+s32 wmain(s32 argc, wchar_t **argv)
 #else
-s32 main(s32 argc, char *cargv[])
+s32 main(s32 argc, char *argv[])
 #endif
 {
-    if (!nn_common_init()) {
+    if (!nn_common_init() || !stl_global_init(false)) {
         return EXIT_FAILURE;
     }
 
@@ -244,20 +246,21 @@ s32 main(s32 argc, char *cargv[])
 
     array(str) args;
     al_array_init(args);
+    al_array_reserve(args, argc);
     for (s32 i = 0; i < argc; i++) {
         str arg;
 #ifdef NAUNET_ON_WINDOWS
-        if (!al_str_from_wstr(&arg, &al_wstr_cr(wargv[i]))) {
-            error("Failed to parse argument #%i.", i);
+        if (!al_str_from_wstr(&arg, &al_wstr_cr(argv[i]))) {
+            error("Failed to convert argument #%i from a wide string.", i);
             continue;
         }
 #else
-        al_str_from(&arg, cargv[i]);
+        al_str_from(&arg, argv[i]);
 #endif
         al_array_push(args, arg);
     }
 
-    s32 ret = stl_global_init((s32)args.count, args.data, window_system_main, false);
+    s32 ret = stl_swallow_main(args.count, args.data, window_system_main, NULL);
     stl_global_close();
 
     str *arg;