Changeset 132ab5d1 in mainline for uspace/app/viewer/viewer.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/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);