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

Timestamp:

2014-01-05T21:25:41Z (10 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

4aa2a27

Parents:

aacdb8e (diff), ca05e9b (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 cherrypicked kernel logger.

• Old klog sybsystem was renamed to kio
• Kernel and user-space log messages are stored in both logs (kernel logs end up in log/kernel file)

File:

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

uspace/lib/c/generic/assert.c

@@ -33 +33 @@
 #include <assert.h>
 #include <stdio.h>
-#include <io/klog.h>
+#include <io/kio.h>
 #include <stdlib.h>
 #include <atomic.h>
@@ -44 +44 @@
 {
         /*
-         * Send the message safely to klog. Nested asserts should not occur.
+         * Send the message safely to kio. Nested asserts should not occur.
          */
-        klog_printf("Assertion failed (%s) in file \"%s\", line %u.\n",
+        kio_printf("Assertion failed (%s) in file \"%s\", line %u.\n",
             cond, file, line);