Skip to content
Snippets Groups Projects
Commit 6cb355ab authored by Olle Johansson's avatar Olle Johansson
Browse files

Formating changes

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@288992 65c4cc65-6c06-0410-ace0-fbb531ad65f3
parent 475cd60a
No related branches found
No related tags found
No related merge requests found
......@@ -341,18 +341,24 @@ static int unload_module(void)
PQfinish(conn);
if (pghostname)
if (pghostname) {
ast_free(pghostname);
if (pgdbname)
}
if (pgdbname) {
ast_free(pgdbname);
if (pgdbuser)
}
if (pgdbuser) {
ast_free(pgdbuser);
if (pgpassword)
}
if (pgpassword) {
ast_free(pgpassword);
if (pgdbport)
}
if (pgdbport) {
ast_free(pgdbport);
if (table)
}
if (table) {
ast_free(table);
}
AST_RWLIST_WRLOCK(&psql_columns);
while ((current = AST_RWLIST_REMOVE_HEAD(&psql_columns, list))) {
......@@ -376,8 +382,9 @@ static int config_module(int reload)
if ((cfg = ast_config_load(config, config_flags)) == NULL || cfg == CONFIG_STATUS_FILEINVALID) {
ast_log(LOG_WARNING, "Unable to load config for PostgreSQL CDR's: %s\n", config);
return -1;
} else if (cfg == CONFIG_STATUS_FILEUNCHANGED)
} else if (cfg == CONFIG_STATUS_FILEUNCHANGED) {
return 0;
}
if (!(var = ast_variable_browse(cfg, "global"))) {
ast_config_destroy(cfg);
......@@ -389,8 +396,9 @@ static int config_module(int reload)
tmp = ""; /* connect via UNIX-socket by default */
}
if (pghostname)
if (pghostname) {
ast_free(pghostname);
}
if (!(pghostname = ast_strdup(tmp))) {
ast_config_destroy(cfg);
return -1;
......@@ -401,8 +409,9 @@ static int config_module(int reload)
tmp = "asteriskcdrdb";
}
if (pgdbname)
if (pgdbname) {
ast_free(pgdbname);
}
if (!(pgdbname = ast_strdup(tmp))) {
ast_config_destroy(cfg);
return -1;
......@@ -413,8 +422,9 @@ static int config_module(int reload)
tmp = "asterisk";
}
if (pgdbuser)
if (pgdbuser) {
ast_free(pgdbuser);
}
if (!(pgdbuser = ast_strdup(tmp))) {
ast_config_destroy(cfg);
return -1;
......@@ -425,8 +435,9 @@ static int config_module(int reload)
tmp = "";
}
if (pgpassword)
if (pgpassword) {
ast_free(pgpassword);
}
if (!(pgpassword = ast_strdup(tmp))) {
ast_config_destroy(cfg);
return -1;
......@@ -437,8 +448,9 @@ static int config_module(int reload)
tmp = "5432";
}
if (pgdbport)
if (pgdbport) {
ast_free(pgdbport);
}
if (!(pgdbport = ast_strdup(tmp))) {
ast_config_destroy(cfg);
return -1;
......@@ -449,8 +461,9 @@ static int config_module(int reload)
tmp = "cdr";
}
if (table)
if (table) {
ast_free(table);
}
if (!(table = ast_strdup(tmp))) {
ast_config_destroy(cfg);
return -1;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment