Changeset 132ab5d1 in mainline for uspace/drv/bus/isa/isa.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/drv/bus/isa/isa.c (modified) (3 diffs)

uspace/drv/bus/isa/isa.c

@@ -49 +49 @@
 #include <ctype.h>
 #include <macros.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <dirent.h>
 #include <ipc/irc.h>
@@ -277 +277 @@
         int fd;
         size_t len;
-        ssize_t r;
+        int rc;
+        size_t nread;
         struct stat st;
 
-        fd = vfs_lookup_open(conf_path, WALK_REGULAR, MODE_READ);
-        if (fd < 0) {
+        rc = vfs_lookup_open(conf_path, WALK_REGULAR, MODE_READ, &fd);
+        if (rc != EOK) {
                 ddf_msg(LVL_ERROR, "Unable to open %s", conf_path);
                 goto cleanup;
@@ -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;