Changeset c24b0dcb in mainline for uspace/app/fdisk/fdisk.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/fdisk/fdisk.c (modified) (37 diffs)

uspace/app/fdisk/fdisk.c

@@ -34 +34 @@
  */
 
-#include <cap.h>
+#include <capa.h>
 #include <errno.h>
 #include <fdisk.h>
@@ -136 +136 @@
         nchoice_t *choice = NULL;
         char *svcname = NULL;
-        cap_spec_t cap;
+        capa_spec_t capa;
         fdisk_dev_info_t *sdev;
-        char *scap = NULL;
+        char *scapa = NULL;
         char *dtext = NULL;
         service_id_t svcid;
@@ -177 +177 @@
                 }
 
-                rc = fdisk_dev_info_capacity(info, &cap);
+                rc = fdisk_dev_info_capacity(info, &capa);
                 if (rc != EOK) {
                         printf("Error getting device capacity "
@@ -185 +185 @@
                 }
 
-                cap_simplify(&cap);
-
-                rc = cap_format(&cap, &scap);
+                capa_simplify(&capa);
+
+                rc = capa_format(&capa, &scapa);
                 if (rc != EOK) {
                         assert(rc == ENOMEM);
@@ -194 +194 @@
                 }
 
-                int ret = asprintf(&dtext, "%s (%s)", svcname, scap);
+                int ret = asprintf(&dtext, "%s (%s)", svcname, scapa);
                 if (ret < 0) {
                         rc = ENOMEM;
@@ -203 +203 @@
                 free(svcname);
                 svcname = NULL;
-                free(scap);
-                scap = NULL;
+                free(scapa);
+                scapa = NULL;
 
                 rc = nchoice_add(choice, dtext, info, 0);
@@ -261 +261 @@
         free(dtext);
         free(svcname);
-        free(scap);
+        free(scapa);
         return rc;
 }
@@ -432 +432 @@
         errno_t rc;
         fdisk_part_spec_t pspec;
-        cap_spec_t cap;
-        cap_spec_t mcap;
+        capa_spec_t capa;
+        capa_spec_t mcapa;
         vol_label_supp_t vlsupp;
         vol_fstype_t fstype = 0;
         tinput_t *tinput = NULL;
         fdisk_spc_t spc;
-        char *scap;
-        char *smcap = NULL;
+        char *scapa;
+        char *smcapa = NULL;
         char *label = NULL;
         char *mountp = NULL;
@@ -448 +448 @@
                 spc = spc_pri;
 
-        rc = fdisk_part_get_max_avail(dev, spc, &mcap);
+        rc = fdisk_part_get_max_avail(dev, spc, &mcapa);
         if (rc != EOK) {
                 rc = EIO;
@@ -454 +454 @@
         }
 
-        cap_simplify(&mcap);
-
-        rc = cap_format(&mcap, &smcap);
+        capa_simplify(&mcapa);
+
+        rc = capa_format(&mcapa, &smcapa);
         if (rc != EOK) {
                 rc = ENOMEM;
@@ -474 +474 @@
         while (true) {
                 printf("Enter capacity of new partition.\n");
-                rc = tinput_read_i(tinput, smcap, &scap);
+                rc = tinput_read_i(tinput, smcapa, &scapa);
                 if (rc != EOK)
                         goto error;
 
-                rc = cap_parse(scap, &cap);
+                rc = capa_parse(scapa, &capa);
                 if (rc == EOK)
                         break;
@@ -485 +485 @@
         tinput_destroy(tinput);
         tinput = NULL;
-        free(smcap);
-        smcap = NULL;
+        free(smcapa);
+        smcapa = NULL;
 
         if (pkind != lpk_extended) {
@@ -545 +545 @@
 
         fdisk_pspec_init(&pspec);
-        pspec.capacity = cap;
+        pspec.capacity = capa;
         pspec.pkind = pkind;
         pspec.fstype = fstype;
@@ -561 +561 @@
         return EOK;
 error:
-        free(smcap);
+        free(smcapa);
         free(label);
         free(mountp);
@@ -581 +581 @@
         fdisk_part_t *part;
         fdisk_part_info_t pinfo;
-        char *scap = NULL;
+        char *scapa = NULL;
         char *spkind = NULL;
         char *sfstype = NULL;
@@ -596 +596 @@
                 }
 
-                cap_simplify(&pinfo.capacity);
-
-                rc = cap_format(&pinfo.capacity, &scap);
+                capa_simplify(&pinfo.capacity);
+
+                rc = capa_format(&pinfo.capacity, &scapa);
                 if (rc != EOK) {
                         printf("Out of memory.\n");
@@ -623 +623 @@
 
                         int ret = asprintf(&sdesc, "%s %s, %s, %s", label,
-                            scap, spkind, sfstype);
+                            scapa, spkind, sfstype);
                         if (ret < 0) {
                                 rc = ENOMEM;
@@ -630 +630 @@
 
                 } else {
-                        int ret = asprintf(&sdesc, "%s, %s", scap, spkind);
+                        int ret = asprintf(&sdesc, "%s, %s", scapa, spkind);
                         if (ret < 0) {
                                 rc = ENOMEM;
@@ -644 +644 @@
                 }
 
-                free(scap);
-                scap = NULL;
+                free(scapa);
+                scapa = NULL;
                 free(spkind);
                 spkind = NULL;
@@ -658 +658 @@
         return EOK;
 error:
-        free(scap);
+        free(scapa);
         free(spkind);
         free(sfstype);
@@ -907 +907 @@
         fdisk_part_t *part;
         fdisk_part_info_t pinfo;
-        cap_spec_t cap;
-        cap_spec_t mcap;
+        capa_spec_t capa;
+        capa_spec_t mcapa;
         fdisk_dev_flags_t dflags;
         char *sltype = NULL;
-        char *sdcap = NULL;
-        char *scap = NULL;
-        char *smcap = NULL;
+        char *sdcapa = NULL;
+        char *scapa = NULL;
+        char *smcapa = NULL;
         char *sfstype = NULL;
         char *svcname = NULL;
@@ -936 +936 @@
         }
 
-        rc = fdisk_dev_capacity(dev, &cap);
+        rc = fdisk_dev_capacity(dev, &capa);
         if (rc != EOK) {
                 printf("Error getting device capacity.\n");
@@ -942 +942 @@
         }
 
-        cap_simplify(&cap);
-
-        rc = cap_format(&cap, &sdcap);
+        capa_simplify(&capa);
+
+        rc = capa_format(&capa, &sdcapa);
         if (rc != EOK) {
                 printf("Out of memory.\n");
@@ -958 +958 @@
         fdisk_dev_get_flags(dev, &dflags);
 
-        printf("Device: %s (%s)\n", svcname, sdcap);
-        free(sdcap);
-        sdcap = NULL;
+        printf("Device: %s (%s)\n", svcname, sdcapa);
+        free(sdcapa);
+        sdcapa = NULL;
 
         rc = fdisk_label_get_info(dev, &linfo);
@@ -996 +996 @@
                 }
 
-                cap_simplify(&pinfo.capacity);
-
-                rc = cap_format(&pinfo.capacity, &scap);
+                capa_simplify(&pinfo.capacity);
+
+                rc = capa_format(&pinfo.capacity, &scapa);
                 if (rc != EOK) {
                         printf("Out of memory.\n");
@@ -1016 +1016 @@
 
                 if (linfo.ltype == lt_none)
-                        printf("Entire disk: %s %s", label, scap);
+                        printf("Entire disk: %s %s", label, scapa);
                 else
-                        printf("Partition %d: %s %s", npart, label, scap);
+                        printf("Partition %d: %s %s", npart, label, scapa);
 
                 if ((linfo.flags & lf_ext_supp) != 0) {
@@ -1037 +1037 @@
                 printf("\n");
 
-                free(scap);
-                scap = NULL;
+                free(scapa);
+                scapa = NULL;
                 free(sfstype);
                 sfstype = NULL;
@@ -1047 +1047 @@
         /* Display available space */
         if ((linfo.flags & lf_can_create_pri) != 0) {
-                rc = fdisk_part_get_max_avail(dev, spc_pri, &mcap);
+                rc = fdisk_part_get_max_avail(dev, spc_pri, &mcapa);
                 if (rc != EOK) {
                         rc = EIO;
@@ -1053 +1053 @@
                 }
 
-                cap_simplify(&mcap);
-
-                rc = cap_format(&mcap, &smcap);
+                capa_simplify(&mcapa);
+
+                rc = capa_format(&mcapa, &smcapa);
                 if (rc != EOK) {
                         rc = ENOMEM;
@@ -1062 +1062 @@
 
                 if ((linfo.flags & lf_ext_supp) != 0)
-                        printf("Maximum free primary block: %s\n", smcap);
+                        printf("Maximum free primary block: %s\n", smcapa);
                 else
-                        printf("Maximum free block: %s\n", smcap);
-
-                free(smcap);
-                smcap = NULL;
-
-                rc = fdisk_part_get_tot_avail(dev, spc_pri, &mcap);
+                        printf("Maximum free block: %s\n", smcapa);
+
+                free(smcapa);
+                smcapa = NULL;
+
+                rc = fdisk_part_get_tot_avail(dev, spc_pri, &mcapa);
                 if (rc != EOK) {
                         rc = EIO;
@@ -1075 +1075 @@
                 }
 
-                cap_simplify(&mcap);
-
-                rc = cap_format(&mcap, &smcap);
+                capa_simplify(&mcapa);
+
+                rc = capa_format(&mcapa, &smcapa);
                 if (rc != EOK) {
                         rc = ENOMEM;
@@ -1084 +1084 @@
 
                 if ((linfo.flags & lf_ext_supp) != 0)
-                        printf("Total free primary space: %s\n", smcap);
+                        printf("Total free primary space: %s\n", smcapa);
                 else
-                        printf("Total free space: %s\n", smcap);
-
-                free(smcap);
-                smcap = NULL;
+                        printf("Total free space: %s\n", smcapa);
+
+                free(smcapa);
+                smcapa = NULL;
         }
 
         /* Display available space */
         if ((linfo.flags & lf_can_create_log) != 0) {
-                rc = fdisk_part_get_max_avail(dev, spc_log, &mcap);
+                rc = fdisk_part_get_max_avail(dev, spc_log, &mcapa);
                 if (rc != EOK) {
                         rc = EIO;
@@ -1100 +1100 @@
                 }
 
-                cap_simplify(&mcap);
-
-                rc = cap_format(&mcap, &smcap);
+                capa_simplify(&mcapa);
+
+                rc = capa_format(&mcapa, &smcapa);
                 if (rc != EOK) {
                         rc = ENOMEM;
@@ -1108 +1108 @@
                 }
 
-                printf("Maximum free logical block: %s\n", smcap);
-                free(smcap);
-                smcap = NULL;
-
-                rc = fdisk_part_get_tot_avail(dev, spc_log, &mcap);
+                printf("Maximum free logical block: %s\n", smcapa);
+                free(smcapa);
+                smcapa = NULL;
+
+                rc = fdisk_part_get_tot_avail(dev, spc_log, &mcapa);
                 if (rc != EOK) {
                         rc = EIO;
@@ -1118 +1118 @@
                 }
 
-                cap_simplify(&mcap);
-
-                rc = cap_format(&mcap, &smcap);
+                capa_simplify(&mcapa);
+
+                rc = capa_format(&mcapa, &smcapa);
                 if (rc != EOK) {
                         rc = ENOMEM;
@@ -1126 +1126 @@
                 }
 
-                printf("Total free logical space: %s\n", smcap);
-                free(smcap);
-                smcap = NULL;
+                printf("Total free logical space: %s\n", smcapa);
+                free(smcapa);
+                smcapa = NULL;
         }
 
@@ -1279 +1279 @@
         return EOK;
 error:
-        free(sdcap);
-        free(scap);
-        free(smcap);
+        free(sdcapa);
+        free(scapa);
+        free(smcapa);
         free(sfstype);
         free(svcname);