Changeset 46577995 in mainline for uspace/lib/c/generic/inet/hostport.c

Timestamp:

2018-01-04T20:50:52Z (6 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Children:

e211ea04

Parents:

facacc71

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-01-04 20:47:53)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-01-04 20:50:52)

Message:

Use errno_t in all uspace and kernel code.

Change type of every variable, parameter and return value that holds an
<errno.h> constant to either errno_t (the usual case), or sys_errno_t
(some places in kernel). This is for the purpose of self-documentation,
as well as for type-checking with a bit of type definition hackery.

After this commit, HelenOS is free of code that mixes error codes with non-error
values on the assumption that error codes are negative.

File:

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

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

@@ -56 +56 @@
  *         extra characters at the end. ENOMEM if out of memory
  */
-int inet_hostport_parse(const char *str, inet_hostport_t **rhp,
+errno_t inet_hostport_parse(const char *str, inet_hostport_t **rhp,
     char **endptr)
 {
@@ -65 +65 @@
         char *aend;
         const char *pend;
-        int rc;
+        errno_t rc;
 
         hp = calloc(1, sizeof(inet_hostport_t));
@@ -137 +137 @@
  * @return EOK on success, ENOMEM if out of memory
  */
-int inet_hostport_format(inet_hostport_t *hp, char **rstr)
-{
-        int rc;
+errno_t inet_hostport_format(inet_hostport_t *hp, char **rstr)
+{
+        errno_t rc;
         int ret;
         char *astr, *str;
@@ -211 +211 @@
  * @return EOK on success, ENOENT on resolution failure
  */
-int inet_hostport_lookup_one(inet_hostport_t *hp, ip_ver_t version,
+errno_t inet_hostport_lookup_one(inet_hostport_t *hp, ip_ver_t version,
     inet_ep_t *ep)
 {
         dnsr_hostinfo_t *hinfo = NULL;
-        int rc;
+        errno_t rc;
 
         inet_ep_init(ep);
@@ -255 +255 @@
  *         ENOMEM if out of memory
  */
-int inet_hostport_plookup_one(const char *str, ip_ver_t version, inet_ep_t *ep,
+errno_t 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;
-        int rc;
+        errno_t rc;
 
         rc = inet_hostport_parse(str, &hp, endptr != NULL ? &eptr : NULL);
         if (rc != EOK) {
-                switch (rc) {
-                case EINVAL:
+                switch ((case_errno_t) rc) {
+                case (case_errno_t) EINVAL:
                         if (errmsg != NULL)
                                 *errmsg = "Invalid format";
                         goto error;
-                case ENOMEM:
+                case (case_errno_t) ENOMEM:
                         if (errmsg != NULL)
                                 *errmsg = "Out of memory";
                         goto error;
-                case EOK:
+                case (case_errno_t) EOK:
                         break;
                 default: