projects
/
paraslash.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix gcc warnings on shadowed declarations
[paraslash.git]
/
error.h
diff --git
a/error.h
b/error.h
index 7d10ff23a4cf10d7d57bd44c6234230dce97bd7c..78e3242cdd71b0d5484033d671b24088e735bf91 100644
(file)
--- a/
error.h
+++ b/
error.h
@@
-20,6
+20,7
@@
/** \cond list of all subsystems that support the shiny error facility */
enum para_subsystem {
/** \cond list of all subsystems that support the shiny error facility */
enum para_subsystem {
+ SS_CLIENT,
SS_GUI,
SS_TIME,
SS_WAV,
SS_GUI,
SS_TIME,
SS_WAV,
@@
-31,7
+32,7
@@
enum para_subsystem {
SS_RECV,
SS_NET,
SS_ORTP_RECV,
SS_RECV,
SS_NET,
SS_ORTP_RECV,
- SS_CLIENT,
+ SS_CLIENT
_COMMON
,
SS_AUDIOC,
SS_SCHED,
SS_AUDIOD,
SS_AUDIOC,
SS_SCHED,
SS_AUDIOD,
@@
-77,6
+78,7
@@
enum para_subsystem {
/* these do not need error handling (yet) */
#define SERVER_ERRORS
/* these do not need error handling (yet) */
#define SERVER_ERRORS
+#define CLIENT_ERRORS
#define WAV_ERRORS
#define COMPRESS_ERRORS
#define TIME_ERRORS
#define WAV_ERRORS
#define COMPRESS_ERRORS
#define TIME_ERRORS
@@
-100,16
+102,22
@@
extern const char **para_errlist[];
PARA_ERROR(AUDIOC_OVERRUN, "audioc buffer overrun"), \
PARA_ERROR(AUDIOC_OVERRUN, "audioc buffer overrun"), \
-#define CLIENT_ERRORS \
+
+
+#define CLIENT_COMMON_ERRORS \
PARA_ERROR(CLIENT_SYNTAX, "syntax error"), \
PARA_ERROR(INVALID_CHALLENGE, "did not receive valid challenge"), \
PARA_ERROR(CLIENT_SYNTAX, "syntax error"), \
PARA_ERROR(INVALID_CHALLENGE, "did not receive valid challenge"), \
- PARA_ERROR(CLIENT_AUTH, "authentication failed"), \
- PARA_ERROR(SHORT_CLIENT_WRITE, "short client write"), \
PARA_ERROR(NO_CONFIG, "config file not found"), \
PARA_ERROR(NO_CONFIG, "config file not found"), \
+ PARA_ERROR(CLIENT_AUTH, "authentication failed"), \
+ PARA_ERROR(SERVER_EOF, "connection closed by para_server"), \
+ PARA_ERROR(INPUT_EOF, "end of input"), \
+ PARA_ERROR(HANDSHAKE_COMPLETE, ""), /* not really an error */ \
+
#define SCHED_ERRORS \
PARA_ERROR(TASK_KILLED, "task killed"), \
PARA_ERROR(NO_SUCH_TASK, "task not found"), \
#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"), \
#define STDIN_ERRORS \
#define STDIN_ERRORS \
@@
-548,6
+556,7
@@
SS_ENUM(ALSA_WRITER);
SS_ENUM(FILE_WRITER);
SS_ENUM(RINGBUFFER);
SS_ENUM(CLIENT);
SS_ENUM(FILE_WRITER);
SS_ENUM(RINGBUFFER);
SS_ENUM(CLIENT);
+SS_ENUM(CLIENT_COMMON);
SS_ENUM(AUDIOC);
/** \endcond */
#undef PARA_ERROR
SS_ENUM(AUDIOC);
/** \endcond */
#undef PARA_ERROR