From: Daniel Kouřil <kouril@ics.muni.cz>
Date: Mon, 12 Dec 2011 14:47:17 +0000 (+0000)
Subject: OK isn't an error
X-Git-Tag: merge_30_head_take2_after~10
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=4212803d0507eefa354ac9d718cb1d4b6f94e1fc;p=jra1mw.git

OK isn't an error
---

diff --git a/emi.canl.canl-c/src/canl_err.c b/emi.canl.canl-c/src/canl_err.c
index ce3c31c..2d13158 100644
--- a/emi.canl.canl-c/src/canl_err.c
+++ b/emi.canl.canl-c/src/canl_err.c
@@ -86,7 +86,7 @@ void reset_error (glb_ctx *cc, unsigned long err_code)
     if (cc->err_msg)
         free(cc->err_msg);
     cc->err_msg = NULL;
-    cc->err_code = EMI_Err_OK;
+    cc->err_code = 0;
     cc->err_orig = unknown_error;
 }
 
diff --git a/emi.canl.canl-c/src/canl_error_codes b/emi.canl.canl-c/src/canl_error_codes
index 3d6ac8d..179301e 100644
--- a/emi.canl.canl-c/src/canl_error_codes
+++ b/emi.canl.canl-c/src/canl_error_codes
@@ -1,7 +1,6 @@
 #
 # Additional codes MUST be added to the end only!
 #
-OK
 unknown
 unknownMsg
 inputError
diff --git a/emi.canl.canl-c/src/gen_err_codes.pl b/emi.canl.canl-c/src/gen_err_codes.pl
index 5f31679..7fafde2 100755
--- a/emi.canl.canl-c/src/gen_err_codes.pl
+++ b/emi.canl.canl-c/src/gen_err_codes.pl
@@ -2,16 +2,15 @@
 
 $err_name = "";
 
-print STDOUT qq (
-/* Automatically generated file. Don't edit. */
+print STDOUT qq (/*
+ * Automatically generated file. Don't edit.
+ */
 
 typedef enum _CANL_ERROR {);
 
 while (<STDIN>) {
     chomp;
-
     next if /^\s*#/;
-
     printf ("\n    EMI_Err_%s,", $_);
 }