From d9ea3082fb608935c72620e272f4b3e74b2c3a44 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Wed, 30 Jan 2013 22:00:32 +0100 Subject: ConfigData: add constructors/destructors --- src/ConfigData.cxx | 33 +++++---------------------------- 1 file changed, 5 insertions(+), 28 deletions(-) (limited to 'src/ConfigData.cxx') diff --git a/src/ConfigData.cxx b/src/ConfigData.cxx index b542dccd..67f93a4a 100644 --- a/src/ConfigData.cxx +++ b/src/ConfigData.cxx @@ -31,29 +31,12 @@ extern "C" { #include #include -struct config_param * -config_new_param(const char *value, int line) -{ - config_param *ret = new config_param(); - - if (!value) - ret->value = NULL; - else - ret->value = g_strdup(value); - - ret->line = line; +config_param::config_param(const char *_value, int _line) + :value(g_strdup(_value)), line(_line) {} - ret->used = false; - - return ret; -} - -void -config_param_free(struct config_param *param) +config_param::~config_param() { - g_free(param->value); - - delete param; + g_free(value); } void @@ -62,13 +45,7 @@ config_add_block_param(struct config_param * param, const char *name, { assert(config_get_block_param(param, name) == NULL); - param->block_params.push_back(block_param()); - struct block_param *bp = ¶m->block_params.back(); - - bp->name = name; - bp->value = value; - bp->line = line; - bp->used = false; + param->block_params.emplace_back(name, value, line); } const struct block_param * -- cgit v1.2.3