Changes in uspace/lib/c/generic/dirent.c [8d2dd7f2:b7fd2a0] in mainline

File:

• uspace/lib/c/generic/dirent.c (modified) (3 diffs)

uspace/lib/c/generic/dirent.c

@@ -54 +54 @@
         }
         
-        int fd = vfs_lookup(dirname, WALK_DIRECTORY);
-        if (fd < 0) {
+        int fd;
+        errno_t 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);
@@ -82 +83 @@
 struct dirent *readdir(DIR *dirp)
 {
-        int rc;
+        errno_t rc;
         ssize_t len = 0;
         
@@ -113 +114 @@
 int closedir(DIR *dirp)
 {
-        int rc;
-        
-        rc = vfs_put(dirp->fd);
+        errno_t 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;
+        }
 }