X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=error.h;h=9d1f7bb08c8f8f9815ae7744a65c2db89853e9ce;hp=40cccd5691ab537eb3cdd227e76971be68c4ef6a;hb=28afc7781a88734d8954cab3665eb3eacd11c284;hpb=6751fdf54c240791298420b3034a32aa9cdc4200

diff --git a/error.h b/error.h
index 40cccd56..9d1f7bb0 100644
--- a/error.h
+++ b/error.h
@@ -25,6 +25,7 @@ DEFINE_ERRLIST_OBJECT_ENUM;
 #define SCORE_ERRORS
 #define SHA1_ERRORS
 #define RECV_ERRORS
+#define AFH_COMMON_ERRORS
 
 extern const char **para_errlist[];
 
@@ -64,9 +65,6 @@ extern const char **para_errlist[];
 	PARA_ERROR(STAT, "can not stat file"), \
 	PARA_ERROR(FSTAT, "fstat error"), \
 	PARA_ERROR(RENAME, "rename failed"), \
-	PARA_ERROR(EMPTY, "file empty"), \
-	PARA_ERROR(MMAP, "mmap error"), \
-	PARA_ERROR(MUNMAP, "munmap failed"), \
 	PARA_ERROR(WRITE, "write error"), \
 	PARA_ERROR(LSEEK, "lseek error"), \
 	PARA_ERROR(BUSY, "table is busy"), \
@@ -97,8 +95,6 @@ extern const char **para_errlist[];
 
 #define ATTRIBUTE_ERRORS \
 	PARA_ERROR(ATTR_SYNTAX, "attribute syntax error"), \
-	PARA_ERROR(ATTR_EXISTS, "attribute already exists"), \
-	PARA_ERROR(ATTR_TABLE_FULL, "attribute table full"), \
 	PARA_ERROR(NO_ATTRIBUTES, "no attributes defined yet"), \
 
 #define BLOB_ERRORS \
@@ -109,6 +105,7 @@ extern const char **para_errlist[];
 #define PLAYLIST_ERRORS \
 	PARA_ERROR(NO_PLAYLIST, "no valid playlist found"), \
 	PARA_ERROR(PLAYLIST_LOADED, ""), /* not really an error */ \
+	PARA_ERROR(PATH_FOUND, ""), /* not really an error */ \
 	PARA_ERROR(PLAYLIST_EMPTY, "attempted to load empty playlist"), \
 
 
@@ -315,6 +312,8 @@ extern const char **para_errlist[];
 	PARA_ERROR(BAD_AUDIO_FILE_SUFFIX, "unknown suffix"), \
 	PARA_ERROR(AUDIO_FORMAT, "audio format not recognized"), \
 	PARA_ERROR(CHUNK, "unable to get chunk"), \
+	PARA_ERROR(SHORT_AFS_READ, "short read from afs socket"), \
+	PARA_ERROR(BAD_AFS_CODE, "received junk from afs"), \
 
 
 #define AFS_COMMON_ERRORS \
@@ -410,6 +409,9 @@ extern const char **para_errlist[];
 	PARA_ERROR(CHDIR, "failed to change directory"), \
 	PARA_ERROR(OPEN, "failed to open file"), \
 	PARA_ERROR(CHDIR_PERM, "insufficient permissions to chdir"), \
+	PARA_ERROR(EMPTY, "file empty"), \
+	PARA_ERROR(MMAP, "mmap error"), \
+	PARA_ERROR(MUNMAP, "munmap failed"), \
 
 
 #define WRITE_ERRORS \