Changeset c24b0dcb in mainline for uspace/lib/fdisk

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.

Location:

uspace/lib/fdisk

Files:

• include/fdisk.h (modified) (3 diffs)
• include/types/fdisk.h (modified) (4 diffs)
• src/fdisk.c (modified) (10 diffs)

uspace/lib/fdisk/include/fdisk.h

@@ -50 +50 @@
 extern errno_t fdisk_dev_info_get_svcname(fdisk_dev_info_t *, char **);
 extern void fdisk_dev_info_get_svcid(fdisk_dev_info_t *, service_id_t *);
-extern errno_t fdisk_dev_info_capacity(fdisk_dev_info_t *, cap_spec_t *);
+extern errno_t fdisk_dev_info_capacity(fdisk_dev_info_t *, capa_spec_t *);
 
 extern errno_t fdisk_dev_open(fdisk_t *, service_id_t, fdisk_dev_t **);
@@ -57 +57 @@
 extern void fdisk_dev_get_flags(fdisk_dev_t *, fdisk_dev_flags_t *);
 extern errno_t fdisk_dev_get_svcname(fdisk_dev_t *, char **);
-extern errno_t fdisk_dev_capacity(fdisk_dev_t *, cap_spec_t *);
+extern errno_t fdisk_dev_capacity(fdisk_dev_t *, capa_spec_t *);
 
 extern errno_t fdisk_label_get_info(fdisk_dev_t *, fdisk_label_info_t *);
@@ -66 +66 @@
 extern fdisk_part_t *fdisk_part_next(fdisk_part_t *);
 extern errno_t fdisk_part_get_info(fdisk_part_t *, fdisk_part_info_t *);
-extern errno_t fdisk_part_get_max_avail(fdisk_dev_t *, fdisk_spc_t, cap_spec_t *);
-extern errno_t fdisk_part_get_tot_avail(fdisk_dev_t *, fdisk_spc_t, cap_spec_t *);
+extern errno_t fdisk_part_get_max_avail(fdisk_dev_t *, fdisk_spc_t, capa_spec_t *);
+extern errno_t fdisk_part_get_tot_avail(fdisk_dev_t *, fdisk_spc_t, capa_spec_t *);
 extern errno_t fdisk_part_create(fdisk_dev_t *, fdisk_part_spec_t *,
     fdisk_part_t **);

uspace/lib/fdisk/include/types/fdisk.h

@@ -38 +38 @@
 
 #include <adt/list.h>
-#include <cap.h>
+#include <capa.h>
 #include <loc.h>
 #include <stdint.h>
@@ -126 +126 @@
         link_t llog_ba;
         /** Capacity */
-        cap_spec_t capacity;
+        capa_spec_t capacity;
         /** Partition kind */
         label_pkind_t pkind;
@@ -150 +150 @@
 typedef struct {
         /** Desired capacity */
-        cap_spec_t capacity;
+        capa_spec_t capacity;
         /** Partition kind */
         label_pkind_t pkind;
@@ -164 +164 @@
 typedef struct {
         /** Capacity */
-        cap_spec_t capacity;
+        capa_spec_t capacity;
         /** Partition kind */
         label_pkind_t pkind;

uspace/lib/fdisk/src/fdisk.c

@@ -35 +35 @@
 
 #include <adt/list.h>
-#include <cap.h>
+#include <capa.h>
 #include <errno.h>
 #include <fdisk.h>
@@ -219 +219 @@
 }
 
-errno_t fdisk_dev_info_capacity(fdisk_dev_info_t *info, cap_spec_t *cap)
+errno_t fdisk_dev_info_capacity(fdisk_dev_info_t *info, capa_spec_t *capa)
 {
         vbd_disk_info_t vinfo;
@@ -228 +228 @@
                 return EIO;
 
-        cap_from_blocks(vinfo.nblocks, vinfo.block_size, cap);
+        capa_from_blocks(vinfo.nblocks, vinfo.block_size, capa);
         return EOK;
 }
@@ -295 +295 @@
                 dev->ext_part = part;
 
-        cap_from_blocks(part->nblocks, dev->dinfo.block_size,
+        capa_from_blocks(part->nblocks, dev->dinfo.block_size,
             &part->capacity);
         part->part_id = partid;
@@ -536 +536 @@
 }
 
-errno_t fdisk_dev_capacity(fdisk_dev_t *dev, cap_spec_t *cap)
-{
-        cap_from_blocks(dev->dinfo.nblocks, dev->dinfo.block_size, cap);
+errno_t fdisk_dev_capacity(fdisk_dev_t *dev, capa_spec_t *capa)
+{
+        capa_from_blocks(dev->dinfo.nblocks, dev->dinfo.block_size, capa);
         return EOK;
 }
@@ -679 +679 @@
 
 /** Get size of largest free block. */
-errno_t fdisk_part_get_max_avail(fdisk_dev_t *dev, fdisk_spc_t spc, cap_spec_t *cap)
+errno_t fdisk_part_get_max_avail(fdisk_dev_t *dev, fdisk_spc_t spc,
+    capa_spec_t *capa)
 {
         errno_t rc;
@@ -698 +699 @@
         }
 
-        cap_from_blocks(nb, dev->dinfo.block_size, cap);
+        capa_from_blocks(nb, dev->dinfo.block_size, capa);
         return EOK;
 }
@@ -704 +705 @@
 /** Get total free space capacity. */
 errno_t fdisk_part_get_tot_avail(fdisk_dev_t *dev, fdisk_spc_t spc,
-    cap_spec_t *cap)
+    capa_spec_t *capa)
 {
         fdisk_free_range_t fr;
@@ -726 +727 @@
         } while (fdisk_free_range_next(&fr));
 
-        cap_from_blocks(totb, dev->dinfo.block_size, cap);
+        capa_from_blocks(totb, dev->dinfo.block_size, capa);
         return EOK;
 }
@@ -938 +939 @@
         errno_t rc;
 
-        rc = cap_to_blocks(&pspec->capacity, cv_nom, dev->dinfo.block_size,
+        rc = capa_to_blocks(&pspec->capacity, cv_nom, dev->dinfo.block_size,
             &nom_blocks);
         if (rc != EOK)
                 return rc;
 
-        rc = cap_to_blocks(&pspec->capacity, cv_min, dev->dinfo.block_size,
+        rc = capa_to_blocks(&pspec->capacity, cv_min, dev->dinfo.block_size,
             &min_blocks);
         if (rc != EOK)
                 return rc;
 
-        rc = cap_to_blocks(&pspec->capacity, cv_max, dev->dinfo.block_size,
+        rc = capa_to_blocks(&pspec->capacity, cv_max, dev->dinfo.block_size,
             &max_blocks);
         if (rc != EOK)