Changeset 8e3498b in mainline for uspace/drv/bus/isa

Timestamp:

2017-12-04T18:44:24Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

bde5c04

Parents:

40feeac

Message:

vfs_read/write() should return error code separately from number of bytes transferred.

File:

• uspace/drv/bus/isa/isa.c (modified) (2 diffs)

uspace/drv/bus/isa/isa.c

@@ -277 +277 @@
         int fd;
         size_t len;
-        ssize_t r;
+        int rc;
+        size_t nread;
         struct stat st;
 
@@ -306 +307 @@
         }
 
-        r = vfs_read(fd, (aoff64_t []) {0}, buf, len);
-        if (r < 0) {
+        rc = vfs_read(fd, (aoff64_t []) {0}, buf, len, &nread);
+        if (rc != EOK) {
                 ddf_msg(LVL_ERROR, "Unable to read file '%s'.", conf_path);
                 goto cleanup;
         }
 
-        buf[len] = 0;
+        buf[nread] = 0;
 
         suc = true;