Changeset 04803bf in mainline for uspace/lib/c/generic/io/klog.c

Timestamp:

2011-03-21T22:00:17Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

143932e3

Parents:

b50b5af2 (diff), 7308e84 (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 (needs fixes).

File:

• uspace/lib/c/generic/io/klog.c (moved) (moved from uspace/lib/libc/generic/io/klog.c ) (2 diffs)

uspace/lib/c/generic/io/klog.c

@@ -35 +35 @@
 
 #include <libc.h>
-#include <string.h>
+#include <str.h>
 #include <sys/types.h>
 #include <unistd.h>
@@ -42 +42 @@
 size_t klog_write(const void *buf, size_t size)
 {
-        return (size_t) __SYSCALL3(SYS_KLOG, 1, (sysarg_t) buf, size);
+        ssize_t ret = (ssize_t) __SYSCALL3(SYS_KLOG, 1, (sysarg_t) buf, size);
+        
+        if (ret >= 0)
+                return (size_t) ret;
+        
+        return 0;
 }
 
 void klog_update(void)
 {
-        (void) __SYSCALL3(SYS_KLOG, 1, NULL, 0);
+        (void) __SYSCALL3(SYS_KLOG, 1, (uintptr_t) NULL, 0);
 }