Changes in kernel/generic/src/log/log.c [e367939c:b7fd2a0] in mainline

File:

• kernel/generic/src/log/log.c (modified) (6 diffs)

kernel/generic/src/log/log.c

@@ -221 +221 @@
                 
                 size_t buffer_offset = 0;
-                int rc = chr_encode(wstr[chars], buffer, &buffer_offset, 16);
+                errno_t rc = chr_encode(wstr[chars], buffer, &buffer_offset, 16);
                 if (rc != EOK) {
-                        return rc;
+                        return EOF;
                 }
                 
@@ -293 +293 @@
  *
  */
-sysarg_t sys_klog(sysarg_t operation, void *buf, size_t size,
-    sysarg_t level)
+sys_errno_t sys_klog(sysarg_t operation, void *buf, size_t size,
+    sysarg_t level, size_t *uspace_nread)
 {
         char *data;
-        int rc;
+        errno_t rc;
         
         if (size > PAGE_SIZE)
-                return (sysarg_t) ELIMIT;
+                return (sys_errno_t) ELIMIT;
         
         switch (operation) {
@@ -306 +306 @@
                         data = (char *) malloc(size + 1, 0);
                         if (!data)
-                                return (sysarg_t) ENOMEM;
+                                return (sys_errno_t) ENOMEM;
                         
                         rc = copy_from_uspace(data, buf, size);
                         if (rc) {
                                 free(data);
-                                return (sysarg_t) rc;
+                                return (sys_errno_t) rc;
                         }
                         data[size] = 0;
@@ -325 +325 @@
                         data = (char *) malloc(size, 0);
                         if (!data)
-                                return (sysarg_t) ENOMEM;
+                                return (sys_errno_t) ENOMEM;
                         
                         size_t entry_len = 0;
@@ -366 +366 @@
                         if (rc != EOK) {
                                 free(data);
-                                return (sysarg_t) rc;
+                                return (sys_errno_t) rc;
                         }
                         
@@ -374 +374 @@
                         
                         if (rc != EOK)
-                                return (sysarg_t) rc;
-                        
-                        return copied;
+                                return (sys_errno_t) rc;
+                        
+                        return copy_to_uspace(uspace_nread, &copied, sizeof(copied));
+                        return EOK;
                 default:
-                        return (sysarg_t) ENOTSUP;
+                        return (sys_errno_t) ENOTSUP;
         }
 }