Index: cdr/cdr_pgsql.c =================================================================== RCS file: /usr/cvsroot/asterisk/cdr/cdr_pgsql.c,v retrieving revision 1.10 diff -u -r1.10 cdr_pgsql.c --- cdr/cdr_pgsql.c 28 Jul 2004 18:42:35 -0000 1.10 +++ cdr/cdr_pgsql.c 1 Dec 2004 05:26:16 -0000 @@ -180,20 +180,13 @@ return 0; } -static int my_load_module(void) +static int process_my_load_module(struct ast_config *cfg) { int res; - struct ast_config *cfg; struct ast_variable *var; char *pgerror; 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"); if (!var) { /* nothing configured */ @@ -280,8 +273,6 @@ pgdbport = "5432"; } - ast_destroy(cfg); - ast_log(LOG_DEBUG,"cdr_pgsql: got hostname of %s\n",pghostname); ast_log(LOG_DEBUG,"cdr_pgsql: got port of %s\n",pgdbport); if (pgdbsock) @@ -308,6 +299,20 @@ 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) { return my_load_module();