kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-07 18:38:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

add missing config destroy (bug 2944)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/v1-0@4378 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2004-12-03 01:15:27 +00:00
parent 65d6be272d
commit a160a8c9d5
2 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES
View File

@@ -7,6 +7,8 @@
-- fix bug with supervised transfers -- fix bug with supervised transfers
-- chan_h323 -- chan_h323
-- fix compilation problem -- fix compilation problem
-- cdr_pgsql
-- fix memory leak when reading config
-- Numerous other minor bug fixes -- Numerous other minor bug fixes
Asterisk 1.0.2 Asterisk 1.0.2
-- Major bugfix release -- Major bugfix release

25
cdr/cdr_pgsql.c
View File

@@ -180,20 +180,13 @@ static int my_unload_module(void)
return 0; return 0;
} }
static int my_load_module(void) static int process_my_load_module(struct ast_config *cfg)
{ {
int res; int res;
struct ast_config *cfg;
struct ast_variable *var; struct ast_variable *var;
char *pgerror; char *pgerror;
char *tmp; char *tmp;
cfg = ast_load(config);
if (!cfg) {
ast_log(LOG_WARNING, "Unable to load config for PostgreSQL CDR's: %s\n", config);
return 0;
}
var = ast_variable_browse(cfg, "global"); var = ast_variable_browse(cfg, "global");
if (!var) { if (!var) {
/* nothing configured */ /* nothing configured */
@@ -280,8 +273,6 @@ static int my_load_module(void)
pgdbport = "5432"; pgdbport = "5432";
} }
ast_destroy(cfg);
ast_log(LOG_DEBUG,"cdr_pgsql: got hostname of %s\n",pghostname); ast_log(LOG_DEBUG,"cdr_pgsql: got hostname of %s\n",pghostname);
ast_log(LOG_DEBUG,"cdr_pgsql: got port of %s\n",pgdbport); ast_log(LOG_DEBUG,"cdr_pgsql: got port of %s\n",pgdbport);
if (pgdbsock) if (pgdbsock)
@@ -308,6 +299,20 @@ static int my_load_module(void)
return res; return res;
} }
static int my_load_module(void)
{
struct ast_config *cfg;
int res;
cfg = ast_load(config);
if (!cfg) {
ast_log(LOG_WARNING, "Unable to load config for PostgreSQL CDR's: %s\n", config);
return 0;
}
res = process_my_load_module(cfg);
ast_destroy(cfg);
return res;
}
int load_module(void) int load_module(void)
{ {
return my_load_module(); return my_load_module();