Changes in uspace/lib/c/generic/inet/addr.c [38d150e:1d6dd2a] 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
@@ -290 +291 @@
 }
 
-static int inet_addr_parse_v4(const char *str, inet_addr_t *raddr,
+static errno_t inet_addr_parse_v4(const char *str, inet_addr_t *raddr,
     int *prefix, char **endptr)
 {
@@ -299 +300 @@
 
         while (i < 4) {
-                int rc = str_uint8_t(cur, (const char **)&cur, 10, false, &b);
+                errno_t rc = str_uint8_t(cur, (const char **)&cur, 10, false, &b);
                 if (rc != EOK)
                         return rc;
@@ -339 +340 @@
 }
 
-static int inet_addr_parse_v6(const char *str, inet_addr_t *raddr, int *prefix,
+static errno_t inet_addr_parse_v6(const char *str, inet_addr_t *raddr, int *prefix,
     char **endptr)
 {
@@ -362 +363 @@
                 uint16_t bioctet;
                 const char *gend;
-                int rc = str_uint16_t(cur, &gend, 16, false, &bioctet);
+                errno_t rc = str_uint16_t(cur, &gend, 16, false, &bioctet);
                 if (rc != EOK)
                         break;
@@ -446 +447 @@
  *
  */
-int inet_addr_parse(const char *text, inet_addr_t *addr, char **endptr)
-{
-        int rc;
+errno_t inet_addr_parse(const char *text, inet_addr_t *addr, char **endptr)
+{
+        errno_t rc;
 
         rc = inet_addr_parse_v4(text, addr, NULL, endptr);
@@ -473 +474 @@
  *
  */
-int inet_naddr_parse(const char *text, inet_naddr_t *naddr, char **endptr)
-{
-        int rc;
+errno_t inet_naddr_parse(const char *text, inet_naddr_t *naddr, char **endptr)
+{
+        errno_t rc;
         inet_addr_t addr;
         int prefix;
@@ -494 +495 @@
 }
 
-static int inet_addr_format_v4(addr32_t addr, char **bufp)
+static errno_t inet_addr_format_v4(addr32_t addr, char **bufp)
 {
         int rc;
@@ -506 +507 @@
 }
 
-static int inet_addr_format_v6(const addr128_t addr, char **bufp)
+static errno_t inet_addr_format_v6(const addr128_t addr, char **bufp)
 {
         *bufp = (char *) malloc(INET6_ADDRSTRLEN);
@@ -581 +582 @@
  *
  */
-int inet_addr_format(const inet_addr_t *addr, char **bufp)
-{
-        int rc;
+errno_t inet_addr_format(const inet_addr_t *addr, char **bufp)
+{
+        errno_t rc;
+        int ret;
 
         rc = ENOTSUP;
@@ -589 +591 @@
         switch (addr->version) {
         case ip_any:
-                rc = asprintf(bufp, "none");
-                if (rc < 0)
+                ret = asprintf(bufp, "none");
+                if (ret < 0)
                         return ENOMEM;
                 rc = EOK;
@@ -615 +617 @@
  *
  */
-int inet_naddr_format(const inet_naddr_t *naddr, char **bufp)
-{
-        int rc;
+errno_t inet_naddr_format(const inet_naddr_t *naddr, char **bufp)
+{
+        errno_t rc;
+        int ret;
         char *astr;
 
@@ -624 +627 @@
         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 +637 @@
                         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 +650 @@
                         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;