Changeset 84876aa4 in mainline for uspace/app/df/df.c

Timestamp:

2019-11-15T13:46:34Z (4 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

ecb7828

Parents:

b093a62 (diff), d548fc0 (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 master into gfx

Mainly to get XCW fixes

File:

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

uspace/app/df/df.c

@@ -35 +35 @@
  */
 
-#include <cap.h>
+#include <capa.h>
 #include <stdbool.h>
 #include <stdio.h>
@@ -124 +124 @@
 static errno_t size_to_human_readable(uint64_t nblocks, size_t block_size, char **rptr)
 {
-        cap_spec_t cap;
-
-        cap_from_blocks(nblocks, block_size, &cap);
-        cap_simplify(&cap);
-        return cap_format(&cap, rptr);
+        capa_spec_t capa;
+
+        capa_from_blocks(nblocks, block_size, &capa);
+        capa_simplify(&capa);
+        return capa_format(&capa, rptr);
 }