X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=error.h;h=8f4f9bb134027956fbd438cd102be3fe5d1bea7e;hp=ea8f82c4fcfb62cddb299828f9ff730aa7cec7cc;hb=742be1f7334570492615fdf89ce46123e3f71886;hpb=950e111e883e974b5326aa2e5aa3da363de40ced

diff --git a/error.h b/error.h
index ea8f82c4..8f4f9bb1 100644
--- a/error.h
+++ b/error.h
@@ -1,13 +1,10 @@
-/*
- * Copyright (C) 2006 Andre Noll <maan@tuebingen.mpg.de>
- *
- * Licensed under the GPL v2. For licencing details see COPYING.
- */
+/* Copyright (C) 2006 Andre Noll <maan@tuebingen.mpg.de>, see file COPYING. */
 
 /** \file error.h List of error codes and messages. */
 
 /** Codes and messages. */
 #define PARA_ERRORS \
+	PARA_ERROR(SUCCESS, "success"), \
 	PARA_ERROR(AACDEC_INIT, "failed to init aac decoder"), \
 	PARA_ERROR(AAC_DECODE, "aac decode error"), \
 	PARA_ERROR(ACL_PERM, "access denied by acl"), \
@@ -16,7 +13,6 @@
 	PARA_ERROR(AFS_SHORT_READ, "short read from afs socket"), \
 	PARA_ERROR(AFS_SIGNAL, "afs caught deadly signal"), \
 	PARA_ERROR(AFS_SOCKET, "afs socket not writable"), \
-	PARA_ERROR(AFS_SYNTAX, "afs syntax error"), \
 	PARA_ERROR(AFT_SYNTAX, "audio file table syntax error"), \
 	PARA_ERROR(ALSA, "alsa error"), \
 	PARA_ERROR(ALSA_MIX_GET_VAL, "could not read control element state"), \
@@ -28,7 +24,6 @@
 	PARA_ERROR(AO_APPEND_OPTION, "ao append option: memory allocation failure"), \
 	PARA_ERROR(AO_BAD_DRIVER, "ao: invalid driver"), \
 	PARA_ERROR(AO_BAD_OPTION, "ao option is not of type key:value"), \
-	PARA_ERROR(AO_BAD_SAMPLE_FORMAT, "ao: unsigned sample formats not supported"), \
 	PARA_ERROR(AO_DEFAULT_DRIVER, "ao: no usable output device"), \
 	PARA_ERROR(AO_EOF, "ao: end of file"), \
 	PARA_ERROR(AO_FILE_NOT_SUPP, "ao: file io drivers not supported"), \
@@ -74,6 +69,7 @@
 	PARA_ERROR(BTR_EOF, "buffer tree: end of file"), \
 	PARA_ERROR(BTR_NAVAIL, "btr node: value currently unavailable"), \
 	PARA_ERROR(BTR_NO_CHILD, "btr node has no children"), \
+	PARA_ERROR(CHILD_CONTEXT, "now running in child context"), \
 	PARA_ERROR(CHMOD, "failed to set socket mode"), \
 	PARA_ERROR(CLIENT_SYNTAX, "syntax error"), \
 	PARA_ERROR(CLIENT_WRITE, "client write error"), \
@@ -137,6 +133,7 @@
 	PARA_ERROR(MAX_CLIENTS, "maximal number of clients exceeded"), \
 	PARA_ERROR(MISSING_COLON, "syntax error: missing colon"), \
 	PARA_ERROR(MOOD_SYNTAX, "mood syntax error"), \
+	PARA_ERROR(MOOD_PARSE, "mood parse error"), \
 	PARA_ERROR(MP3DEC_CORRUPT, "too many corrupt frames"), \
 	PARA_ERROR(MP3DEC_EOF, "mp3dec: end of file"), \
 	PARA_ERROR(MP3_INFO, "could not read mp3 info"), \
@@ -227,6 +224,7 @@
 	PARA_ERROR(TARGET_EXISTS, "requested target is already present"),\
 	PARA_ERROR(TARGET_NOT_FOUND, "requested target not found"), \
 	PARA_ERROR(TASK_STARTED, "task started"), \
+	PARA_ERROR(DEADLY_SIGNAL, "termination request by signal"), \
 	PARA_ERROR(TOO_MANY_CLIENTS, "maximal number of stat clients exceeded"), \
 	PARA_ERROR(UCRED_PERM, "permission denied"), \
 	PARA_ERROR(UDP_OVERRUN, "output buffer overrun"), \
@@ -256,8 +254,9 @@
 enum para_error_codes {PARA_ERRORS};
 #undef PARA_ERROR
 #define PARA_ERROR(err, msg) msg
-/** Array of error strings. */
+/** All .c files need the declararation of the array of error strings. */
 extern const char * const para_errlist[];
+/** Exactly one .c file per executable must define the array. */
 #define DEFINE_PARA_ERRLIST const char * const para_errlist[] = {PARA_ERRORS}
 
 /**
@@ -338,8 +337,8 @@ _static_inline_ int osl(int ret)
 /**
  * Wrapper for lopsub library calls.
  *
- * \param ret See osl().
- * \return See osl().
+ * \param ret See \ref osl().
+ * \return See \ref osl().
  */
 _static_inline_ int lls(int ret)
 {