Changes in uspace/lib/c/generic/assert.c [13f2461:d8de5d3] in mainline

File:

• uspace/lib/c/generic/assert.c (modified) (2 diffs)

uspace/lib/c/generic/assert.c

@@ -37 +37 @@
 #include <atomic.h>
 #include <stacktrace.h>
+#include <stdint.h>
 
-#define MSG_START       "Assertion failed ("
-#define MSG_FILE        ") in file \""
-#define MSG_LINE        "\", line "
-#define MSG_END         ".\n"
+static atomic_t failed_asserts = {0};
 
-static atomic_t failed_asserts;
-
-void assert_abort(const char *cond, const char *file, const char *line)
+void assert_abort(const char *cond, const char *file, unsigned int line)
 {
         /*
          * Send the message safely to klog. Nested asserts should not occur.
          */
-        klog_write(MSG_START, str_size(MSG_START));
-        klog_write(cond, str_size(cond));
-        klog_write(MSG_FILE, str_size(MSG_FILE));
-        klog_write(file, str_size(file));
-        klog_write(MSG_LINE, str_size(MSG_LINE));
-        klog_write(line, str_size(line));
-        klog_write(MSG_END, str_size(MSG_END));
-
+        klog_printf("Assertion failed (%s) in file \"%s\", line %u.\n",
+            cond, file, line);
+        
         /*
          * Check if this is a nested or parallel assert.
@@ -69 +60 @@
          * assertions.
          */
-        printf(MSG_START "%s" MSG_FILE "%s" MSG_LINE "%s" MSG_END,
+        printf("Assertion failed (%s) in file \"%s\", line %u.\n",
             cond, file, line);
         stacktrace_print();
-
+        
         abort();
 }