Changes in uspace/lib/c/generic/inet/hostport.c [b7fd2a0:a62ceaf] in mainline

File:

• uspace/lib/c/generic/inet/hostport.c (modified) (7 diffs)

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

@@ -56 +56 @@
  *         extra characters at the end. ENOMEM if out of memory
  */
-errno_t inet_hostport_parse(const char *str, inet_hostport_t **rhp,
+int inet_hostport_parse(const char *str, inet_hostport_t **rhp,
     char **endptr)
 {
@@ -65 +65 @@
         char *aend;
         const char *pend;
-        errno_t rc;
+        int rc;
 
         hp = calloc(1, sizeof(inet_hostport_t));
@@ -137 +137 @@
  * @return EOK on success, ENOMEM if out of memory
  */
-errno_t inet_hostport_format(inet_hostport_t *hp, char **rstr)
-{
-        errno_t rc;
-        int ret;
+int inet_hostport_format(inet_hostport_t *hp, char **rstr)
+{
+        int rc;
         char *astr, *str;
         char *hstr = NULL;
@@ -155 +154 @@
                         hstr = astr;
                 } else {
-                        ret = asprintf(&hstr, "[%s]", astr);
-                        if (ret < 0) {
+                        rc = asprintf(&hstr, "[%s]", astr);
+                        if (rc < 0) {
                                 free(astr);
                                 return ENOMEM;
@@ -172 +171 @@
         }
 
-        ret = asprintf(&str, "%s:%u", hstr, hp->port);
-        if (ret < 0)
+        rc = asprintf(&str, "%s:%u", hstr, hp->port);
+        if (rc < 0)
                 return ENOMEM;
 
@@ -211 +210 @@
  * @return EOK on success, ENOENT on resolution failure
  */
-errno_t inet_hostport_lookup_one(inet_hostport_t *hp, ip_ver_t version,
+int inet_hostport_lookup_one(inet_hostport_t *hp, ip_ver_t version,
     inet_ep_t *ep)
 {
         dnsr_hostinfo_t *hinfo = NULL;
-        errno_t rc;
+        int rc;
 
         inet_ep_init(ep);
@@ -255 +254 @@
  *         ENOMEM if out of memory
  */
-errno_t inet_hostport_plookup_one(const char *str, ip_ver_t version, inet_ep_t *ep,
+int inet_hostport_plookup_one(const char *str, ip_ver_t version, inet_ep_t *ep,
     char **endptr, const char **errmsg)
 {
         inet_hostport_t *hp = NULL;
         char *eptr;
-        errno_t rc;
+        int rc;
 
         rc = inet_hostport_parse(str, &hp, endptr != NULL ? &eptr : NULL);