Changeset 132ab5d1 in mainline for uspace/lib/c/generic/str_error.c

Timestamp:

2018-01-30T03:20:45Z (7 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

5a6cc679

Parents:

8bfb163 (diff), 6a5d05b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge commit '6a5d05bd2551e64111bea4f9332dd7448c26ce84' into forwardport

Separate return value from error code in gen_irq_code*().

File:

• uspace/lib/c/generic/str_error.c (modified) (2 diffs)

uspace/lib/c/generic/str_error.c

@@ -1 +1 @@
 /*
  * Copyright (c) 2010 Martin Decky
+ * Copyright (c) 2017 CZ.NIC, z.s.p.o.
  * All rights reserved.
  *
@@ -38 +39 @@
 #include <fibril.h>
 
-#define MIN_ERRNO  -17
 #define NOERR_LEN  64
 
+/* The arrays below are automatically generated from the same file that
+ * errno.h constants are generated from. Triple-include of the same list
+ * with redefinitions of __errno() macro are used to ensure that the
+ * information cannot get out of synch. This is inpired by musl libc.
+ */
+
+#undef __errno_entry
+#define __errno_entry(name, num, desc) name,
+
+static const errno_t err_num[] = {
+#include <abi/errno.in>
+};
+
+#undef __errno_entry
+#define __errno_entry(name, num, desc) #name,
+
+static const char* err_name[] = {
+#include <abi/errno.in>
+};
+
+#undef __errno_entry
+#define __errno_entry(name, num, desc) "[" #name "]" desc,
+
 static const char* err_desc[] = {
-        "No error",
-        "No such entry",
-        "Not enough memory",
-        "Limit exceeded", 
-        "Connection refused",
-        "Forwarding error",
-        "Permission denied",
-        "Answerbox closed connection",
-        "Other party error",
-        "Entry already exists",
-        "Bad memory pointer",
-        "Not supported",
-        "Address not available",
-        "Timeout expired",
-        "Invalid value",
-        "Resource is busy",
-        "Result does not fit its size",
-        "Operation interrupted"
+#include <abi/errno.in>
 };
 
 static fibril_local char noerr[NOERR_LEN];
 
-const char *str_error(const int e)
+/* Returns index corresponding to the given errno, or -1 if not found. */
+static int find_errno(errno_t e)
 {
-        if ((e <= 0) && (e >= MIN_ERRNO))
-                return err_desc[-e];
-        
-        /* Ad hoc descriptions of error codes interesting for USB. */
-        // FIXME: integrate these as first-class error values
-        switch (e) {
-                case ENOFS:
-                        return "No such file system type";
-                case EBADCHECKSUM:
-                        return "Bad checksum";
-                case ESTALL:
-                        return "Operation stalled";
-                case EAGAIN:
-                        return "Resource temporarily unavailable";
-                case EEMPTY:
-                        return "Resource is empty";
-                default:
-                        break;
+        /* Just a dumb linear search.
+         * There are too few entries to warrant anything smarter.
+         */
+
+        int len = sizeof(err_num) / sizeof(errno_t);
+
+        for (int i = 0; i < len; i++) {
+                if (err_num[i] == e) {
+                        return i;
+                }
         }
 
-        snprintf(noerr, NOERR_LEN, "Unkown error code %d", e);
+        return -1;
+}
+
+const char *str_error_name(errno_t e)
+{
+        int i = find_errno(e);
+
+        if (i >= 0) {
+                return err_name[i];
+        }
+
+        snprintf(noerr, NOERR_LEN, "(%d)", (int)e);
+        return noerr;
+}
+
+const char *str_error(errno_t e)
+{
+        int i = find_errno(e);
+
+        if (i >= 0) {
+                return err_desc[i];
+        }
+
+        snprintf(noerr, NOERR_LEN, "Unknown error code (%d)", (int)e);
         return noerr;
 }