Changes in uspace/lib/c/generic/cap.c [b7fd2a0:05b59393] in mainline

File:

• uspace/lib/c/generic/cap.c (modified) (7 diffs)

uspace/lib/c/generic/cap.c

@@ -81 +81 @@
  * and @c cv_max gives the maximum value.
  */
-errno_t cap_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)
 {
@@ -90 +90 @@
         uint64_t blocks;
         uint64_t rem;
-        errno_t rc;
+        int rc;
 
         exp = cap->cunit * 3 - cap->dp;
@@ -144 +144 @@
         unsigned sdig;
         unsigned rdig;
-        errno_t rc;
+        int rc;
 
         /* Change units so that we have at most @c scap_max_idig integer digits */
@@ -175 +175 @@
 }
 
-errno_t cap_format(cap_spec_t *cap, char **rstr)
-{
-        errno_t rc;
-        int ret;
+int cap_format(cap_spec_t *cap, char **rstr)
+{
+        int rc;
         const char *sunit;
         uint64_t ipart;
@@ -197 +196 @@
         sunit = cu_str[cap->cunit];
         if (cap->dp > 0) {
-                ret = asprintf(rstr, "%" PRIu64 ".%0*" PRIu64 " %s", ipart,
+                rc = asprintf(rstr, "%" PRIu64 ".%0*" PRIu64 " %s", ipart,
                     (int)cap->dp, fpart, sunit);
         } else {
-                ret = asprintf(rstr, "%" PRIu64 " %s", ipart, sunit);
-        }
-        if (ret < 0)
+                rc = asprintf(rstr, "%" PRIu64 " %s", ipart, sunit);
+        }
+        if (rc < 0)
                 return ENOMEM;
 
@@ -208 +207 @@
 }
 
-static errno_t cap_digit_val(char c, int *val)
+static int cap_digit_val(char c, int *val)
 {
         switch (c) {
@@ -228 +227 @@
 }
 
-errno_t cap_parse(const char *str, cap_spec_t *cap)
+int cap_parse(const char *str, cap_spec_t *cap)
 {
         const char *eptr;