Changeset 120d5bc in mainline for uspace/lib

Timestamp:

2017-09-13T20:49:43Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

5918c00

Parents:

6c4eedf

Message:

Let df give 'human-readable' output by default. Use cap.h for better capacity formatting. Let -b print block size and numbers of blocks for each FS.

Location:

uspace/lib

Files:

• c/generic/cap.c (modified) (1 diff)
• c/include/cap.h (modified) (1 diff)
• fdisk/src/fdisk.c (modified) (1 diff)

uspace/lib/c/generic/cap.c

@@ -81 +81 @@
  * and @c cv_max gives the maximum value.
  */
-int cap_spec_to_blocks(cap_spec_t *cap, cap_vsel_t cvsel, size_t block_size,
+int cap_to_blocks(cap_spec_t *cap, cap_vsel_t cvsel, size_t block_size,
     uint64_t *rblocks)
 {

uspace/lib/c/include/cap.h

@@ -94 +94 @@
 extern void cap_simplify(cap_spec_t *);
 extern void cap_from_blocks(uint64_t, size_t, cap_spec_t *);
-extern int cap_spec_to_blocks(cap_spec_t *, cap_vsel_t, size_t, uint64_t *);
+extern int cap_to_blocks(cap_spec_t *, cap_vsel_t, size_t, uint64_t *);
 
 #endif

uspace/lib/fdisk/src/fdisk.c

@@ -996 +996 @@
         int rc;
 
-        rc = cap_spec_to_blocks(&pspec->capacity, cv_nom, dev->dinfo.block_size,
+        rc = cap_to_blocks(&pspec->capacity, cv_nom, dev->dinfo.block_size,
             &nom_blocks);
         if (rc != EOK)
                 return rc;
 
-        rc = cap_spec_to_blocks(&pspec->capacity, cv_min, dev->dinfo.block_size,
+        rc = cap_to_blocks(&pspec->capacity, cv_min, dev->dinfo.block_size,
             &min_blocks);
         if (rc != EOK)
                 return rc;
 
-        rc = cap_spec_to_blocks(&pspec->capacity, cv_max, dev->dinfo.block_size,
+        rc = cap_to_blocks(&pspec->capacity, cv_max, dev->dinfo.block_size,
             &max_blocks);
         if (rc != EOK)