Working on timestamps

include/akerror.tmpl.h

@@ -55,7 +55,6 @@ typedef struct
     bool reported;
     char stacktracebuf[AKERR_MAX_ERROR_STACKTRACE_BUF_LENGTH];
     char *stacktracebufptr;
-    int stacktracebufremaining;
 } akerr_ErrorContext;
 
 #define AKERR_NOIGNORE __attribute__((warn_unused_result))
@@ -67,8 +66,9 @@ extern akerr_ErrorContext AKERR_ARRAY_ERROR[AKERR_MAX_ARRAY_ERROR];
 extern akerr_ErrorUnhandledErrorHandler akerr_handler_unhandled_error;
 extern akerr_ErrorLogFunction akerr_log_method;
 extern akerr_ErrorContext *__akerr_last_ignored;
+extern akerr_ErrorContext *__akerr_last_prepared;
+extern int __akerr_last_attempt_id;
 
-akerr_ErrorContext AKERR_NOIGNORE *akerr_user_main(int argc, char **argv);
 akerr_ErrorContext AKERR_NOIGNORE *akerr_release_error(akerr_ErrorContext *ptr);
 akerr_ErrorContext AKERR_NOIGNORE *akerr_next_error();
 char *akerr_name_for_status(int status, char *name);
@@ -226,9 +226,12 @@ void akerr_init_errno(void);
     };									\
     };									\
     if ( __err_context != NULL ) {					\
-	if ( __err_context->handled == false && __pass_up == true ) {	\
         __err_context->stacktracebufptr += snprintf(__err_context->stacktracebufptr, AKERR_MAX_ERROR_STACKTRACE_BUF_LENGTH, "%s:%s:%d\n", (char *)__FILE__, (char *)__func__, __LINE__); \
+	if ( __err_context->handled == false && __pass_up == true && __err_context->arrayid > 0 ) {	\
 	    return __err_context;					\
+	} else if ( __err_context->handled == false ) {                 \
+	    LOG_ERROR_WITH_MESSAGE(__err_context, "Unhandled Error");	\
+	    akerr_handler_unhandled_error(__err_context);		\
         }                                                               \
     }									\
     RELEASE_ERROR(__err_context);

src/error.c

@@ -14,28 +14,6 @@ char __AKERR_ERROR_NAMES[AKERR_MAX_ERR_VALUE+1][AKERR_MAX_ERROR_NAME_LENGTH];
 
 akerr_ErrorContext AKERR_ARRAY_ERROR[AKERR_MAX_ARRAY_ERROR];
 
-int main(int argc, char **argv)
-{
-    int i = 0;
-    PREPARE_ERROR(e);
-    ATTEMPT {
-	CATCH(e, akerr_user_main(argc, argv));
-	if ( e == NULL || e->status == 0 ) {
-	    /* User code claims everything went fine, doublecheck the error array before we quit */
-	    for ( i = AKERR_MAX_ARRAY_ERROR - 1; i >= 0; i-- ) {
-		if ( AKERR_ARRAY_ERROR[i].status != 0 && AKERR_ARRAY_ERROR[i].refcount != 0 ) {
-		    akerr_log_method("%s:%s:%d: Found unhandled and unreported error in the array at index %d\n", __FILE__, (char *)__func__, __LINE__, i);
-		    e = &AKERR_ARRAY_ERROR[i];
-		}
-	    }
-	}
-    } CLEANUP {
-    } PROCESS(e) {
-    } FINISH_NORETURN(e);
-    SUCCEED(e);
-    return 0;
-}
-
 void akerr_default_logger(const char *fmt, ...)
 {
 #if defined(AKERR_USE_STDLIB) && AKERR_USE_STDLIB == 1

tests/err_catch.c

@@ -23,7 +23,7 @@ akerr_ErrorContext *func1(void)
 }
 
 
-akerr_ErrorContext *akerr_user_main(int argc, char **argv)
+int main(void)
 {
     PREPARE_ERROR(errctx);
     ATTEMPT {
@@ -32,6 +32,5 @@ akerr_ErrorContext *akerr_user_main(int argc, char **argv)
     } PROCESS(errctx) {
     } HANDLE(errctx, AKERR_NULLPOINTER) {
       akerr_log_method("Caught exception");
-    } FINISH(errctx, true);
+    } FINISH_NORETURN(errctx);
-    SUCCEED(errctx);
 }

tests/err_cleanup.c

@@ -25,7 +25,7 @@ akerr_ErrorContext *func1(void)
     SUCCEED_RETURN(errctx);
 }
 
-akerr_ErrorContext *akerr_user_main(int argc, char **argv)
+int main(void)
 {
     x = 12345;
     PREPARE_ERROR(errctx);
@@ -35,8 +35,9 @@ akerr_ErrorContext *akerr_user_main(int argc, char **argv)
     } PROCESS(errctx) {
     } HANDLE(errctx, AKERR_NULLPOINTER) {
 	if ( x == 0 ) {
-	    FAIL_RETURN(errctx, AKERR_API, "Cleanup does not work");	    
+	    fprintf(stderr, "Cleanup works\n");
+	    return 0;
 	}
-    } FINISH(errctx, true);
+	return 1;
-    SUCCEED(errctx);
+    } FINISH_NORETURN(errctx);
 }

tests/err_trace.c

@@ -23,13 +23,12 @@ akerr_ErrorContext *func1(void)
 }
 
 
-akerr_ErrorContext *akerr_user_main(int argc, char **argv)
+int main(void)
 {
     PREPARE_ERROR(errctx);
     ATTEMPT {
 	CATCH(errctx, func1());
     } CLEANUP {
     } PROCESS(errctx) {
-    } FINISH(errctx, true);
+    } FINISH_NORETURN(errctx);
-    SUCCEED(errctx);
 }