Changeset ff381a7 in mainline for uspace/lib/c/generic/io/kio.c

Timestamp:

2015-11-02T20:54:19Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

d8513177

Parents:

3feeab2 (diff), 5265eea4 (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.

File:

• uspace/lib/c/generic/io/kio.c (modified) (4 diffs)

uspace/lib/c/generic/io/kio.c

@@ -43 +43 @@
 #include <io/printf_core.h>
 
-size_t kio_write(const void *buf, size_t size)
+int kio_write(const void *buf, size_t size, size_t *nwritten)
 {
-        ssize_t ret = (ssize_t) __SYSCALL3(SYS_KIO, KIO_WRITE, (sysarg_t) buf, size);
+        int rc = (int) __SYSCALL3(SYS_KIO, KIO_WRITE, (sysarg_t) buf, size);
         
-        if (ret >= 0)
-                return (size_t) ret;
-        
-        return 0;
+        if (rc == EOK)
+                *nwritten = size;
+        return rc;
 }
 
@@ -84 +83 @@
 static int kio_vprintf_str_write(const char *str, size_t size, void *data)
 {
-        size_t wr = kio_write(str, size);
+        size_t wr;
+        
+        wr = 0;
+        (void) kio_write(str, size, &wr);
         return str_nlength(str, wr);
 }
@@ -92 +94 @@
         size_t offset = 0;
         size_t chars = 0;
+        size_t wr;
         
         while (offset < size) {
@@ -98 +101 @@
                 
                 if (chr_encode(str[chars], buf, &sz, STR_BOUNDS(1)) == EOK)
-                        kio_write(buf, sz);
+                        kio_write(buf, sz, &wr);
                 
                 chars++;