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

Fix reloading an unchanged file with the Config Options API

Browse Source 
Adding multiple file support broke reloading an unchanged file. This
adds an enum for return values for the aco_process_* functions and
ensures that the config is not applied if res is not ACO_PROCESS_OK.

Review: https://reviewboard.asterisk.org/r/1979/


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@368673 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Terry Wilson
2012-06-07 20:32:07 +00:00
parent ac6ec71fd2
commit 9f704b5d59
5 changed files with 49 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/app_skel.c
View File

@@ -633,7 +633,7 @@ static struct ast_cli_entry skel_cli[] = {
static int reload_module(void)
{
if (aco_process_config(&cfg_info, 1)) {
if (aco_process_config(&cfg_info, 1) == ACO_PROCESS_ERROR) {
return AST_MODULE_LOAD_DECLINE;
}
@@ -673,7 +673,7 @@ static int load_module(void)
aco_option_register(&cfg_info, "max_number", ACO_EXACT, level_options, NULL, OPT_UINT_T, 0, FLDSET(struct skel_level, max_num));
aco_option_register(&cfg_info, "max_guesses", ACO_EXACT, level_options, NULL, OPT_UINT_T, 1, FLDSET(struct skel_level, max_guesses));
if (aco_process_config(&cfg_info, 0)) {
if (aco_process_config(&cfg_info, 0) == ACO_PROCESS_ERROR) {
goto error;
}