Changeset d5c1051 in mainline for uspace/app/fdisk/fdisk.c

Timestamp:

2017-12-20T22:25:34Z (6 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

39b54fe

Parents:

8610c2c

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2017-12-20 22:22:29)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2017-12-20 22:25:34)

Message:

"Obviously harmless" error handling tweaks.

File:

• uspace/app/fdisk/fdisk.c (modified) (3 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");
@@ -615 +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;
@@ -623 +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;