diff options
| -rw-r--r-- | src/conf.c | 27 | ||||
| -rw-r--r-- | src/conf.h | 4 | ||||
| -rw-r--r-- | test/run_encoder.c | 2 |
3 files changed, 16 insertions, 17 deletions
diff --git a/src/conf.c b/src/conf.c index ee5aaceb3..47a3bae9c 100644 --- a/src/conf.c +++ b/src/conf.c @@ -223,20 +223,13 @@ void config_global_check(void) } } -bool +void config_add_block_param(struct config_param * param, const char *name, - const char *value, int line, GError **error_r) + const char *value, int line) { struct block_param *bp; - bp = config_get_block_param(param, name); - if (bp != NULL) { - g_set_error(error_r, config_quark(), 0, - "\"%s\" first defined on line %i, and " - "redefined on line %i\n", name, - bp->line, line); - return false; - } + assert(config_get_block_param(param, name) == NULL); param->num_block_params++; @@ -250,8 +243,6 @@ config_add_block_param(struct config_param * param, const char *name, bp->value = g_strdup(value); bp->line = line; bp->used = false; - - return true; } static bool @@ -283,8 +274,16 @@ config_read_name_value(struct config_param *param, char *input, unsigned line, return false; } - return config_add_block_param(param, name, value, line, - error_r); + const struct block_param *bp = config_get_block_param(param, name); + if (bp != NULL) { + g_set_error(error_r, config_quark(), 0, + "\"%s\" is duplicate, first defined on line %i", + name, bp->line); + return false; + } + + config_add_block_param(param, name, value, line); + return true; } static struct config_param * diff --git a/src/conf.h b/src/conf.h index d460fb8dd..89995d1c5 100644 --- a/src/conf.h +++ b/src/conf.h @@ -210,8 +210,8 @@ G_GNUC_MALLOC struct config_param * config_new_param(const char *value, int line); -bool +void config_add_block_param(struct config_param * param, const char *name, - const char *value, int line, GError **error_r); + const char *value, int line); #endif diff --git a/test/run_encoder.c b/test/run_encoder.c index ce2928e26..5e6b158c6 100644 --- a/test/run_encoder.c +++ b/test/run_encoder.c @@ -75,7 +75,7 @@ int main(int argc, char **argv) } param = config_new_param(NULL, -1); - config_add_block_param(param, "quality", "5.0", -1, NULL); + config_add_block_param(param, "quality", "5.0", -1); encoder = encoder_init(plugin, param, &error); if (encoder == NULL) { |