Changeset 132ab5d1 in mainline for uspace/srv/net/ethip/ethip.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/srv/net/ethip/ethip.c (modified) (1 diff)

uspace/srv/net/ethip/ethip.c

@@ -108 +108 @@
         nic->iplink.arg = nic;
 
-        rc = asprintf(&svc_name, "net/eth%u", ++link_num);
-        if (rc < 0) {
+        if (asprintf(&svc_name, "net/eth%u", ++link_num) < 0) {
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Out of memory.");
+                rc = ENOMEM;
                 goto error;
         }