Changeset c24b0dcb in mainline for uspace/app/sysinst/sysinst.c

Timestamp:

2019-09-30T16:38:33Z (6 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/sysinst/sysinst.c (modified) (4 diffs)

uspace/app/sysinst/sysinst.c

@@ -38 +38 @@
 #include <block.h>
 #include <byteorder.h>
-#include <cap.h>
+#include <capa.h>
 #include <errno.h>
 #include <fdisk.h>
@@ -98 +98 @@
         fdisk_part_spec_t pspec;
         fdisk_part_info_t pinfo;
-        cap_spec_t cap;
+        capa_spec_t capa;
         service_id_t sid;
         errno_t rc;
@@ -137 +137 @@
         printf("sysinst_label_dev(): create partition\n");
 
-        rc = fdisk_part_get_max_avail(fdev, spc_pri, &cap);
+        rc = fdisk_part_get_max_avail(fdev, spc_pri, &capa);
         if (rc != EOK) {
                 printf("Error getting available capacity: %s.\n", str_error(rc));
@@ -144 +144 @@
 
         fdisk_pspec_init(&pspec);
-        pspec.capacity = cap;
+        pspec.capacity = capa;
         pspec.pkind = lpk_primary;
         pspec.fstype = fs_ext4; /* Cannot be changed without modifying core.img */