Changeset 2b3dd78 in mainline for uspace/lib/c/generic/vfs/mtab.c

Timestamp:

2018-01-31T12:02:00Z (7 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

5595841

Parents:

a0a9cc2 (diff), 14d789c (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 remote-tracking branch 'upstream/master' into forwardport

change tmon includes because of new stdlib

File:

• uspace/lib/c/generic/vfs/mtab.c (modified) (4 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, struct stat *stat, list_t *mtab_list)
+static void process_mp(const char *path, vfs_stat_t *stat, list_t *mtab_list)
 {
         mtab_ent_t *ent;
@@ -53 +54 @@
         ent->service_id = stat->service_id;
 
-        struct statfs stfs;
+        vfs_statfs_t stfs;
         if (vfs_statfs_path(path, &stfs) == EOK)
                 str_cpy(ent->fs_name, sizeof(ent->fs_name), stfs.fs_name);
@@ -74 +75 @@
         while ((dirent = readdir(dir)) != NULL) {
                 char *child;
-                struct stat st;
+                vfs_stat_t st;
                 errno_t rc;
                 int ret;
@@ -122 +123 @@
 errno_t vfs_get_mtab_list(list_t *mtab_list)
 {
-        struct stat st;
+        vfs_stat_t st;
 
         errno_t rc = vfs_stat_path("/", &st);