Changeset 132ab5d1 in mainline for uspace/app/fdisk/fdisk.c

Timestamp:

2018-01-30T03:20:45Z (8 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/app/fdisk/fdisk.c (modified) (4 diffs)

uspace/app/fdisk/fdisk.c

@@ -210 +210 @@
                 }
 
-                rc = asprintf(&dtext, "%s (%s)", svcname, scap);
-                if (rc < 0) {
+                int ret = asprintf(&dtext, "%s (%s)", svcname, scap);
+                if (ret < 0) {
                         rc = ENOMEM;
                         printf("Out of memory.\n");
@@ -269 +269 @@
         return EOK;
 error:
+        assert(rc != EOK);
+        *rsvcid = 0;
         if (devlist != NULL)
                 fdisk_dev_list_free(devlist);
@@ -613 +615 @@
                                 label = "(No name)";
 
-                        rc = asprintf(&sdesc, "%s %s, %s, %s", label,
+                        int ret = asprintf(&sdesc, "%s %s, %s, %s", label,
                             scap, spkind, sfstype);
-                        if (rc < 0) {
+                        if (ret < 0) {
                                 rc = ENOMEM;
                                 goto error;
@@ -621 +623 @@
 
                 } else {
-                        rc = asprintf(&sdesc, "%s, %s", scap, spkind);
-                        if (rc < 0) {
+                        int ret = asprintf(&sdesc, "%s, %s", scap, spkind);
+                        if (ret < 0) {
                                 rc = ENOMEM;
                                 goto error;