Changeset 5371:309ea408873b in roaraudio

Timestamp:

12/21/11 18:58:36 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added new error codes

Files:

• include/roaraudio/error.h (modified) (1 diff)
• libroar/error.c (modified) (2 diffs)
• libroar/roardl.c (modified) (2 diffs)

include/roaraudio/error.h

@@ -118 +118 @@
 #define ROAR_ERROR_CONNRSTNET  96 /* Connection reset by network */
 #define ROAR_ERROR_CONNABORTED 97 /* Connection aborted */
+#define ROAR_ERROR_BADHOST     98 /* Bad host software or hardware */
+#define ROAR_ERROR_SWITCHPROTO 99 /* Switch protocol */
+#define ROAR_ERROR_MOVEDPERM  100 /* Moved Permanently */
+#define ROAR_ERROR_MOVEDTEMP  101 /* Moved Temporary */
+#define ROAR_ERROR_USEPROXY   102 /* Use Proxy server */
+#define ROAR_ERROR_SEEOTHER   103 /* See other resource */
+#define ROAR_ERROR_GONE       104 /* Resource gone */
 
 #endif

libroar/error.c

@@ -1056 +1056 @@
   {ROAR_ERROR_CONNRSTNET,  "Connection reset by network"},
   {ROAR_ERROR_CONNABORTED, "Connection aborted"},
+  {ROAR_ERROR_BADHOST,     "Bad host software or hardware"},
+  {ROAR_ERROR_SWITCHPROTO, "Switch protocol"},
+  {ROAR_ERROR_MOVEDPERM,   "Moved Permanently"},
+  {ROAR_ERROR_MOVEDTEMP,   "Moved Temporary"},
+  {ROAR_ERROR_USEPROXY,    "Use Proxy server"},
+  {ROAR_ERROR_SEEOTHER,    "See other resource"},
+  {ROAR_ERROR_GONE,        "Resource gone"},
   {-1, NULL}
  }, msgs_funny[] = {
@@ -1146 +1153 @@
 //  {ROAR_ERROR_CONNRSTNET,  "Connection reset by network"},
 //  {ROAR_ERROR_CONNABORTED, "Connection aborted"},
+//  {ROAR_ERROR_BADHOST,     "Bad host software or hardware"},
+//  {ROAR_ERROR_SWITCHPROTO, "Switch protocol"},
+//  {ROAR_ERROR_MOVEDPERM,   "Moved Permanently"},
+//  {ROAR_ERROR_MOVEDTEMP,   "Moved Temporary"},
+//  {ROAR_ERROR_USEPROXY,    "Use Proxy server"},
+//  {ROAR_ERROR_SEEOTHER,    "See other resource"},
+//  {ROAR_ERROR_GONE,        "Resource gone"},
   {-1, NULL}
  };
  int i;
 
- if ( config->opmode == ROAR_LIBROAR_CONFIG_OPMODE_MS )
-  for (i = 0; msgs[i].msg != NULL; i++)
-   if ( msgs[i].err == error )
+ if ( config->opmode == ROAR_LIBROAR_CONFIG_OPMODE_MS ) {
+  for (i = 0; msgs[i].msg != NULL; i++) {
+   if ( msgs[i].err == error ) {
     return roar_error2str_ms(error, msgs[i].msg);
+   }
+  }
+  return roar_error2str_ms(error, "<<<unknown error>>>");
+ }
 
  if ( config->opmode == ROAR_LIBROAR_CONFIG_OPMODE_FUNNY )

libroar/roardl.c

@@ -146 +146 @@
  // check if both appnames are NULL or non-NULL.
  if ( (para->appname == NULL && appname != NULL) || (para->appname != NULL && appname == NULL) ) {
-  roar_err_set(ROAR_ERROR_BADVERSION);
+  roar_err_set(ROAR_ERROR_BADHOST);
   return -1;
  }
@@ -152 +152 @@
  // check if the appname matches if given.
  if ( para->appname != NULL && !!strcmp(para->appname, appname) ) {
-  roar_err_set(ROAR_ERROR_BADVERSION);
+  roar_err_set(ROAR_ERROR_BADHOST);
   return -1;
  }