Changeset c24b0dcb in mainline for uspace/app/bdsh/cmds/modules/ls/ls.c

Timestamp:

2019-09-30T16:38:33Z (5 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

8f57fb2

Parents:

ef0a3375

git-author:

Jakub Jermar <jakub@…> (2019-09-30 16:34:10)

git-committer:

Jakub Jermar <jakub@…> (2019-09-30 16:38:33)

Message:

Rename capacity-related 'cap' to 'capa'

This allows to use 'cap' for capabilities.

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;