error.h: new macro SS_NAME

expands to the name of the given subsystem.

diff --git a/error.h b/error.h
index 924f96076fce2b80bf78ef9e360b2497c0ec7d1f..59c9554a5bbaecc47780292b7b873c6f0ce76535 100644 (file)
--- a/error.h
+++ b/error.h
@@ -18,25 +18,28 @@
 
 /** \file error.h list of error messages for all subsystems */
 
-/** \cond list of all subsystems that support the shiny new error facility */
+/** \cond list of all subsystems that support the shiny error facility */
 enum para_subsystem {
+       SS_GUI,
+       SS_TIME,
+       SS_WAV,
+       SS_COMPRESS,
+       SS_CLOSE_ON_FORK,
+       SS_DAEMON,
+       SS_DCCP_SEND,
+       SS_RINGBUFFER,
        SS_RECV,
        SS_NET,
        SS_ORTP_RECV,
        SS_AUDIOD,
        SS_EXEC,
-       SS_CLOSE_ON_FORK,
        SS_SIGNAL,
        SS_STRING,
-       SS_DAEMON,
        SS_STAT,
-       SS_TIME,
        SS_GRAB_CLIENT,
        SS_HTTP_RECV,
        SS_RECV_COMMON,
        SS_FILTER_CHAIN,
-       SS_WAV,
-       SS_COMPRESS,
        SS_OGGDEC,
        SS_FILTER,
        SS_COMMAND,
@@ -58,16 +61,26 @@ enum para_subsystem {
        SS_IPC,
        SS_DCCP,
        SS_DCCP_RECV,
-       SS_DCCP_SEND,
        SS_FD,
-       SS_GUI,
        SS_WRITE,
        SS_WRITE_COMMON,
        SS_ALSA_WRITER,
        SS_FILE_WRITER,
-       SS_RINGBUFFER};
+       NUM_SS
+};
+
+/* these do not need error handling (yet) */
+#define SERVER_ERRORS
+#define WAV_ERRORS
+#define COMPRESS_ERRORS
+#define TIME_ERRORS
+#define CLOSE_ON_FORK_ERRORS
+#define DAEMON_ERRORS
+#define ORTP_SEND_ERRORS
+#define GUI_ERRORS
+#define RINGBUFFER_ERRORS
+
 
-#define NUM_SS (SS_RINGBUFFER + 1)
 extern const char **para_errlist[];
 /** \endcond */
 
@@ -281,6 +294,7 @@ extern const char **para_errlist[];
        PARA_ERROR(LOCK, "lock error"), \
        PARA_ERROR(SENDER_CMD, "command not supported by this sender"), \
 
+
 #define PLAYLIST_SELECTOR_ERRORS \
        PARA_ERROR(LOAD_PLAYLIST, "failed to load playlist"), \
 
@@ -348,25 +362,15 @@ extern const char **para_errlist[];
        PARA_ERROR(FW_WRITE, "file writer write error"), \
        PARA_ERROR(FW_OPEN, "file writer: can not open output file"), \
 
+
 #define WRITE_COMMON_ERRORS \
        PARA_ERROR(WRITE_COMMON_SYNTAX, "syntax error in write option"), \
 
+
 #define AACDEC_ERRORS \
        PARA_ERROR(AACDEC_INIT, "failed to init aac decoder"), \
        PARA_ERROR(AAC_DECODE, "aac decode error"), \
 
-/* these do not need error handling (yet) */
-#define SERVER_ERRORS
-#define WAV_ERRORS
-#define COMPRESS_ERRORS
-#define TIME_ERRORS
-#define CLOSE_ON_FORK_ERRORS
-#define DAEMON_ERRORS
-#define ORTP_SEND_ERRORS
-#define GUI_ERRORS
-#define RINGBUFFER_ERRORS
-
-
 /**
  * the subsystem shift
  *
@@ -402,9 +406,9 @@ extern const char **para_errlist[];
 /**
  * determine the index of an error number
  *
- * Also easy: It's the lower 8 bits of num - 1.
+ * Also easy: It's the lower 8 bits of num.
  */
-#define ERRNUM_TO_INDEX(num) (((1 << SS_SHIFT) - 1) & ((num) - 1))
+#define ERRNUM_TO_INDEX(num) (((1 << SS_SHIFT) - 1) & (num))
 
 /**
  * paraslash's version of strerror(3)
@@ -415,45 +419,49 @@ extern const char **para_errlist[];
 
 /**
  * define the error list for one subsystem
- *
+ #
+ * The first entry (index 0) is always the name of the subsystem
  * Used by macros in config.h (generated by configure)
  */
-#define DEFINE_ERRLIST(ss) const char * ss ## _ERRLIST[] = {ss ## _ERRORS}
+#define DEFINE_ERRLIST(ss) const char * ss ## _ERRLIST[] = {#ss, ss ## _ERRORS}
 
 /**
  * activate errors for one subsystem.
  *
- * Each executable needs only the error lists of those subssystems it is actually
- * linked with. We always reserve zeroed-out space for NUM_SS char ** pointers, but
- * only init those of the needed subsystems. This macro is used by macros in config.h
- * (generated by configure).
+ * Each executable needs only the error lists of those subssystems it is
+ * actually linked with. We always reserve space for NUM_SS char ** pointers,
+ * but only init those of the needed subsystems. This macro is used by macros
+ * in config.h (generated by configure).
  */
 #define PARA_ERRLIST(ss) [SS_ ## ss] = ss ## _ERRLIST
 
 /**
- * This is temporarily defined to expand to its second argument (prefixed by
+ * This is temporarily defined to expand to its first argument (prefixed by
  * 'E_') and gets later redefined to expand to the error text only
  */
 #define PARA_ERROR(err, msg) E_ ## err
 
+#define SS_NAME(ss) para_errlist[ss]? para_errlist[ss][0] : ""
+
 /** \cond popcorn time */
+SS_ENUM(GUI);
+SS_ENUM(WAV);
+SS_ENUM(COMPRESS);
+SS_ENUM(TIME);
+SS_ENUM(CLOSE_ON_FORK);
 SS_ENUM(ORTP_RECV);
 SS_ENUM(NET);
 SS_ENUM(RECV);
 SS_ENUM(AUDIOD);
 SS_ENUM(EXEC);
-SS_ENUM(CLOSE_ON_FORK);
 SS_ENUM(SIGNAL);
 SS_ENUM(STRING);
 SS_ENUM(DAEMON);
 SS_ENUM(STAT);
-SS_ENUM(TIME);
 SS_ENUM(GRAB_CLIENT);
 SS_ENUM(HTTP_RECV);
 SS_ENUM(RECV_COMMON);
 SS_ENUM(FILTER_CHAIN);
-SS_ENUM(WAV);
-SS_ENUM(COMPRESS);
 SS_ENUM(OGGDEC);
 SS_ENUM(MP3DEC);
 SS_ENUM(AACDEC);
@@ -477,7 +485,6 @@ SS_ENUM(DCCP);
 SS_ENUM(DCCP_RECV);
 SS_ENUM(DCCP_SEND);
 SS_ENUM(FD);
-SS_ENUM(GUI);
 SS_ENUM(WRITE);
 SS_ENUM(WRITE_COMMON);
 SS_ENUM(ALSA_WRITER);