Fix a couple of typos in error messages.

[paraslash.git] / error.h

diff --git a/error.h b/error.h
index b6670df856ca444da821e9c63637a5bb64e15d08..6c35ab4406c335ea2b4122485ed33275c433d28e 100644 (file)
--- a/error.h
+++ b/error.h
@@ -25,6 +25,7 @@ DEFINE_ERRLIST_OBJECT_ENUM;
 #define SCORE_ERRORS
 #define SHA1_ERRORS
 #define RECV_ERRORS
 #define SCORE_ERRORS
 #define SHA1_ERRORS
 #define RECV_ERRORS

+#define AFH_COMMON_ERRORS

 
 extern const char **para_errlist[];
 
 
 extern const char **para_errlist[];
 


@@ -69,7 +70,7 @@ extern const char **para_errlist[];
        PARA_ERROR(BUSY, "table is busy"), \
        PARA_ERROR(SHORT_TABLE, "table too short"), \
        PARA_ERROR(NO_MAGIC, "missing table header magic"), \
        PARA_ERROR(BUSY, "table is busy"), \
        PARA_ERROR(SHORT_TABLE, "table too short"), \
        PARA_ERROR(NO_MAGIC, "missing table header magic"), \

-       PARA_ERROR(VERSION_MISMATCH, "table version not suppoerted"), \
+       PARA_ERROR(VERSION_MISMATCH, "table version not supported"), \

        PARA_ERROR(BAD_COLUMN_NUM, "invalid column number"), \
        PARA_ERROR(BAD_TABLE_FLAGS, "invalid flags in table description"), \
        PARA_ERROR(BAD_ROW, "invalid row"), \
        PARA_ERROR(BAD_COLUMN_NUM, "invalid column number"), \
        PARA_ERROR(BAD_TABLE_FLAGS, "invalid flags in table description"), \
        PARA_ERROR(BAD_ROW, "invalid row"), \


@@ -83,18 +84,22 @@ extern const char **para_errlist[];
        PARA_ERROR(INPUT_TOO_LARGE, "input too large for stdin command"), \
        PARA_ERROR(AFS_SYNTAX, "afs syntax error"), \
        PARA_ERROR(AFS_SIGNAL, "afs caught deadly signal"), \
        PARA_ERROR(INPUT_TOO_LARGE, "input too large for stdin command"), \
        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"), \

 
 
 #define MOOD_ERRORS \
        PARA_ERROR(MOOD_SYNTAX, "mood syntax error"), \
        PARA_ERROR(NO_MOOD, "no mood available"), \
        PARA_ERROR(MOOD_LOADED, "mood loaded"), \
 
 
 #define MOOD_ERRORS \
        PARA_ERROR(MOOD_SYNTAX, "mood syntax error"), \
        PARA_ERROR(NO_MOOD, "no mood available"), \
        PARA_ERROR(MOOD_LOADED, "mood loaded"), \

-       PARA_ERROR(NOT_ADMISSIBLE, "file is not admussible"), \
+       PARA_ERROR(NOT_ADMISSIBLE, "file is not admissible"), \

 
 
 #define ATTRIBUTE_ERRORS \
        PARA_ERROR(ATTR_SYNTAX, "attribute syntax error"), \
        PARA_ERROR(NO_ATTRIBUTES, "no attributes defined yet"), \
 
 
 #define ATTRIBUTE_ERRORS \
        PARA_ERROR(ATTR_SYNTAX, "attribute syntax error"), \
        PARA_ERROR(NO_ATTRIBUTES, "no attributes defined yet"), \

+       PARA_ERROR(ATT_TABLE_FULL, "no more space left in attribute table"), \

 
 #define BLOB_ERRORS \
        PARA_ERROR(BLOB_SYNTAX, "blob syntax error"), \
 
 #define BLOB_ERRORS \
        PARA_ERROR(BLOB_SYNTAX, "blob syntax error"), \


@@ -109,7 +114,7 @@ extern const char **para_errlist[];
 
 
 #define AFT_ERRORS \
 
 
 #define AFT_ERRORS \

-       PARA_ERROR(BAD_AFSI, "invaid afs info"), \
+       PARA_ERROR(BAD_AFSI, "invaiid afs info"), \

        PARA_ERROR(LOCALTIME, "localtime() failed"), \
        PARA_ERROR(STRFTIME, "strftime() failed"), \
        PARA_ERROR(BAD_PATH, "invalid path"), \
        PARA_ERROR(LOCALTIME, "localtime() failed"), \
        PARA_ERROR(STRFTIME, "strftime() failed"), \
        PARA_ERROR(BAD_PATH, "invalid path"), \


@@ -169,35 +174,27 @@ extern const char **para_errlist[];
 
 
 #define NET_ERRORS \
 
 
 #define NET_ERRORS \

-       PARA_ERROR(SEND, "send error"), \
-       PARA_ERROR(RECV, "receive error"), \
-       PARA_ERROR(SOCKET, "socket error"), \

        PARA_ERROR(CONNECT, "connect error"), \
        PARA_ERROR(CONNECT, "connect error"), \

-       PARA_ERROR(ACCEPT, "accept error"), \
-       PARA_ERROR(SETSOCKOPT, "failed to set socket options"), \
-       PARA_ERROR(BIND, "bind error"), \

        PARA_ERROR(NAME_TOO_LONG, "name too long for struct sockaddr_un"), \
        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(NAME_TOO_LONG, "name too long for struct sockaddr_un"), \
        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(LISTEN, "listen error"), \

        PARA_ERROR(RECV_PATTERN, "did not receive expected pattern"), \
        PARA_ERROR(RECV_PATTERN, "did not receive expected pattern"), \

-       PARA_ERROR(HOST_INFO, "gethostbyname() failed"), \

 
 
 #define ORTP_RECV_ERRORS \
        PARA_ERROR(MSG_TO_BUF, "failed to extract rtp packet"), \
 
 
 #define ORTP_RECV_ERRORS \
        PARA_ERROR(MSG_TO_BUF, "failed to extract rtp packet"), \

-       PARA_ERROR(ORTP_SYNTAX, "ottp syntax error"), \
+       PARA_ERROR(ORTP_SYNTAX, "ortp syntax error"), \

        PARA_ERROR(TOO_MANY_BAD_CHUNKS, "too many consecutive bad chunks"), \
        PARA_ERROR(INVALID_HEADER, "invalid header packet"), \
        PARA_ERROR(TOO_MANY_BAD_CHUNKS, "too many consecutive bad chunks"), \
        PARA_ERROR(INVALID_HEADER, "invalid header packet"), \

-       PARA_ERROR(OVERRUN, "outout buffer overrun"), \
+       PARA_ERROR(OVERRUN, "output buffer overrun"), \

        PARA_ERROR(ORTP_RECV_EOF, "ortp_recv: end of file"), \
 
 
 #define HTTP_RECV_ERRORS \
        PARA_ERROR(HTTP_RECV_EOF, "http_recv: end of file"), \
        PARA_ERROR(ORTP_RECV_EOF, "ortp_recv: end of file"), \
 
 
 #define HTTP_RECV_ERRORS \
        PARA_ERROR(HTTP_RECV_EOF, "http_recv: end of file"), \

-       PARA_ERROR(HTTP_RECV_OVERRUN, "http_recv: outout buffer overrun"), \
+       PARA_ERROR(HTTP_RECV_OVERRUN, "http_recv: output buffer overrun"), \

 
 #define RECV_COMMON_ERRORS \
        PARA_ERROR(RECV_SYNTAX, "recv syntax error"), \
 
 #define RECV_COMMON_ERRORS \
        PARA_ERROR(RECV_SYNTAX, "recv syntax error"), \


@@ -258,7 +255,7 @@ extern const char **para_errlist[];
 
 
 #define SIGNAL_ERRORS \
 
 
 #define SIGNAL_ERRORS \

-       PARA_ERROR(SIGNAL_SIG_ERR, "signal() retured SIG_ERR"), \
+       PARA_ERROR(SIGNAL_SIG_ERR, "signal() returned SIG_ERR"), \

        PARA_ERROR(SIGNAL_READ, "read error from signal pipe"), \
 
 
        PARA_ERROR(SIGNAL_READ, "read error from signal pipe"), \
 
 


@@ -312,11 +309,7 @@ extern const char **para_errlist[];
        PARA_ERROR(AUDIO_FORMAT, "audio format not recognized"), \
        PARA_ERROR(CHUNK, "unable to get chunk"), \
        PARA_ERROR(SHORT_AFS_READ, "short read from afs socket"), \
        PARA_ERROR(AUDIO_FORMAT, "audio format not recognized"), \
        PARA_ERROR(CHUNK, "unable to get chunk"), \
        PARA_ERROR(SHORT_AFS_READ, "short read from afs socket"), \

-       PARA_ERROR(BAD_AFS_CODE, "received junk from afs"), \
-
-
-#define AFS_COMMON_ERRORS \
-       PARA_ERROR(LSTAT, "lstat error"), \
+       PARA_ERROR(NOFD, "did not receive open fd from afs"), \

 
 
 #define CRYPT_ERRORS \
 
 
 #define CRYPT_ERRORS \


@@ -333,33 +326,6 @@ extern const char **para_errlist[];
        PARA_ERROR(SEND_QUEUED_CHUNK, "failed to send queued chunk"), \
 
 
        PARA_ERROR(SEND_QUEUED_CHUNK, "failed to send queued chunk"), \
 
 

-#define RANDOM_SELECTOR_ERRORS \
-       PARA_ERROR(NOTHING_FOUND, "no audio files found"), \
-
-
-#define MYSQL_SELECTOR_ERRORS \
-       PARA_ERROR(MYSQL_SYNTAX, "mysql syntax error"), \
-       PARA_ERROR(NOTCONN, "not connected to mysql server"), \
-       PARA_ERROR(TOOBIG, "mysql: file too large"), \
-       PARA_ERROR(NAMETOOLONG, "mysql: name too long"), \
-       PARA_ERROR(QFAILED, "mysql query failed"), \
-       PARA_ERROR(NOROW, "row is NULL"), \
-       PARA_ERROR(NOATTS, "can not get attributes from mysql table"), \
-       PARA_ERROR(NORESULT, "error while fetching mysql result"), \
-       PARA_ERROR(EMPTY_RESULT, "result is empty"), \
-       PARA_ERROR(ESCAPE, "can not escape string"), \
-       PARA_ERROR(GET_AUDIO_FILE, "can not get current audio file"), \
-       PARA_ERROR(GET_STREAM, "can not get current stream"), \
-       PARA_ERROR(NO_STREAM, "no such stream"), \
-       PARA_ERROR(AUDIO_FILE, "no such audio file"), \
-       PARA_ERROR(GET_QUERY, "can not get query for specified stream"), \
-       PARA_ERROR(TMPFILE, "error while writing temporary file"), \
-       PARA_ERROR(META, "can not get meta data"), \
-       PARA_ERROR(MYSQL_INIT, "can not initialize mysql connection"), \
-       PARA_ERROR(NO_MYSQL_PASSWD, "fatal: no mysql passord given"), \
-       PARA_ERROR(NO_AF_DIR, "fatal: audio file directory not given"), \
-
-

 #define COMMAND_ERRORS \
        PARA_ERROR(COMMAND_SYNTAX, "syntax error in command"), \
        PARA_ERROR(AUTH, "did not receive auth request"), \
 #define COMMAND_ERRORS \
        PARA_ERROR(COMMAND_SYNTAX, "syntax error in command"), \
        PARA_ERROR(AUTH, "did not receive auth request"), \


@@ -373,10 +339,6 @@ extern const char **para_errlist[];
        PARA_ERROR(BAD_USER, "you don't exist. Go away."), \
 
 
        PARA_ERROR(BAD_USER, "you don't exist. Go away."), \
 
 

-#define PLAYLIST_SELECTOR_ERRORS \
-       PARA_ERROR(LOAD_PLAYLIST, "failed to load playlist"), \
-
-

 #define IPC_ERRORS \
        PARA_ERROR(SEM_GET, "failed to create semaphore"), \
        PARA_ERROR(SEM_REMOVE, "can not remove semaphore"), \
 #define IPC_ERRORS \
        PARA_ERROR(SEM_GET, "failed to create semaphore"), \
        PARA_ERROR(SEM_REMOVE, "can not remove semaphore"), \


@@ -535,8 +497,8 @@ static inline int is_errno(int val, int _errno)
 /**
  * activate errors for one subsystem.
  *
 /**
  * activate errors for one subsystem.
  *

- * Each executable needs only the error lists of those subssystems it is
- * actually linked with. We always reserve space for NUM_SS char ** pointers,
+ * Each executable needs only the error lists of those subsystems it is
+ * actually linked with. We always reserve space for NUM_SS char pointers,

  * but only init those of the needed subsystems. This macro is used by macros
  * in config.h (generated by configure).
  */
  * but only init those of the needed subsystems. This macro is used by macros
  * in config.h (generated by configure).
  */