Changeset 132ab5d1 in mainline for uspace/lib/bithenge/src/file.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/lib/bithenge/src/file.c (modified) (2 diffs)

uspace/lib/bithenge/src/file.c

@@ -77 +77 @@
                 return ELIMIT;
 
-        ssize_t amount_read = vfs_read(blob->fd, &offset, buffer, *size);
-        if (amount_read < 0)
+        size_t amount_read;
+        int rc = vfs_read(blob->fd, &offset, buffer, *size, &amount_read);
+        if (rc != EOK)
                 return errno;
         *size += amount_read;
@@ -144 +145 @@
         assert(filename);
 
-        int fd = vfs_lookup_open(filename, WALK_REGULAR, MODE_READ);
-        if (fd < 0)
-                return errno;
+        int fd;
+        int rc = vfs_lookup_open(filename, WALK_REGULAR, MODE_READ, &fd);
+        if (rc != EOK)
+                return rc;
 
         return new_file_blob(out, fd, true);