Changeset c81d4f1 in mainline for uspace/lib

Timestamp:

2018-01-04T20:50:53Z (8 years ago)

Author:

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

Children:

3b47db6

Parents:

847844a

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:53)

Message:

(optional) Remove the horrid hack named case_errno_t.

Location:

uspace/lib/c

Files:

• generic/elf/elf_load.c (modified) (1 diff)
• generic/inet/host.c (modified) (1 diff)
• generic/inet/hostport.c (modified) (1 diff)
• generic/str_error.c (modified) (2 diffs)
• include/stdlib.h (modified) (1 diff)

uspace/lib/c/generic/elf/elf_load.c

@@ -80 +80 @@
 
         errno_t rc2 = rtld_prog_process(&info->finfo, &env);
-        switch ((case_errno_t) rc2) {
-        case (case_errno_t) EOK:
+        switch (rc2) {
+        case EOK:
                 rc = EE_OK;
                 break;
-        case (case_errno_t) ENOMEM:
+        case ENOMEM:
                 rc = EE_MEMORY;
                 break;

uspace/lib/c/generic/inet/host.c

@@ -210 +210 @@
         rc = inet_host_parse(str, &host, endptr != NULL ? &eptr : NULL);
         if (rc != EOK) {
-                switch ((case_errno_t) rc) {
-                case (case_errno_t) EINVAL:
+                switch (rc) {
+                case EINVAL:
                         if (errmsg != NULL)
                                 *errmsg = "Invalid format";
                         goto error;
-                case (case_errno_t) ENOMEM:
+                case ENOMEM:
                         if (errmsg != NULL)
                                 *errmsg = "Out of memory";

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

@@ -264 +264 @@
         rc = inet_hostport_parse(str, &hp, endptr != NULL ? &eptr : NULL);
         if (rc != EOK) {
-                switch ((case_errno_t) rc) {
-                case (case_errno_t) EINVAL:
+                switch (rc) {
+                case EINVAL:
                         if (errmsg != NULL)
                                 *errmsg = "Invalid format";
                         goto error;
-                case (case_errno_t) ENOMEM:
+                case ENOMEM:
                         if (errmsg != NULL)
                                 *errmsg = "Out of memory";
                         goto error;
-                case (case_errno_t) EOK:
+                case EOK:
                         break;
                 default:

uspace/lib/c/generic/str_error.c

@@ -96 +96 @@
         }
 
-        snprintf(noerr, NOERR_LEN, "(%d)", (int)(case_errno_t) e);
+        snprintf(noerr, NOERR_LEN, "(%d)", (int)e);
         return noerr;
 }
@@ -108 +108 @@
         }
 
-        snprintf(noerr, NOERR_LEN, "Unknown error code (%d)", (int)(case_errno_t) e);
+        snprintf(noerr, NOERR_LEN, "Unknown error code (%d)", (int)e);
         return noerr;
 }

uspace/lib/c/include/stdlib.h

@@ -56 +56 @@
 #include <errno.h>
 static inline int EXIT_RC(errno_t rc) {
-        return (int) (case_errno_t) rc;
+        return (int) rc;
 }