Remove some unused error codes.

Although E_AMP_SYNTAX and E_PREBUFFER_SYNTAX are assigned to a
variable, in both cases the variable is set to a different value
later without being used in between (detected by cppcheck).

diff --git a/amp_filter.c b/amp_filter.c
index e43e45f78386ee2957929aa3e09ad73ea90fd0c4..0b0cddbf78f892d483a163ad73768e33af849c1e 100644 (file)
--- a/amp_filter.c
+++ b/amp_filter.c
@@ -34,7 +34,7 @@ static void amp_close(struct filter_node *fn)
 static int amp_parse_config(int argc, char **argv, void **config)
 {
        struct amp_filter_args_info *conf = para_calloc(sizeof(*conf));
-       int ret = -E_AMP_SYNTAX;
+       int ret;
 
        amp_filter_cmdline_parser(argc, argv, conf);
        ret = -ERRNO_TO_PARA_ERROR(EINVAL);

diff --git a/error.h b/error.h
index 13f4f7c4749b9176041eea6a15ed168537b5bf3a..08fa8866a00845f9e77414d6cd0cb8a305ce8729 100644 (file)
--- a/error.h
+++ b/error.h
@@ -161,7 +161,6 @@ extern const char **para_errlist[];
 
 
 #define PREBUFFER_FILTER_ERRORS \
-       PARA_ERROR(PREBUFFER_SYNTAX, "syntax error in prebuffer filter config"), \
        PARA_ERROR(PREBUFFER_SUCCESS, "prebuffering complete"), \
 
 
@@ -210,7 +209,6 @@ extern const char **para_errlist[];
 
 
 #define AMP_FILTER_ERRORS \
-       PARA_ERROR(AMP_SYNTAX, "syntax error in amp filter config"), \
        PARA_ERROR(AMP_ZERO_AMP, "no amplification necessary"), \
        PARA_ERROR(AMP_EOF, "amp: end of file"), \
 
@@ -259,7 +257,6 @@ extern const char **para_errlist[];
 
 #define BLOB_ERRORS \
        PARA_ERROR(BLOB_SYNTAX, "blob syntax error"), \
-       PARA_ERROR(INPUT_TOO_LARGE, "input too large for stdin command"), \
 
 
 #define PLAYLIST_ERRORS \
@@ -301,7 +298,6 @@ extern const char **para_errlist[];
        PARA_ERROR(CLIENT_SYNTAX, "syntax error"), \
        PARA_ERROR(NO_CONFIG, "config file not found"), \
        PARA_ERROR(BAD_CONFIG, "syntax error in config file"), \
-       PARA_ERROR(CLIENT_AUTH, "authentication failed"), \
        PARA_ERROR(SERVER_EOF, "connection closed by para_server"), \
        PARA_ERROR(SERVER_CMD_SUCCESS, "command terminated successfully"), \
        PARA_ERROR(SERVER_CMD_FAILURE, "command failed"), \

diff --git a/prebuffer_filter.c b/prebuffer_filter.c
index 17a5b616f209b3d15cc7d73d5ff0027f6d236698..8f1a9faed722583e2f80b3057b8f63ab24a7626a 100644 (file)
--- a/prebuffer_filter.c
+++ b/prebuffer_filter.c
@@ -77,7 +77,7 @@ static int prebuffer_post_select(__a_unused struct sched *s, void *context)
 static int prebuffer_parse_config(int argc, char **argv, void **config)
 {
        struct prebuffer_filter_args_info *conf = para_calloc(sizeof(*conf));
-       int ret = -E_PREBUFFER_SYNTAX;
+       int ret;
 
        prebuffer_filter_cmdline_parser(argc, argv, conf);
        ret = -ERRNO_TO_PARA_ERROR(EINVAL);