X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=error.h;h=060268dbf04d07270e48cc12e07bde702535543b;hb=77264e47dcd6a606ecff2f86f14359f25ab0eba0;hp=d82fe68efed6a99aef8700b9e634ec16871c72d2;hpb=471684761a2039bbc89aa1e3c33c62de6bef86cf;p=paraslash.git diff --git a/error.h b/error.h index d82fe68e..060268db 100644 --- a/error.h +++ b/error.h @@ -43,7 +43,7 @@ enum para_subsystem { SS_CRYPT, SS_HTTP_SEND, SS_ORTP_SEND, - SS_AFS, + SS_AFS_COMMON, SS_OGG_AFH, SS_MP3_AFH, SS_AAC_AFH, @@ -63,6 +63,7 @@ enum para_subsystem { SS_FILE_WRITE, SS_OSX_WRITE, SS_USER_LIST, + SS_CHUNK_QUEUE, NUM_SS }; @@ -275,9 +276,10 @@ extern const char **para_errlist[]; #define VSS_ERRORS \ PARA_ERROR(AUDIO_FORMAT, "audio format not recognized"), \ + PARA_ERROR(CHUNK, "unable to get chunk"), \ -#define AFS_ERRORS \ +#define AFS_COMMON_ERRORS \ PARA_ERROR(GETCWD, "can not get current working directory"), \ PARA_ERROR(CHDIR, "can not change directory"), \ PARA_ERROR(OPENDIR, "can not open directory"), \ @@ -294,8 +296,8 @@ extern const char **para_errlist[]; #define HTTP_SEND_ERRORS \ - PARA_ERROR(QUEUE, "packet queue overrun"), \ PARA_ERROR(WRITE_OK, "can not check whether fd is writable"), \ + PARA_ERROR(SEND_QUEUED_CHUNK, "failed to send queued chunk"), \ #define RANDOM_SELECTOR_ERRORS \ @@ -420,6 +422,10 @@ extern const char **para_errlist[]; PARA_ERROR(AAC_OVERRUN, "aac output buffer overrun"), \ +#define CHUNK_QUEUE_ERRORS \ + PARA_ERROR(QUEUE, "packet queue overrun"), \ + + /** * the subsystem shift * @@ -531,7 +537,7 @@ SS_ENUM(PLAYLIST_SELECTOR); SS_ENUM(CRYPT); SS_ENUM(HTTP_SEND); SS_ENUM(ORTP_SEND); -SS_ENUM(AFS); +SS_ENUM(AFS_COMMON); SS_ENUM(MYSQL_SELECTOR); SS_ENUM(IPC); SS_ENUM(DCCP); @@ -548,6 +554,7 @@ SS_ENUM(CLIENT); SS_ENUM(CLIENT_COMMON); SS_ENUM(AUDIOC); SS_ENUM(USER_LIST); +SS_ENUM(CHUNK_QUEUE); /** \endcond */ #undef PARA_ERROR /* rest of the world only sees the error text */