Changes in uspace/lib/c/generic/vfs/mtab.c [39330200:8d2dd7f2] in mainline

File:

• uspace/lib/c/generic/vfs/mtab.c (modified) (6 diffs)

uspace/lib/c/generic/vfs/mtab.c

@@ -40 +40 @@
 #include <errno.h>
 #include <assert.h>
-#include <str.h>
 
-static void process_mp(const char *path, vfs_stat_t *stat, list_t *mtab_list)
+static void process_mp(const char *path, struct stat *stat, list_t *mtab_list)
 {
         mtab_ent_t *ent;
@@ -54 +53 @@
         ent->service_id = stat->service_id;
 
-        vfs_statfs_t stfs;
+        struct statfs stfs;
         if (vfs_statfs_path(path, &stfs) == EOK)
                 str_cpy(ent->fs_name, sizeof(ent->fs_name), stfs.fs_name);
@@ -63 +62 @@
 }
 
-static errno_t vfs_get_mtab_visit(const char *path, list_t *mtab_list,
+static int vfs_get_mtab_visit(const char *path, list_t *mtab_list,
     fs_handle_t fs_handle, service_id_t service_id)
 {
@@ -75 +74 @@
         while ((dirent = readdir(dir)) != NULL) {
                 char *child;
-                vfs_stat_t st;
-                errno_t rc;
-                int ret;
+                struct stat st;
+                int rc;
 
-                ret = asprintf(&child, "%s/%s", path, dirent->d_name);
-                if (ret < 0) {
+                rc = asprintf(&child, "%s/%s", path, dirent->d_name);
+                if (rc < 0) {
                         closedir(dir);
-                        return ENOMEM;
+                        return rc;
                 }
 
@@ -96 +94 @@
 
                 rc = vfs_stat_path(child, &st);
-                if (rc != EOK) {
+                if (rc != 0) {
                         free(child);
                         closedir(dir);
@@ -121 +119 @@
 }
 
-errno_t vfs_get_mtab_list(list_t *mtab_list)
+int vfs_get_mtab_list(list_t *mtab_list)
 {
-        vfs_stat_t st;
+        struct stat st;
 
-        errno_t rc = vfs_stat_path("/", &st);
-        if (rc != EOK)
+        int rc = vfs_stat_path("/", &st);
+        if (rc != 0)
                 return rc;