Changeset ff381a7 in mainline for uspace/lib/bithenge/src/file.c

Timestamp:

2015-11-02T20:54:19Z (10 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/lib/bithenge/src/file.c (modified) (2 diffs)

uspace/lib/bithenge/src/file.c

@@ -114 +114 @@
         struct stat stat;
         int rc = fstat(fd, &stat);
-        if (rc != EOK) {
+        if (rc != 0) {
                 if (needs_close)
                         close(fd);
@@ -157 +157 @@
         int fd = open(filename, O_RDONLY);
         if (fd < 0)
-                return fd;
+                return errno;
 
         return new_file_blob(out, fd, true);