Changes in uspace/app/viewer/viewer.c [c23275a:f77c1c9] in mainline

File:

• uspace/app/viewer/viewer.c (modified) (3 diffs)

uspace/app/viewer/viewer.c

@@ -37 +37 @@
 #include <vfs/vfs.h>
 #include <errno.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <stdbool.h>
 #include <window.h>
@@ -109 +109 @@
 static bool img_load(const char *fname, surface_t **p_local_surface)
 {
-        int fd = vfs_lookup_open(fname, WALK_REGULAR, MODE_READ);
-        if (fd < 0)
+        int fd;
+        int rc = vfs_lookup_open(fname, WALK_REGULAR, MODE_READ, &fd);
+        if (rc != EOK)
                 return false;
         
         struct stat stat;
-        int rc = vfs_stat(fd, &stat);
+        rc = vfs_stat(fd, &stat);
         if (rc != EOK) {
                 vfs_put(fd);
@@ -126 +127 @@
         }
 
-        ssize_t rd = vfs_read(fd, (aoff64_t []) {0}, tga, stat.size);
-        if ((rd < 0) || (rd != (ssize_t) stat.size)) {
+        size_t nread;
+        rc = vfs_read(fd, (aoff64_t []) {0}, tga, stat.size, &nread);
+        if (rc != EOK || nread != stat.size) {
                 free(tga);
                 vfs_put(fd);