Changeset 4793:a5f42917b666 in roaraudio for libroar/vs.c

Timestamp:

03/14/11 14:25:13 (13 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

Moved error string lookup from VS into error.c (pr1)

File:

• libroar/vs.c (modified) (1 diff)

libroar/vs.c

@@ -81 +81 @@
 
 const char * roar_vs_strerr(int error) {
- const struct {
-  int err;
-  const char * msg;
- } msgs[] = {
-  {ROAR_ERROR_NONE,        "No error"},
-  {ROAR_ERROR_PERM,        "Operation not permitted"},
-  {ROAR_ERROR_NOENT,       "No such object, file or directory"},
-  {ROAR_ERROR_BADMSG,      "Bad message"},
-  {ROAR_ERROR_BUSY,        "Device or resource busy"},
-  {ROAR_ERROR_CONNREFUSED, "Connection refused"},
-  {ROAR_ERROR_NOSYS,       "Function not implemented"},
-  {ROAR_ERROR_NOTSUP,      "Operation not supported"},
-  {ROAR_ERROR_PIPE,        "Broken pipe"},
-  {ROAR_ERROR_PROTO,       "Protocol error"},
-  {ROAR_ERROR_RANGE,       "Result too large or parameter out of range"},
-  {ROAR_ERROR_MSGSIZE,     "Message too long"},
-  {ROAR_ERROR_NOMEM,       "Not enough space"},
-  {ROAR_ERROR_INVAL,       "Invalid argument"},
-  {-1, NULL}
- };
- int i;
-
- for (i = 0; msgs[i].msg != NULL; i++)
-  if ( msgs[i].err == error )
-   return msgs[i].msg;
-
- return "(unknown)";
+ const char * ret = roar_error2str(error);
+
+ if ( ret == NULL )
+  return "(unknown)";
+
+ return ret;
 }