Changes in uspace/lib/c/generic/inet/addr.c [1d6dd2a:38d150e] in mainline

File:

• uspace/lib/c/generic/inet/addr.c (modified) (15 diffs)

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

@@ -42 +42 @@
 #include <bitops.h>
 #include <inttypes.h>
-#include <str.h>
 
 #define INET_PREFIXSTRSIZE  5
@@ -291 +290 @@
 }
 
-static errno_t inet_addr_parse_v4(const char *str, inet_addr_t *raddr,
+static int inet_addr_parse_v4(const char *str, inet_addr_t *raddr,
     int *prefix, char **endptr)
 {
@@ -300 +299 @@
 
         while (i < 4) {
-                errno_t rc = str_uint8_t(cur, (const char **)&cur, 10, false, &b);
+                int rc = str_uint8_t(cur, (const char **)&cur, 10, false, &b);
                 if (rc != EOK)
                         return rc;
@@ -340 +339 @@
 }
 
-static errno_t inet_addr_parse_v6(const char *str, inet_addr_t *raddr, int *prefix,
+static int inet_addr_parse_v6(const char *str, inet_addr_t *raddr, int *prefix,
     char **endptr)
 {
@@ -363 +362 @@
                 uint16_t bioctet;
                 const char *gend;
-                errno_t rc = str_uint16_t(cur, &gend, 16, false, &bioctet);
+                int rc = str_uint16_t(cur, &gend, 16, false, &bioctet);
                 if (rc != EOK)
                         break;
@@ -447 +446 @@
  *
  */
-errno_t inet_addr_parse(const char *text, inet_addr_t *addr, char **endptr)
-{
-        errno_t rc;
+int inet_addr_parse(const char *text, inet_addr_t *addr, char **endptr)
+{
+        int rc;
 
         rc = inet_addr_parse_v4(text, addr, NULL, endptr);
@@ -474 +473 @@
  *
  */
-errno_t inet_naddr_parse(const char *text, inet_naddr_t *naddr, char **endptr)
-{
-        errno_t rc;
+int inet_naddr_parse(const char *text, inet_naddr_t *naddr, char **endptr)
+{
+        int rc;
         inet_addr_t addr;
         int prefix;
@@ -495 +494 @@
 }
 
-static errno_t inet_addr_format_v4(addr32_t addr, char **bufp)
+static int inet_addr_format_v4(addr32_t addr, char **bufp)
 {
         int rc;
@@ -507 +506 @@
 }
 
-static errno_t inet_addr_format_v6(const addr128_t addr, char **bufp)
+static int inet_addr_format_v6(const addr128_t addr, char **bufp)
 {
         *bufp = (char *) malloc(INET6_ADDRSTRLEN);
@@ -582 +581 @@
  *
  */
-errno_t inet_addr_format(const inet_addr_t *addr, char **bufp)
-{
-        errno_t rc;
-        int ret;
+int inet_addr_format(const inet_addr_t *addr, char **bufp)
+{
+        int rc;
 
         rc = ENOTSUP;
@@ -591 +589 @@
         switch (addr->version) {
         case ip_any:
-                ret = asprintf(bufp, "none");
-                if (ret < 0)
+                rc = asprintf(bufp, "none");
+                if (rc < 0)
                         return ENOMEM;
                 rc = EOK;
@@ -617 +615 @@
  *
  */
-errno_t inet_naddr_format(const inet_naddr_t *naddr, char **bufp)
-{
-        errno_t rc;
-        int ret;
+int inet_naddr_format(const inet_naddr_t *naddr, char **bufp)
+{
+        int rc;
         char *astr;
 
@@ -627 +624 @@
         switch (naddr->version) {
         case ip_any:
-                ret = asprintf(bufp, "none");
-                if (ret < 0)
+                rc = asprintf(bufp, "none");
+                if (rc < 0)
                         return ENOMEM;
                 rc = EOK;
@@ -637 +634 @@
                         return ENOMEM;
 
-                ret = asprintf(bufp, "%s/%" PRIu8, astr, naddr->prefix);
-                if (ret < 0) {
+                rc = asprintf(bufp, "%s/%" PRIu8, astr, naddr->prefix);
+                if (rc < 0) {
                         free(astr);
                         return ENOMEM;
@@ -650 +647 @@
                         return ENOMEM;
 
-                ret = asprintf(bufp, "%s/%" PRIu8, astr, naddr->prefix);
-                if (ret < 0) {
+                rc = asprintf(bufp, "%s/%" PRIu8, astr, naddr->prefix);
+                if (rc < 0) {
                         free(astr);
                         return ENOMEM;