Changeset e06e2716 in mainline for uspace/lib/c/generic/assert.c

Timestamp:

2011-05-22T19:17:56Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

9ea8fdb4

Parents:

13f2461

Message:

Passing stringified LINE does not conserve space very well,
pass it as integer again.

File:

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

uspace/lib/c/generic/assert.c

@@ -37 +37 @@
 #include <atomic.h>
 #include <stacktrace.h>
+#include <stdint.h>
 
 #define MSG_START       "Assertion failed ("
@@ -45 +46 @@
 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)
 {
+        char lstr[11];
+        char *pd = &lstr[10];
+        uint32_t ln = (uint32_t) line;
+
+        /*
+         * Convert ln to a zero-terminated string.
+         */
+        *pd-- = 0;
+        for (; ln; ln /= 10)
+                *pd-- = '0' + ln % 10;
+        pd++;
+
         /*
          * Send the message safely to klog. Nested asserts should not occur.
@@ -55 +68 @@
         klog_write(file, str_size(file));
         klog_write(MSG_LINE, str_size(MSG_LINE));
-        klog_write(line, str_size(line));
+        klog_write(pd, str_size(pd));
         klog_write(MSG_END, str_size(MSG_END));
 
@@ -69 +82 @@
          * assertions.
          */
-        printf(MSG_START "%s" MSG_FILE "%s" MSG_LINE "%s" MSG_END,
+        printf(MSG_START "%s" MSG_FILE "%s" MSG_LINE "%" PRIu32 MSG_END,
             cond, file, line);
         stacktrace_print();