error library move to C

src/ccode.vala

@@ -204,6 +204,9 @@ private extern void bf_compile(string code);
 //DOC: ymp plugin load function
 public extern void load_plugin (string path);
 
+public extern void error(int status);
+public extern void error_add(string message);
+public extern bool has_error();
 
 //libc functions for vala source
 private extern int chown(char* path, int uid, int gid);

src/ccode/archive-extract.c

@@ -10,7 +10,7 @@ extern void error_add(char* message);
 extern char* build_string(char* format, ...);
 
 #ifdef __STRICT_ANSI__
-#define strdup(A) strcpy(calloc(strlen(A) + 1, sizeof(char)), A);
+#define strdup(A) strcpy(calloc(strlen(A) + 1, sizeof(char)), A)
 #endif
 
 

src/ccode/error.c

@@ -0,0 +1,58 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <array.h>
+
+#include <error.h>
+
+#ifdef __STRICT_ANSI__
+#define strdup(A) strcpy(calloc(strlen(A) + 1, sizeof(char)), A)
+#endif
+
+
+extern bool get_bool(char* value);
+extern char* build_string(char* format, ...);
+extern void print_stderr(char* message);
+extern char* colorize(char* message, int color);
+extern char* gettext(char* message);
+#define _(A) gettext(A)
+#define red 31
+
+static array *error_arr;
+
+void error(int status){
+    if(!error_arr){
+        error_arr = array_new();
+        return;
+    }
+    size_t i;
+    size_t len = 0;
+    char** errs = array_get(error_arr, &len);
+    if(len > 0 && !get_bool ("ignore-error")) {
+        printf("%ld\n", len);
+        for(i=0;i<len;i++){
+            if(errs[i] != NULL){
+                print_stderr(build_string("%s: %s", colorize(_ ("ERROR"), red), strdup(errs[i])));
+            }
+        }
+        if(!get_bool ("shellmode")){
+            exit(status);
+        }
+    }
+    array_unref(error_arr);
+    error_arr = array_new();
+}
+
+void error_add(char* message) {
+    if(!error_arr){
+        error_arr = array_new();
+    }
+    array_add(error_arr, message);
+}
+
+bool has_error(){
+    if(!error_arr){
+        error_arr = array_new();
+    }
+    return array_length(error_arr) > 0;
+}

src/include/error.h

@@ -0,0 +1,4 @@
+#include <stdbool.h>
+void error(int status);
+void error_add(char* message);
+bool has_error();

src/util/logger.vala

@@ -1,4 +1,3 @@
-private string[] errors;
 
 //DOC: ## logging functions
 
@@ -62,41 +61,3 @@ public void set_terminal_title (string msg) {
     #endif
 }
 
-//DOC: `void error (int status):`
-//DOC: print error message and exit if error message list not empty and status is not 0.
-//DOC: This function clear error message list.
-//DOC: This funtion must run after **error_add (string message)**
-//DOC: Example usage:
-//DOC: ```vala
-//DOC: if (num == 12) {
-//DOC:     error_add ("Number is not 12.");
-//DOC: }
-//DOC: error (1);
-//DOC: ```
-public void error (int status) {
-    if (has_error ()) {
-         if (!get_bool ("ignore-error")) {
-            foreach (string error in errors) {
-                print_stderr ("%s: %s".printf (colorize (_ ("ERROR"), red), error));
-            }
-        }
-        errors = null;
-        if (status != 0 && !get_bool ("shellmode")) {
-            exit (status);
-        }
-    }
-}
-public bool has_error () {
-    return errors.length != 0;
-}
-
-//DOC: `void error_add (string message):`
-//DOC: add error message to error message list
-public void error_add (string message) {
-    if (errors == null) {
-        errors = {};
-    }
-    if (message != null) {
-        errors += message;
-    }
-}