X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=error.h;h=4cd12eb0ab17842a309b04374028bea04921f47e;hp=41ea245912f6e30d46fac54467447988bb0ffb37;hb=a8beedcaa6f25a0dda36975a30a65a2038df6e30;hpb=68e0489ae1fe946162d9cedb7767513f2d4ea8d2 diff --git a/error.h b/error.h index 41ea2459..4cd12eb0 100644 --- a/error.h +++ b/error.h @@ -13,7 +13,6 @@ DEFINE_ERRLIST_OBJECT_ENUM; /* these do not need error handling (yet) */ #define SERVER_ERRORS -#define CLIENT_ERRORS #define WAV_ERRORS #define COMPRESS_ERRORS #define TIME_ERRORS @@ -28,10 +27,21 @@ DEFINE_ERRLIST_OBJECT_ENUM; #define RECV_ERRORS #define SEND_COMMON_ERRORS #define STDOUT_ERRORS +#define IPC_ERRORS +#define AMP_FILTER_ERRORS + extern const char **para_errlist[]; +#define FADE_ERRORS \ + PARA_ERROR(FADE_SYNTAX, "fade syntax error"), \ + + +#define CLIENT_ERRORS \ + PARA_ERROR(TASK_STARTED, "task started"), \ + + #define AFH_ERRORS \ PARA_ERROR(AFH_SYNTAX, "afh syntax error"), \ PARA_ERROR(AFH_SHORT_WRITE, "afh short write"), \ @@ -96,7 +106,6 @@ extern const char **para_errlist[]; PARA_ERROR(AFS_SYNTAX, "afs syntax error"), \ PARA_ERROR(AFS_SIGNAL, "afs caught deadly signal"), \ PARA_ERROR(AFS_SOCKET, "afs socket not writable"), \ - PARA_ERROR(AFS_PARENT_DIED, "fatal: server process terminated"), \ PARA_ERROR(AFS_SHORT_READ, "short read from afs socket"), \ @@ -160,6 +169,7 @@ extern const char **para_errlist[]; PARA_ERROR(CLIENT_SYNTAX, "syntax error"), \ PARA_ERROR(INVALID_CHALLENGE, "did not receive valid challenge"), \ PARA_ERROR(NO_CONFIG, "config file not found"), \ + PARA_ERROR(BAD_CONFIG, "syntax error in config file"), \ PARA_ERROR(CLIENT_AUTH, "authentication failed"), \ PARA_ERROR(SERVER_EOF, "connection closed by para_server"), \ @@ -273,7 +283,6 @@ extern const char **para_errlist[]; #define EXEC_ERRORS \ PARA_ERROR(DUP_PIPE, "exec error: can not create pipe"), \ - PARA_ERROR(NULL_OPEN, "can not open /dev/null"), \ #define MP3_AFH_ERRORS \ @@ -337,15 +346,6 @@ extern const char **para_errlist[]; PARA_ERROR(BAD_USER, "you don't exist. Go away."), \ -#define IPC_ERRORS \ - PARA_ERROR(SEM_GET, "failed to create semaphore"), \ - PARA_ERROR(SEM_REMOVE, "can not remove semaphore"), \ - PARA_ERROR(SHM_GET, "failed to allocate shared memory area"), \ - PARA_ERROR(SHM_DESTROY, "failed to destroy shared memory area"), \ - PARA_ERROR(SHM_ATTACH, "can not attach shared memory area"), \ - PARA_ERROR(SHM_DETACH, "can not detach shared memory area"), \ - - #define DCCP_RECV_ERRORS \ PARA_ERROR(DCCP_OVERRUN, "dccp output buffer buffer overrun"), \ @@ -357,7 +357,6 @@ extern const char **para_errlist[]; PARA_ERROR(FGETS, "fgets error"), \ PARA_ERROR(EMPTY, "file empty"), \ PARA_ERROR(MMAP, "mmap error"), \ - PARA_ERROR(MUNMAP, "munmap failed"), \ #define WRITE_ERRORS \