Switch to the new afs.

[paraslash.git] / error.h

diff --git a/error.h b/error.h
index d7a6d03190328bd085f2980795573ce1ae61d694..b6670df856ca444da821e9c63637a5bb64e15d08 100644 (file)
--- a/error.h
+++ b/error.h
@@ -64,9 +64,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 +94,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 +104,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"), \
 
 
@@ -264,8 +260,6 @@ extern const char **para_errlist[];
 #define SIGNAL_ERRORS \
        PARA_ERROR(SIGNAL_SIG_ERR, "signal() retured SIG_ERR"), \
        PARA_ERROR(SIGNAL_READ, "read error from signal pipe"), \
-       PARA_ERROR(WAITPID, "waitpid error"), \
-       PARA_ERROR(SIGNAL_PIPE, "failed to setup signal pipe"), \
 
 
 #define STRING_ERRORS \
@@ -317,6 +311,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,9 +406,11 @@ extern const char **para_errlist[];
 #define FD_ERRORS \
        PARA_ERROR(FGETS, "fgets error"), \
        PARA_ERROR(CHDIR, "failed to change directory"), \
-       PARA_ERROR(FCHDIR, "fchdir failed"), \
        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 \