Changes in uspace/drv/bus/isa/isa.c [f77c1c9:b446b02] in mainline

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 <stdlib.h>
+#include <malloc.h>
 #include <dirent.h>
 #include <ipc/irc.h>
@@ -277 +277 @@
         int fd;
         size_t len;
-        int rc;
-        size_t nread;
+        ssize_t r;
         struct stat st;
 
-        rc = vfs_lookup_open(conf_path, WALK_REGULAR, MODE_READ, &fd);
-        if (rc != EOK) {
+        fd = vfs_lookup_open(conf_path, WALK_REGULAR, MODE_READ);
+        if (fd < 0) {
                 ddf_msg(LVL_ERROR, "Unable to open %s", conf_path);
                 goto cleanup;
@@ -307 +306 @@
         }
 
-        rc = vfs_read(fd, (aoff64_t []) {0}, buf, len, &nread);
-        if (rc != EOK) {
+        r = vfs_read(fd, (aoff64_t []) {0}, buf, len);
+        if (r < 0) {
                 ddf_msg(LVL_ERROR, "Unable to read file '%s'.", conf_path);
                 goto cleanup;
         }
 
-        buf[nread] = 0;
+        buf[len] = 0;
 
         suc = true;