Changeset 92574f4 in mainline for uspace/lib/c/generic/str_error.c

Timestamp:

2011-02-24T12:03:27Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

e7b7ebd5

Parents:

4837092 (diff), a80849c (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:

Merged development (changes in DDF, etc.).

Conflicts in uspace/drv/usbkbd/main.c

File:

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

uspace/lib/c/generic/str_error.c

@@ -33 +33 @@
  */
 
+#include <errno.h>
 #include <str_error.h>
 #include <stdio.h>
@@ -63 +64 @@
 static fibril_local char noerr[NOERR_LEN];
 
-const char *str_error(const int errno)
+const char *str_error(const int e)
 {
-        if ((errno <= 0) && (errno >= MIN_ERRNO))
-                return err_desc[-errno];
+        if ((e <= 0) && (e >= MIN_ERRNO))
+                return err_desc[-e];
         
-        snprintf(noerr, NOERR_LEN, "Unkown error code %d", errno);
+        /* Ad hoc descriptions of error codes interesting for USB. */
+        switch (e) {
+                case EBADCHECKSUM:
+                        return "Bad checksum";
+                case ESTALL:
+                        return "Operation stalled";
+                case EAGAIN:
+                        return "Resource temporarily unavailable";
+                case EEMPTY:
+                        return "Resource is empty";
+                default:
+                        break;
+        }
+
+        snprintf(noerr, NOERR_LEN, "Unkown error code %d", e);
         return noerr;
 }