Changeset 3375bd4 in mainline for uspace/lib/c/include/assert.h

Timestamp:

2011-05-17T07:44:17Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

04c418d, 2586860, 5e6e50b

Parents:

72cd53d (diff), 0d8a304 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

Conflicts:
kernel/generic/src/console/console.c

size of klog, taken upstream

uspace/app/klog/klog.c

taken upstream (upstream fixed the broken output on huge load)

uspace/app/tester/Makefile
uspace/app/tester/tester.c
uspace/app/tester/tester.h

merged without problems

uspace/lib/c/include/as.h

merged without problems (upstream use bare declarations)

Also needed to fix some missing includes.

File:

• uspace/lib/c/include/assert.h (modified) (3 diffs)

uspace/lib/c/include/assert.h

@@ -40 +40 @@
  *
  * If NDEBUG is not set, the assert() macro
- * evaluates expr and if it is false prints 
+ * evaluates expr and if it is false prints
  * error message and terminate program.
  *
@@ -47 +47 @@
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-
 #ifndef NDEBUG
 
 #define assert(expr) \
         do { \
-                if (!(expr)) { \
-                        printf("Assertion failed (%s) at file '%s', " \
-                            "line %d.\n", #expr, __FILE__, __LINE__); \
-                        abort(); \
-                } \
+                if (!(expr)) \
+                        assert_abort(#expr, __FILE__, __LINE__); \
         } while (0)
 
@@ -67 +61 @@
 #endif /* NDEBUG */
 
+extern void assert_abort(const char *, const char *, unsigned int)
+    __attribute__((noreturn));
+
 #endif