kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-06 04:30:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove some dead code and additionally handle a case that wasn't handled.

Browse Source 
........

Merged revisions 377487 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 377504 from http://svn.asterisk.org/svn/asterisk/branches/10
........

Merged revisions 377505 from http://svn.asterisk.org/svn/asterisk/branches/11


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@377506 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2012-12-10 01:29:32 +00:00
parent b68d4dba67
commit 58b5edbc1e
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
addons/cdr_mysql.c
View File

@@ -430,6 +430,9 @@ static int my_load_module(int reload)
int res; int res;
struct ast_config *cfg; struct ast_config *cfg;
struct ast_variable *var; struct ast_variable *var;
/* CONFIG_STATUS_FILEUNCHANGED is impossible when config_flags is always 0,
* and it has to be zero, so a reload can be sent to tell the driver to
* rescan the table layout. */
struct ast_flags config_flags = { 0 }; struct ast_flags config_flags = { 0 };
struct column *entry; struct column *entry;
char *temp; char *temp;
@@ -445,11 +448,13 @@ static int my_load_module(int reload)
* have changed, which is not detectable by config file change detection, * have changed, which is not detectable by config file change detection,
* but should still cause the configuration to be re-parsed. */ * but should still cause the configuration to be re-parsed. */
cfg = ast_config_load(config, config_flags); cfg = ast_config_load(config, config_flags);
if (!cfg) { if (cfg == CONFIG_STATUS_FILEMISSING) {
ast_log(LOG_WARNING, "Unable to load config for mysql CDR's: %s\n", config); ast_log(LOG_WARNING, "Unable to load config for mysql CDR's: %s\n", config);
return AST_MODULE_LOAD_SUCCESS; return AST_MODULE_LOAD_SUCCESS;
} else if (cfg == CONFIG_STATUS_FILEUNCHANGED) } else if (cfg == CONFIG_STATUS_FILEINVALID) {
return AST_MODULE_LOAD_SUCCESS; ast_log(LOG_ERROR, "Unable to load configuration file '%s'\n", config);
return AST_MODULE_LOAD_DECLINE;
}
if (reload) { if (reload) {
AST_RWLIST_WRLOCK(&columns); AST_RWLIST_WRLOCK(&columns);