diff options
author | Walter Doekes <walter+asterisk@wjd.nu> | 2012-04-17 18:57:40 +0000 |
---|---|---|
committer | Walter Doekes <walter+asterisk@wjd.nu> | 2012-04-17 18:57:40 +0000 |
commit | fc63e07135d645af0df8d393aa84c0ae3b7e1924 (patch) | |
tree | f40524fe8e0facf5542c6b02041bc1fc63eae66e /cdr | |
parent | 70c5ac6635062efe03b51fb6c7afd30c22028be9 (diff) |
Avoid cppcheck warnings; removing unused vars and a bit of cleanup.
Patch by: junky
Review: https://reviewboard.asterisk.org/r/1743/
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@362307 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'cdr')
-rw-r--r-- | cdr/cdr_pgsql.c | 3 | ||||
-rw-r--r-- | cdr/cdr_sqlite3_custom.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/cdr/cdr_pgsql.c b/cdr/cdr_pgsql.c index 4f495f429..61ab2b86f 100644 --- a/cdr/cdr_pgsql.c +++ b/cdr/cdr_pgsql.c @@ -448,7 +448,6 @@ static int unload_module(void) static int config_module(int reload) { - struct ast_variable *var; char *pgerror; struct columns *cur; PGresult *result; @@ -465,7 +464,7 @@ static int config_module(int reload) ast_mutex_lock(&pgsql_lock); - if (!(var = ast_variable_browse(cfg, "global"))) { + if (!ast_variable_browse(cfg, "global")) { ast_config_destroy(cfg); ast_mutex_unlock(&pgsql_lock); ast_log(LOG_NOTICE, "cdr_pgsql configuration contains no global section, skipping module %s.\n", diff --git a/cdr/cdr_sqlite3_custom.c b/cdr/cdr_sqlite3_custom.c index 4351c1e69..601234604 100644 --- a/cdr/cdr_sqlite3_custom.c +++ b/cdr/cdr_sqlite3_custom.c @@ -156,7 +156,6 @@ static int load_config(int reload) { struct ast_config *cfg; struct ast_flags config_flags = { reload ? CONFIG_FLAG_FILEUNCHANGED : 0 }; - struct ast_variable *mappingvar; const char *tmp; if ((cfg = ast_config_load(config_file, config_flags)) == CONFIG_STATUS_FILEMISSING || cfg == CONFIG_STATUS_FILEINVALID) { @@ -170,7 +169,7 @@ static int load_config(int reload) free_config(1); } - if (!(mappingvar = ast_variable_browse(cfg, "master"))) { + if (!ast_variable_browse(cfg, "master")) { /* Nothing configured */ ast_config_destroy(cfg); return -1; |