Changeset ff381a7 in mainline for uspace/app/viewer/viewer.c

Timestamp:

2015-11-02T20:54:19Z (9 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

d8513177

Parents:

3feeab2 (diff), 5265eea4 (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 mainline changes.

File:

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

uspace/app/viewer/viewer.c

@@ -98 +98 @@
 {
         int fd = open(fname, O_RDONLY);
-        if (fd < 0)
+        if (fd != 0)
                 return false;
         
         struct stat stat;
         int rc = fstat(fd, &stat);
-        if (rc != EOK) {
+        if (rc != 0) {
                 close(fd);
                 return false;
@@ -114 +114 @@
         }
         
-        ssize_t rd = read_all(fd, tga, stat.size);
+        ssize_t rd = read(fd, tga, stat.size);
         if ((rd < 0) || (rd != (ssize_t) stat.size)) {
                 free(tga);