X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=error.h;h=b94139e38b013cec2bd5cbbcb954f04ee2708c72;hp=0f83398e7aae6333446ee45555a0fd91879e152f;hb=c4b1b0d61d89e027582aaf87aa9fc737ff5554ff;hpb=6f05bb12b7d9d2cfbd419e2709bafde27da1b21b

diff --git a/error.h b/error.h
index 0f83398e..b94139e3 100644
--- a/error.h
+++ b/error.h
@@ -74,6 +74,7 @@ enum para_subsystem {
 	SS_ALSA_WRITE,
 	SS_FILE_WRITE,
 	SS_OSX_WRITE,
+	SS_USER_LIST,
 	NUM_SS
 };
 
@@ -94,6 +95,11 @@ enum para_subsystem {
 extern const char **para_errlist[];
 /** \endcond */
 
+#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 \
 	PARA_ERROR(STREAM_FORMAT, "could not set stream format"), \
 	PARA_ERROR(ADD_CALLBACK, "can not add callback"), \
@@ -321,7 +327,6 @@ extern const char **para_errlist[];
 
 
 #define RANDOM_SELECTOR_ERRORS \
-	PARA_ERROR(FILE_COUNT, "audio file count exceeded"), \
 	PARA_ERROR(NOTHING_FOUND, "no audio files found"), \
 
 
@@ -355,8 +360,6 @@ extern const char **para_errlist[];
 	PARA_ERROR(NO_AUDIO_FILE, "no audio file"), \
 	PARA_ERROR(BAD_CMD, "invalid command"), \
 	PARA_ERROR(PERM, "permission denied"), \
-	PARA_ERROR(USERLIST, "failed to open user list file"), \
-	PARA_ERROR(BAD_USER, "you don't exist. Go away."), \
 	PARA_ERROR(LOCK, "lock error"), \
 	PARA_ERROR(SENDER_CMD, "command not supported by this sender"), \
 	PARA_ERROR(SERVER_CRASH, "para_server crashed -- can not live without it"), \
@@ -397,6 +400,7 @@ extern const char **para_errlist[];
 #define FD_ERRORS \
 	PARA_ERROR(F_GETFL, "failed to get fd flags"), \
 	PARA_ERROR(F_SETFL, "failed to set fd flags"), \
+	PARA_ERROR(FGETS, "fgets error"), \
 
 
 #define WRITE_ERRORS \
@@ -571,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 */