Changeset 132ab5d1 in mainline for uspace/lib/c/generic/cap.c

Timestamp:

2018-01-30T03:20:45Z (7 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

5a6cc679

Parents:

8bfb163 (diff), 6a5d05b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge commit '6a5d05bd2551e64111bea4f9332dd7448c26ce84' into forwardport

Separate return value from error code in gen_irq_code*().

File:

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

uspace/lib/c/generic/cap.c

@@ -178 +178 @@
 {
         int rc;
+        int ret;
         const char *sunit;
         uint64_t ipart;
@@ -196 +197 @@
         sunit = cu_str[cap->cunit];
         if (cap->dp > 0) {
-                rc = asprintf(rstr, "%" PRIu64 ".%0*" PRIu64 " %s", ipart,
+                ret = asprintf(rstr, "%" PRIu64 ".%0*" PRIu64 " %s", ipart,
                     (int)cap->dp, fpart, sunit);
         } else {
-                rc = asprintf(rstr, "%" PRIu64 " %s", ipart, sunit);
-        }
-        if (rc < 0)
+                ret = asprintf(rstr, "%" PRIu64 " %s", ipart, sunit);
+        }
+        if (ret < 0)
                 return ENOMEM;