Changeset 132ab5d1 in mainline for uspace/srv/klog/klog.c

Timestamp:

2018-01-30T03:20:45Z (8 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/srv/klog/klog.c (modified) (3 diffs)

uspace/srv/klog/klog.c

@@ -44 +44 @@
 #include <io/klog.h>
 #include <sysinfo.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <fibril_synch.h>
 #include <adt/list.h>
@@ -100 +100 @@
 static void producer(void)
 {
-        int read = klog_read(buffer, BUFFER_SIZE);
-        
-        if (read < 0) {
-                log_msg(LOG_DEFAULT, LVL_ERROR, "klog_read failed, rc = %d",
-                    read);
+        size_t len = 0;
+        int rc = klog_read(buffer, BUFFER_SIZE, &len);
+        if (rc != EOK) {
+                log_msg(LOG_DEFAULT, LVL_ERROR, "klog_read failed, rc = %s",
+                    str_error_name(rc));
                 return;
         }
         
-        size_t len = read;
         size_t offset = 0;
         while (offset < len) {
@@ -189 +188 @@
  * Receives kernel klog notifications.
  *
- * @param callid IPC call ID
  * @param call   IPC call structure
  * @param arg    Local argument
  *
  */
-static void klog_notification_received(ipc_callid_t callid, ipc_call_t *call,
-    void *arg)
+static void klog_notification_received(ipc_call_t *call, void *arg)
 {
         /*