Changeset 5a6cc679 in mainline for uspace/app/df/df.c

Timestamp:

2018-01-31T02:21:24Z (7 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

a0a9cc2

Parents:

132ab5d1

Message:

Merge commit '50f19b7ee8e94570b5c63896736c4eb49cfa18db' into forwardport

Not all ints are converted to errno_t in xhci tree yet, however it compiles and works

File:

• uspace/app/df/df.c (modified) (4 diffs)

uspace/app/df/df.c

@@ -56 +56 @@
 static bool display_blocks;
 
-static int size_to_human_readable(uint64_t, size_t, char **);
+static errno_t size_to_human_readable(uint64_t, size_t, char **);
 static void print_header(void);
-static int print_statfs(struct statfs *, char *, char *);
+static errno_t print_statfs(struct statfs *, char *, char *);
 static void print_usage(void);
 
@@ -65 +65 @@
         int optres, errflg = 0;
         struct statfs st;
-        int rc;
+        errno_t rc;
 
         display_blocks = false;
@@ -128 +128 @@
 }
 
-static int size_to_human_readable(uint64_t nblocks, size_t block_size, char **rptr)
+static errno_t size_to_human_readable(uint64_t nblocks, size_t block_size, char **rptr)
 {
         cap_spec_t cap;
@@ -147 +147 @@
 }
 
-static int print_statfs(struct statfs *st, char *name, char *mountpoint)
+static errno_t print_statfs(struct statfs *st, char *name, char *mountpoint)
 {
         uint64_t const used_blocks = st->f_blocks - st->f_bfree;
         unsigned const perc_used = PERCENTAGE(used_blocks, st->f_blocks);
         char *str;
-        int rc;
+        errno_t rc;
 
         printf("%10s", name);