Changeset 9af1c61 in mainline for uspace/lib/c/generic/str_error.c

Timestamp:

2017-12-05T14:52:22Z (6 years ago)

Author:

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

Branches:

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

Children:

addbce4

Parents:

82d515e9

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2017-12-05 14:50:38)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2017-12-05 14:52:22)

Message:

Print errno values as string, rather than just numbers.

File:

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

uspace/lib/c/generic/str_error.c

@@ -41 +41 @@
 #define NOERR_LEN  64
 
+// TODO: this file should be generated from errno declarations
+
+static const char* err_name[] = {
+        "EOK",
+        "ENOENT",
+        "ENOMEM",
+        "ELIMIT",
+        "EREFUSED",
+        "EFORWARD",
+        "EPERM",
+        "EHANGUP",
+        "EPARTY",
+        "EEXIST",
+        "EBADMEM",
+        "ENOTSUP",
+        "EADDRNOTAVAIL",
+        "ETIMEOUT",
+        "EINVAL",
+        "EBUSY",
+        "EOVERFLOW",
+        "EINTR"
+};
+
 static const char* err_desc[] = {
         "No error",
         "No such entry",
         "Not enough memory",
-        "Limit exceeded", 
+        "Limit exceeded",
         "Connection refused",
         "Forwarding error",
@@ -64 +87 @@
 static fibril_local char noerr[NOERR_LEN];
 
-const char *str_error(const int e)
+const char *str_error_name(errno_t e)
+{
+        if ((e <= 0) && (e >= MIN_ERRNO))
+                return err_name[-e];
+
+        /* Ad hoc descriptions of error codes interesting for USB. */
+        // FIXME: integrate these as first-class error values
+        switch (e) {
+                case ENOFS:
+                        return "ENOFS";
+                case EBADCHECKSUM:
+                        return "EBADCHECKSUM";
+                case ESTALL:
+                        return "ESTALL";
+                case EAGAIN:
+                        return "EAGAIN";
+                case EEMPTY:
+                        return "EEMPTY";
+                default:
+                        break;
+        }
+
+        snprintf(noerr, NOERR_LEN, "(%d)", (int)e);
+        return noerr;
+}
+
+const char *str_error(errno_t e)
 {
         if ((e <= 0) && (e >= MIN_ERRNO))
@@ -86 +135 @@
         }
 
-        snprintf(noerr, NOERR_LEN, "Unkown error code %d", e);
+        snprintf(noerr, NOERR_LEN, "Unknown error code (%d)", (int)e);
         return noerr;
 }