Changeset 2b3dd78 in mainline for uspace/app/df/df.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/app/df/df.c (modified) (3 diffs)

uspace/app/df/df.c

@@ -58 +58 @@
 static errno_t size_to_human_readable(uint64_t, size_t, char **);
 static void print_header(void);
-static errno_t print_statfs(struct statfs *, char *, char *);
+static errno_t print_statfs(vfs_statfs_t *, char *, char *);
 static void print_usage(void);
 
@@ -64 +64 @@
 {
         int optres, errflg = 0;
-        struct statfs st;
+        vfs_statfs_t st;
         errno_t rc;
 
@@ -147 +147 @@
 }
 
-static errno_t print_statfs(struct statfs *st, char *name, char *mountpoint)
+static errno_t print_statfs(vfs_statfs_t *st, char *name, char *mountpoint)
 {
         uint64_t const used_blocks = st->f_blocks - st->f_bfree;