Changeset 132ab5d1 in mainline for uspace/lib/c/generic/inet/addr.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/lib/c/generic/inet/addr.c (modified) (7 diffs)

uspace/lib/c/generic/inet/addr.c

@@ -39 +39 @@
 #include <stdio.h>
 #include <stddef.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <bitops.h>
 #include <inttypes.h>
@@ -584 +584 @@
 {
         int rc;
+        int ret;
 
         rc = ENOTSUP;
@@ -589 +590 @@
         switch (addr->version) {
         case ip_any:
-                rc = asprintf(bufp, "none");
-                if (rc < 0)
+                ret = asprintf(bufp, "none");
+                if (ret < 0)
                         return ENOMEM;
                 rc = EOK;
@@ -618 +619 @@
 {
         int rc;
+        int ret;
         char *astr;
 
@@ -624 +626 @@
         switch (naddr->version) {
         case ip_any:
-                rc = asprintf(bufp, "none");
-                if (rc < 0)
+                ret = asprintf(bufp, "none");
+                if (ret < 0)
                         return ENOMEM;
                 rc = EOK;
@@ -634 +636 @@
                         return ENOMEM;
 
-                rc = asprintf(bufp, "%s/%" PRIu8, astr, naddr->prefix);
-                if (rc < 0) {
+                ret = asprintf(bufp, "%s/%" PRIu8, astr, naddr->prefix);
+                if (ret < 0) {
                         free(astr);
                         return ENOMEM;
@@ -647 +649 @@
                         return ENOMEM;
 
-                rc = asprintf(bufp, "%s/%" PRIu8, astr, naddr->prefix);
-                if (rc < 0) {
+                ret = asprintf(bufp, "%s/%" PRIu8, astr, naddr->prefix);
+                if (ret < 0) {
                         free(astr);
                         return ENOMEM;