X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=error.h;h=b970947704dffb401097a5ebe4d88a8624ad423a;hp=54d9426feaa72fac86ab8c4a27fd607f34731443;hb=63064b3d49037ab259b7c45479aad4d00a2eca91;hpb=a27ec6094608c05a9f87e445902c29d15ca11547

diff --git a/error.h b/error.h
index 54d9426f..b9709477 100644
--- a/error.h
+++ b/error.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2007 Andre Noll <maan@systemlinux.org>
  *
  *     This program is free software; you can redistribute it and/or modify
  *     it under the terms of the GNU General Public License as published by
@@ -63,7 +63,7 @@ enum para_subsystem {
 	SS_AACDEC,
 	SS_AAC_COMMON,
 	SS_SERVER,
-	SS_AFS,
+	SS_VSS,
 	SS_MYSQL_SELECTOR,
 	SS_IPC,
 	SS_DCCP,
@@ -74,10 +74,12 @@ enum para_subsystem {
 	SS_ALSA_WRITE,
 	SS_FILE_WRITE,
 	SS_OSX_WRITE,
+	SS_USER_LIST,
 	NUM_SS
 };
 
 /* these do not need error handling (yet) */
+#define SERVER_ERRORS
 #define CLIENT_ERRORS
 #define WAV_ERRORS
 #define COMPRESS_ERRORS
@@ -93,9 +95,8 @@ enum para_subsystem {
 extern const char **para_errlist[];
 /** \endcond */
 
-#define SERVER_ERRORS \
+#define USER_LIST_ERRORS \
 	PARA_ERROR(USERLIST, "failed to open user list file"), \
-	PARA_ERROR(BAD_USER, "you don't exist. Go away."), \
 
 
 #define OSX_WRITE_ERRORS \
@@ -201,6 +202,7 @@ extern const char **para_errlist[];
 	PARA_ERROR(AUDIOD_SYNTAX, "syntax error"), \
 	PARA_ERROR(UCRED_PERM, "permission denied"), \
 	PARA_ERROR(INVALID_AUDIOD_CMD, "invalid command"), \
+	PARA_ERROR(BAD_USER, "you don't exist. Go away."), \
 
 
 #define FILTER_CHAIN_ERRORS \
@@ -298,7 +300,7 @@ extern const char **para_errlist[];
 	PARA_ERROR(OGG_REPOS, "ogg repositioning error"), \
 
 
-#define AFS_ERRORS \
+#define VSS_ERRORS \
 	PARA_ERROR(AUDIO_FORMAT, "audio format not recognized"), \
 	PARA_ERROR(FSTAT, "failed to fstat() audio file"), \
 
@@ -516,7 +518,7 @@ extern const char **para_errlist[];
  */
 #define PARA_ERROR(err, msg) E_ ## err
 
-#define SS_NAME(ss) para_errlist[ss]? para_errlist[ss][0] : ""
+// #define SS_NAME(ss) para_errlist[ss]? para_errlist[ss][0] : ""
 
 /** \cond popcorn time */
 SS_ENUM(GUI);
@@ -550,7 +552,7 @@ SS_ENUM(OGG_AFH);
 SS_ENUM(AAC_AFH);
 SS_ENUM(AAC_COMMON);
 SS_ENUM(SERVER);
-SS_ENUM(AFS);
+SS_ENUM(VSS);
 SS_ENUM(COMMAND);
 SS_ENUM(RANDOM_SELECTOR);
 SS_ENUM(PLAYLIST_SELECTOR);
@@ -573,6 +575,7 @@ SS_ENUM(RINGBUFFER);
 SS_ENUM(CLIENT);
 SS_ENUM(CLIENT_COMMON);
 SS_ENUM(AUDIOC);
+SS_ENUM(USER_LIST);
 /** \endcond */
 #undef PARA_ERROR
 /* rest of the world only sees the error text */