kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-31 18:55:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 202258 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r202258 | russell | 2009-06-21 11:00:23 -0500 (Sun, 21 Jun 2009) | 2 lines
  
  Standardize return values of load_config() so reload() doesn't report an error on success.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@202260 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2009-06-21 16:04:22 +00:00
parent a0e8f439bf
commit 6a6dad000d
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
cdr/cdr_manager.c
View File

@@ -59,8 +59,9 @@ static int load_config(int reload)
int newenablecdr = 0;
cfg = ast_config_load(CONF_FILE, config_flags);
if (cfg == CONFIG_STATUS_FILEUNCHANGED)
if (cfg == CONFIG_STATUS_FILEUNCHANGED) {
return 0;
}
if (reload && customfields) {
ast_free(customfields);
@@ -73,7 +74,7 @@ static int load_config(int reload)
if (enablecdr)
ast_cdr_unregister(name);
enablecdr = 0;
return 0;
return -1;
}
while ( (cat = ast_category_browse(cfg, cat)) ) {
@@ -112,7 +113,7 @@ static int load_config(int reload)
ast_cdr_register(name, "Asterisk Manager Interface CDR Backend", manager_log);
enablecdr = newenablecdr;
return 1;
return 0;
}
static int manager_log(struct ast_cdr *cdr)
@@ -185,9 +186,9 @@ static int unload_module(void)
static int load_module(void)
{
/* Configuration file */
if (!load_config(0))
if (load_config(0)) {
return AST_MODULE_LOAD_DECLINE;
}
return AST_MODULE_LOAD_SUCCESS;
}