Changeset 132ab5d1 in mainline for uspace/app/ping/ping.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/ping/ping.c (modified) (3 diffs)

uspace/app/ping/ping.c

@@ -145 +145 @@
         int rc = inetping_send(&sdu);
         if (rc != EOK)
-                printf("Failed sending echo request: %s (%d).\n",
-                    str_error(rc), rc);
+                printf("Failed sending echo request: %s: %s.\n",
+                    str_error_name(rc), str_error(rc));
         
         return rc;
@@ -225 +225 @@
         if (rc != EOK) {
                 printf("Failed connecting to internet ping service: "
-                    "%s (%d).\n", str_error(rc), rc);
+                    "%s: %s.\n", str_error_name(rc), str_error(rc));
                 goto error;
         }
@@ -290 +290 @@
         }
         
-        rc = asprintf(&sdest, "%s (%s)", host, adest);
-        if (rc < 0) {
+        if (asprintf(&sdest, "%s (%s)", host, adest) < 0) {
                 printf("Out of memory.\n");
                 goto error;