Cleanup

Author: katzer

src/dln.c

@@ -19,9 +19,6 @@
  * SOFTWARE.
  */
 
-//TODO entfernen, nur für debug
-#include <stdio.h>
-
 #include <stdlib.h>
 #include <strings.h>
 #include <string.h>
@@ -46,6 +43,7 @@ dln_find_exe_r(const char *fname, const char *path, char *buf, size_t size)
         path = getenv(PATH_ENV);
         if (path) path = strdup(path);
     }
+
 #if defined(__APPLE__) || defined(__linux__)
     if (!path) {
         path =
@@ -57,7 +55,6 @@ dln_find_exe_r(const char *fname, const char *path, char *buf, size_t size)
     }
 #endif
 
-
     buf = dln_find_1(fname, path, buf, size, 1);
 
     return buf;
@@ -84,7 +81,7 @@ dln_find_1(const char *fname, const char *path, char *fbuf, size_t size, int exe
     const char *p = fname;
 
     if(!path)
-      return NULL;  
+      return NULL;
 
 #define RETURN_IF(expr) if (expr) return (char *)fname;
 
@@ -97,7 +94,7 @@ dln_find_1(const char *fname, const char *path, char *fbuf, size_t size, int exe
 
 #if !defined(__APPLE__) && !defined(__linux__)
 # ifndef CharNext
-# define CharNext(p) ((p)+1)
+#  define CharNext(p) ((p)+1)
 # endif
 # ifdef DOSISH_DRIVE_LETTER
     if (((p[0] | 0x20) - 'a') < 26  && p[1] == ':') {

src/internal.c

@@ -89,8 +89,6 @@ mrb_execarg_fill(mrb_state *mrb, mrb_value env, mrb_value *argv, mrb_int argc, m
     char buf[160];
     mrb_value argv0 = mrb_nil_value();
 
-
-
     ai = mrb_gc_arena_save(mrb);
 
     if (mrb_hash_p(opts)) {
@@ -102,7 +100,6 @@ mrb_execarg_fill(mrb_state *mrb, mrb_value env, mrb_value *argv, mrb_int argc, m
     }
 
     tCmd = mrb_string_value_ptr(mrb, argv[0]);
-
     fCmd = dln_find_exe_r(tCmd, NULL, buf, sizeof(buf));
 
     do_exit = !fCmd && strncmp("exit", tCmd, 4) == 0;
@@ -114,7 +111,6 @@ mrb_execarg_fill(mrb_state *mrb, mrb_value env, mrb_value *argv, mrb_int argc, m
         result = (char **)mrb_malloc(mrb, sizeof(char *) * (argc + 1));
         mrb_execarg_argv_to_strv(mrb, argv, argc, result);
     } else {
-
         result = (char **)mrb_malloc(mrb, sizeof(char *) * (argc + 3));
 
     #if defined(__APPLE__) || defined(__linux__)
@@ -145,7 +141,6 @@ mrb_execarg_fill(mrb_state *mrb, mrb_value env, mrb_value *argv, mrb_int argc, m
         result[0] = mrb_str_to_cstr(mrb, argv0);
     }
 
-
     eargp->envp     = NULL;
     eargp->filename = result[0];
     eargp->argv     = result;
@@ -199,10 +194,12 @@ mrb_execarg_argv_to_strv(mrb_state *mrb, mrb_value *argv, mrb_int len, char **re
         *result = buf;
         result++;
     }
+
     *result = NULL;
     result -= i;
 
     mrb_gc_arena_restore(mrb, ai);
+
     return 0;
 }
 
@@ -219,6 +216,7 @@ mrb_build_shell_array(mrb_state *mrb, mrb_value *argv, mrb_int len, char *shell,
 
     *result = shell;
     result++;
+
     *result = shell_mod;
     result++;
 
@@ -227,9 +225,11 @@ mrb_build_shell_array(mrb_state *mrb, mrb_value *argv, mrb_int len, char *shell,
         *result = buf;
         result++;
     }
+
     *result = NULL;
     result -= i;
 
     mrb_gc_arena_restore(mrb, ai);
+
     return 0;
 }

src/win32.c

@@ -295,7 +295,7 @@ spawnve(const char *shell, char *const argv[], char *const envp[], mrb_value in,
     char tCmd[strlen(cmd)];
     char tShell[strlen(shell)];
 
-    input  = mrb_cptr_p(in) ? mrb_cptr(in) : GetStdHandle(STD_INPUT_HANDLE);
+    input  = mrb_cptr_p(in)  ? mrb_cptr(in)  : GetStdHandle(STD_INPUT_HANDLE);
     output = mrb_cptr_p(out) ? mrb_cptr(out) : GetStdHandle(STD_OUTPUT_HANDLE);
     error  = mrb_cptr_p(err) ? mrb_cptr(err) : GetStdHandle(STD_ERROR_HANDLE);
 
@@ -341,15 +341,15 @@ spawnv(const char *shell, char *const argv[], mrb_value in, mrb_value out, mrb_v
 
     strcpy(tShell, shell);
 
-    input  = mrb_cptr_p(in) ? mrb_cptr(in) : GetStdHandle(STD_INPUT_HANDLE);
+    input  = mrb_cptr_p(in)  ? mrb_cptr(in)  : GetStdHandle(STD_INPUT_HANDLE);
     output = mrb_cptr_p(out) ? mrb_cptr(out) : GetStdHandle(STD_OUTPUT_HANDLE);
     error  = mrb_cptr_p(err) ? mrb_cptr(err) : GetStdHandle(STD_ERROR_HANDLE);
 
     wshell = str_to_wstr(tShell, strlen(tShell));
     wcmd   = str_to_wstr(cmd, strlen(cmd));
 
-    ret = child_result(CreateChild(
-        wshell, wcmd, NULL, input, output, error, 0, NULL), P_NOWAIT);
+    ret    = child_result(
+        CreateChild(wshell, wcmd, NULL, input, output, error, 0, NULL), P_NOWAIT);
 
     free(wshell);
     free(wcmd);
@@ -394,8 +394,6 @@ CreateChild(const WCHAR *shell, const WCHAR *cmd, SECURITY_ATTRIBUTES *psa,
     SECURITY_ATTRIBUTES sa;
     struct ChildRecord *child;
 
-
-
     if (!cmd && !shell)
         return NULL;
 

test/process.rb

@@ -153,7 +153,6 @@ def assert_windows(*args, &block)
     wait_for_pid(pid)
     assert_equal var * 2, read('tmp/pipe.txt')
 
-
     pid = spawn 'ruby', '-v', out: pip
 
     wait_for_pid(pid)