Changes in / [2bdf8313:eaeb056] in mainline

Location:

uspace/lib/c

Files:

• generic/assert.c (modified) (4 diffs)
• generic/malloc.c (modified) (1 diff)
• include/assert.h (modified) (3 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 "%u" MSG_END,
             cond, file, line);
         stacktrace_print();

uspace/lib/c/generic/malloc.c

@@ -194 +194 @@
                 if (!(expr)) {\
                         futex_up(&malloc_futex); \
-                        assert_abort(#expr, __FILE__, STR2(__LINE__)); \
+                        assert_abort(#expr, __FILE__, __LINE__); \
                 } \
         } while (0)

uspace/lib/c/include/assert.h

@@ -47 +47 @@
  */
 
-#define STR(l)  #l
-#define STR2(l) STR(l)
-
 #ifndef NDEBUG
 
@@ -55 +52 @@
         do { \
                 if (!(expr)) \
-                        assert_abort(#expr, __FILE__, STR2(__LINE__)); \
+                        assert_abort(#expr, __FILE__, __LINE__); \
         } while (0)
 
@@ -64 +61 @@
 #endif /* NDEBUG */
 
-extern void assert_abort(const char *, const char *, const char *)
+extern void assert_abort(const char *, const char *, unsigned int)
     __attribute__((noreturn));