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

uspace/lib/c/generic/dirent.c

@@ -54 +54 @@
         }
         
-        int fd = vfs_lookup(dirname, WALK_DIRECTORY);
-        if (fd < 0) {
+        int fd;
+        int rc = vfs_lookup(dirname, WALK_DIRECTORY, &fd);
+        if (rc != EOK) {
                 free(dirp);
-                errno = fd;
+                errno = rc;
                 return NULL;
         }
         
-        int rc = vfs_open(fd, MODE_READ);
-        if (rc < 0) {
+        rc = vfs_open(fd, MODE_READ);
+        if (rc != EOK) {
                 free(dirp);
                 vfs_put(fd);
@@ -113 +114 @@
 int closedir(DIR *dirp)
 {
-        int rc;
-        
-        rc = vfs_put(dirp->fd);
+        int rc = vfs_put(dirp->fd);
         free(dirp);
 
-        /* On error errno was set by close() */
-        return rc;
+        if (rc == EOK) {
+                return 0;
+        } else {
+                errno = rc;
+                return -1;
+        }
 }