Changeset d5c1051 in mainline for uspace/lib/c/generic/inet

Timestamp:

2017-12-20T22:25:34Z (8 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.

Location:

uspace/lib/c/generic/inet

Files:

• addr.c (modified) (6 diffs)
• hostport.c (modified) (3 diffs)

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

@@ -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;

uspace/lib/c/generic/inet/hostport.c

@@ -140 +140 @@
 {
         int rc;
+        int ret;
         char *astr, *str;
         char *hstr = NULL;
@@ -154 +155 @@
                         hstr = astr;
                 } else {
-                        rc = asprintf(&hstr, "[%s]", astr);
-                        if (rc < 0) {
+                        ret = asprintf(&hstr, "[%s]", astr);
+                        if (ret < 0) {
                                 free(astr);
                                 return ENOMEM;
@@ -171 +172 @@
         }
 
-        rc = asprintf(&str, "%s:%u", hstr, hp->port);
-        if (rc < 0)
+        ret = asprintf(&str, "%s:%u", hstr, hp->port);
+        if (ret < 0)
                 return ENOMEM;