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

diff --git a/error.h b/error.h
index 54d9426f..732a5470 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
@@ -55,7 +55,7 @@ enum para_subsystem {
 	SS_CRYPT,
 	SS_HTTP_SEND,
 	SS_ORTP_SEND,
-	SS_DB,
+	SS_AFS,
 	SS_OGG_AFH,
 	SS_MP3_AFH,
 	SS_AAC_AFH,
@@ -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 \
@@ -262,8 +264,6 @@ extern const char **para_errlist[];
 
 
 #define MP3_AFH_ERRORS \
-	PARA_ERROR(FREAD, "fread error"), \
-	PARA_ERROR(FSEEK, "fseek error"), \
 	PARA_ERROR(FRAME, "invalid mp3 frame"), \
 	PARA_ERROR(FRAME_LENGTH, "invalid frame length"), \
 	PARA_ERROR(MP3_NO_FILE, "invalid mp3 file pointer"), \
@@ -274,11 +274,8 @@ extern const char **para_errlist[];
 
 
 #define AAC_AFH_ERRORS \
-	PARA_ERROR(AAC_REPOS, "aac repositioning error"), \
-	PARA_ERROR(AAC_READ, "aac read error"), \
 	PARA_ERROR(STSZ, "did not find stcz atom"), \
 	PARA_ERROR(MP4ASC, "audio spec config error"), \
-	PARA_ERROR(AAC_OVERRUN, "aac output buffer overrun"), \
 
 
 #define AAC_COMMON_ERRORS \
@@ -298,12 +295,13 @@ 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"), \
+	PARA_ERROR(EMPTY_CHUNK, "empty chunk"), \
 
 
-#define DB_ERRORS \
+#define AFS_ERRORS \
 	PARA_ERROR(GETCWD, "can not get current working directory"), \
 	PARA_ERROR(CHDIR, "can not change directory"), \
 	PARA_ERROR(OPENDIR, "can not open directory"), \
@@ -378,8 +376,6 @@ extern const char **para_errlist[];
 
 #define DCCP_ERRORS \
 	PARA_ERROR(DCCP_SOCKET, "can not create dccp socket"), \
-	PARA_ERROR(DCCP_PACKET_SIZE, "failed to set dccp packet size"), \
-	PARA_ERROR(DCCP_SERVICE, "could not get service code"), \
 	PARA_ERROR(DCCP_RECV_EOF, "dccp_recv: end of file"), \
 
 
@@ -399,6 +395,8 @@ extern const char **para_errlist[];
 	PARA_ERROR(F_GETFL, "failed to get fd flags"), \
 	PARA_ERROR(F_SETFL, "failed to set fd flags"), \
 	PARA_ERROR(FGETS, "fgets error"), \
+	PARA_ERROR(FSEEK, "fseek error"), \
+	PARA_ERROR(FREAD, "fread error"), \
 
 
 #define WRITE_ERRORS \
@@ -444,6 +442,7 @@ extern const char **para_errlist[];
 #define AACDEC_ERRORS \
 	PARA_ERROR(AACDEC_INIT, "failed to init aac decoder"), \
 	PARA_ERROR(AAC_DECODE, "aac decode error"), \
+	PARA_ERROR(AAC_OVERRUN, "aac output buffer overrun"), \
 
 
 /**
@@ -516,7 +515,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,14 +549,14 @@ 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);
 SS_ENUM(CRYPT);
 SS_ENUM(HTTP_SEND);
 SS_ENUM(ORTP_SEND);
-SS_ENUM(DB);
+SS_ENUM(AFS);
 SS_ENUM(MYSQL_SELECTOR);
 SS_ENUM(IPC);
 SS_ENUM(DCCP);
@@ -573,6 +572,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 */