Changeset e28175d in mainline for uspace/app/df/df.c

Timestamp:

2020-03-15T10:44:02Z (6 years ago)

Author:

GitHub <noreply@…>

Parents:

b401b33 (diff), 44dde42 (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.

git-author:

heiducteam <tristanided@…> (2020-03-15 10:44:02)

git-committer:

GitHub <noreply@…> (2020-03-15 10:44:02)

Message:

Merge pull request #1 from HelenOS/master

sync

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);
 }