Changeset 6c4eedf in mainline for uspace/lib/c/generic/cap.c

Timestamp:

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

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

120d5bc

Parents:

1d40c93d

Message:

Move capacity specification to libc.

File:

• uspace/lib/c/generic/cap.c (moved) (moved from uspace/lib/fdisk/src/cap.c ) (10 diffs)

uspace/lib/c/generic/cap.c

@@ -27 +27 @@
  */
 
-/** @addtogroup libfdisk
+/** @addtogroup libc
  * @{
  */
 /**
- * @file Disk management library.
- */
-
+ * @file Storage capacity specification.
+ */
+
+#include <cap.h>
 #include <errno.h>
-#include <fdisk.h>
 #include <imath.h>
 #include <stdio.h>
@@ -60 +60 @@
 };
 
-void fdisk_cap_from_blocks(uint64_t nblocks, size_t block_size,
-    fdisk_cap_t *cap)
+void cap_from_blocks(uint64_t nblocks, size_t block_size, cap_spec_t *cap)
 {
         uint64_t tsize;
@@ -78 +77 @@
  *
  * A capacity value entails precision, i.e. it corresponds to a range
- * of values. @a cvsel selects the value to return. @c fcv_nom gives
- * the nominal (middle) value, @c fcv_min gives the minimum value
- * and @c fcv_max gives the maximum value.
- */
-int fdisk_cap_to_blocks(fdisk_cap_t *cap, fdisk_cvsel_t cvsel,
-    size_t block_size, uint64_t *rblocks)
+ * of values. @a cvsel selects the value to return. @c cv_nom gives
+ * the nominal (middle) value, @c cv_min gives the minimum value
+ * 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,
+    uint64_t *rblocks)
 {
         int exp;
@@ -108 +107 @@
                 adj = 0;
                 switch (cvsel) {
-                case fcv_nom:
+                case cv_nom:
                         adj = 0;
                         break;
-                case fcv_min:
+                case cv_min:
                         adj = -(f / 2);
                         break;
-                case fcv_max:
+                case cv_max:
                         adj = f / 2 - 1;
                         break;
@@ -139 +138 @@
  * digits and at most two fractional digits, e.g abc.xy <unit>.
  */
-void fdisk_cap_simplify(fdisk_cap_t *cap)
+void cap_simplify(cap_spec_t *cap)
 {
         uint64_t div;
@@ -176 +175 @@
 }
 
-int fdisk_cap_format(fdisk_cap_t *cap, char **rstr)
+int cap_format(cap_spec_t *cap, char **rstr)
 {
         int rc;
@@ -209 +208 @@
 }
 
-static int fdisk_digit_val(char c, int *val)
+static int cap_digit_val(char c, int *val)
 {
         switch (c) {
@@ -229 +228 @@
 }
 
-int fdisk_cap_parse(const char *str, fdisk_cap_t *cap)
+int cap_parse(const char *str, cap_spec_t *cap)
 {
         const char *eptr;
@@ -241 +240 @@
 
         eptr = str;
-        while (fdisk_digit_val(*eptr, &d) == EOK) {
+        while (cap_digit_val(*eptr, &d) == EOK) {
                 m = m * 10 + d;
                 ++eptr;
@@ -249 +248 @@
                 ++eptr;
                 dp = 0;
-                while (fdisk_digit_val(*eptr, &d) == EOK) {
+                while (cap_digit_val(*eptr, &d) == EOK) {
                         m = m * 10 + d;
                         ++dp;