X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=error.h;h=c3cde04c4902ce94c816a43bce5f572b4330f436;hp=ed905a108dffe5be44e4cc8051da0582e144262b;hb=6c23fdee5292a8bf55dc963cfc3d0711b0f7424b;hpb=0a5226b8f6b9131024893f35de615d0b829afe27 diff --git a/error.h b/error.h index ed905a10..c3cde04c 100644 --- a/error.h +++ b/error.h @@ -19,7 +19,6 @@ DEFINE_ERRLIST_OBJECT_ENUM; #define GUI_ERRORS #define RINGBUFFER_ERRORS #define SCORE_ERRORS -#define SHA1_ERRORS #define RBTREE_ERRORS #define RECV_ERRORS #define IPC_ERRORS @@ -103,7 +102,6 @@ extern const char **para_errlist[]; PARA_ERROR(BAD_SAMPLE_FORMAT, "sample format not supported"), \ PARA_ERROR(BAD_CHANNEL_COUNT, "channel count not supported"), \ PARA_ERROR(BAD_SAMPLERATE, "sample rate not supported"), \ - PARA_ERROR(OSS_EOF, "oss: end of file"), \ #define COMPRESS_FILTER_ERRORS \ @@ -230,8 +228,6 @@ extern const char **para_errlist[]; #define SCHED_ERRORS \ - PARA_ERROR(TASK_KILLED, "task killed"), \ - PARA_ERROR(NO_SUCH_TASK, "task not found"), \ PARA_ERROR(NOT_INITIALIZED, "scheduler not yet initialized"), \ PARA_ERROR(SCHED_SHUTDOWN, "scheduler was shut down"), \ @@ -276,7 +272,6 @@ extern const char **para_errlist[]; #define AUDIOD_COMMAND_ERRORS \ PARA_ERROR(CLIENT_WRITE, "client write error"), \ - PARA_ERROR(AUDIOD_SYNTAX, "syntax error"), \ PARA_ERROR(UCRED_PERM, "permission denied"), \ PARA_ERROR(INVALID_AUDIOD_CMD, "invalid command"), \ PARA_ERROR(TOO_MANY_CLIENTS, "maximal number of stat clients exceeded"), \ @@ -369,6 +364,8 @@ extern const char **para_errlist[]; PARA_ERROR(DECRYPT, "decrypt error"), \ PARA_ERROR(BLINDING, "failed to activate key blinding"), \ PARA_ERROR(KEY_PERM, "unprotected private key"), \ + PARA_ERROR(BASE64, "failed to base64-decode ssh private key"), \ + PARA_ERROR(BIGNUM, "bignum error"), \ #define COMMAND_ERRORS \ @@ -396,7 +393,6 @@ extern const char **para_errlist[]; #define WRITE_ERRORS \ PARA_ERROR(WRITE_SYNTAX, "para_write syntax error"), \ - PARA_ERROR(NO_WAV_HEADER, "wave header not found"), \ #define ALSA_WRITE_ERRORS \ @@ -414,12 +410,11 @@ extern const char **para_errlist[]; PARA_ERROR(SET_RATE, "snd_pcm_hw_params_set_rate_near failed"), \ PARA_ERROR(START_THRESHOLD, "snd_pcm_sw_params_set_start_threshold() failed"), \ PARA_ERROR(STOP_THRESHOLD, "snd_pcm_sw_params_set_stop_threshold() failed"), \ - PARA_ERROR(ALSA_EOF, "alsa: end of file"), \ - #define WRITE_COMMON_ERRORS \ PARA_ERROR(WRITE_COMMON_SYNTAX, "syntax error in write option"), \ + PARA_ERROR(WRITE_COMMON_EOF, "end of file"), \ #define AACDEC_FILTER_ERRORS \