Changeset 84876aa4 in mainline for uspace/app/bdsh/cmds/modules/ls/ls.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/bdsh/cmds/modules/ls/ls.c (modified) (2 diffs)

uspace/app/bdsh/cmds/modules/ls/ls.c

@@ -42 +42 @@
 #include <vfs/vfs.h>
 #include <str.h>
-#include <cap.h>
+#include <capa.h>
 
 #include "ls.h"
@@ -106 +106 @@
                 }
 
-                cap_spec_t cap;
-                cap_from_blocks(de->s.size, 1, &cap);
-                cap_simplify(&cap);
+                capa_spec_t capa;
+                capa_from_blocks(de->s.size, 1, &capa);
+                capa_simplify(&capa);
 
                 char *rptr;
-                errno_t rc = cap_format(&cap, &rptr);
+                errno_t rc = capa_format(&capa, &rptr);
                 if (rc != EOK) {
                         return rc;