X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=error.h;h=a24bf20c9319a5233bd71cfcc299444a81732805;hp=2cca4c2ef3d86c1d3c983661a342f8c2abb9c8a6;hb=6b935f552ebfe3a0a83ec9367deb2f42c1aff252;hpb=4d4379901a0a01859728d56795a7ab6ada9c876b diff --git a/error.h b/error.h index 2cca4c2e..a24bf20c 100644 --- a/error.h +++ b/error.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2009 Andre Noll + * Copyright (C) 2006-2010 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -16,7 +16,6 @@ DEFINE_ERRLIST_OBJECT_ENUM; #define TIME_ERRORS #define CLOSE_ON_FORK_ERRORS #define DAEMON_ERRORS -#define UDP_SEND_ERRORS #define GUI_ERRORS #define RINGBUFFER_ERRORS #define SCORE_ERRORS @@ -35,6 +34,7 @@ DEFINE_ERRLIST_OBJECT_ENUM; #define AUDIOD_COMMAND_LIST_ERRORS #define STDOUT_ERRORS #define FILE_WRITE_ERRORS +#define STDIN_ERRORS extern const char **para_errlist[]; @@ -89,7 +89,7 @@ extern const char **para_errlist[]; #define WAV_FILTER_ERRORS \ - PARA_ERROR(WAV_BAD_FC, "invalid filter chain configuration"), \ + PARA_ERROR(WAV_BAD_FC, "invalid filter configuration"), \ PARA_ERROR(WAV_EOF, "wav filter: end of file"), \ PARA_ERROR(WAV_SUCCESS, "successfully wrote wav header"), \ @@ -196,9 +196,6 @@ extern const char **para_errlist[]; #define AUDIOC_ERRORS \ PARA_ERROR(AUDIOC_SYNTAX, "audioc syntax error"), \ - PARA_ERROR(AUDIOC_READ, "audioc read error"), \ - PARA_ERROR(AUDIOC_WRITE, "audioc write error"), \ - PARA_ERROR(AUDIOC_OVERRUN, "audioc buffer overrun"), \ #define CLIENT_COMMON_ERRORS \ @@ -216,25 +213,23 @@ extern const char **para_errlist[]; PARA_ERROR(NOT_INITIALIZED, "scheduler not yet initialized"), \ -#define STDIN_ERRORS \ - PARA_ERROR(STDIN_EOF, "end of file"), \ - - - #define NET_ERRORS \ PARA_ERROR(NAME_TOO_LONG, "name too long for struct sockaddr_un"), \ - PARA_ERROR(ADDRESS_LOOKUP, "address lookup / socket creation failed"), \ + PARA_ERROR(ADDRESS_LOOKUP, "can not resolve requested address"),\ PARA_ERROR(CHMOD, "failed to set socket mode"), \ PARA_ERROR(SENDMSG, "sendmsg() failed"), \ PARA_ERROR(RECVMSG, "recvmsg() failed"), \ PARA_ERROR(SCM_CREDENTIALS, "did not receive SCM credentials"), \ - PARA_ERROR(RECV_PATTERN, "did not receive expected pattern"), \ #define UDP_RECV_ERRORS \ PARA_ERROR(UDP_SYNTAX, "udp_recv syntax error"), \ PARA_ERROR(UDP_OVERRUN, "output buffer overrun"), \ - PARA_ERROR(UDP_TIMEOUT, "timeout reading on UDP socket"), \ + + +#define UDP_SEND_ERRORS \ + PARA_ERROR(TARGET_EXISTS, "requested target is already present"),\ + PARA_ERROR(TARGET_NOT_FOUND, "requested target not found") #define HTTP_RECV_ERRORS \ @@ -280,8 +275,6 @@ extern const char **para_errlist[]; PARA_ERROR(OGGDEC_BADHEADER, "invalid vorbis bitstream header"), \ PARA_ERROR(OGGDEC_FAULT, "bug or heap/stack corruption"), \ PARA_ERROR(OGGDEC_BADLINK, "invalid stream section or requested link corrupt"), \ - PARA_ERROR(OGGDEC_SYNTAX, "syntax error in oggdec config"), \ - PARA_ERROR(OGGDEC_EOF, "oggdec: end of file"), \ #define GRAB_CLIENT_ERRORS \ @@ -376,6 +369,8 @@ extern const char **para_errlist[]; #define FD_ERRORS \ PARA_ERROR(FGETS, "fgets error"), \ + PARA_ERROR(EOF, "end of file"), \ + PARA_ERROR(READ_PATTERN, "did not read expected pattern"), \ #define WRITE_ERRORS \