Changeset 132ab5d1 in mainline for uspace/lib/c/generic/io/klog.c

Timestamp:

2018-01-30T03:20:45Z (7 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

5a6cc679

Parents:

8bfb163 (diff), 6a5d05b (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 commit '6a5d05bd2551e64111bea4f9332dd7448c26ce84' into forwardport

Separate return value from error code in gen_irq_code*().

File:

• uspace/lib/c/generic/io/klog.c (modified) (1 diff)

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

@@ -42 +42 @@
 #include <abi/log.h>
 
-size_t klog_write(log_level_t lvl, const void *buf, size_t size)
+int klog_write(log_level_t lvl, const void *buf, size_t size)
 {
-        ssize_t ret = (ssize_t) __SYSCALL4(SYS_KLOG, KLOG_WRITE, (sysarg_t) buf,
+        return (int) __SYSCALL4(SYS_KLOG, KLOG_WRITE, (sysarg_t) buf,
             size, lvl);
-        
-        if (ret >= 0)
-                return (size_t) ret;
-        
-        return 0;
 }
 
-int klog_read(void *data, size_t size)
+int klog_read(void *data, size_t size, size_t *nread)
 {
-        return (int) __SYSCALL4(SYS_KLOG, KLOG_READ, (uintptr_t) data, size, 0);
+        return (int) __SYSCALL5(SYS_KLOG, KLOG_READ, (uintptr_t) data,
+            size, 0, (sysarg_t) nread);
 }