diff options
author | Matthew Jordan <mjordan@digium.com> | 2013-08-25 18:00:46 +0000 |
---|---|---|
committer | Matthew Jordan <mjordan@digium.com> | 2013-08-25 18:00:46 +0000 |
commit | 447848a580941a951ed728cde0ba80c254e2e1cd (patch) | |
tree | 938893027fbdfb8a6f471990c22cc73b6618e2a1 /main/config_options.c | |
parent | de44880645b0f5d177258b3dd311765700a0fe9a (diff) |
Fix the config_options_test
The config options test requires the entire configuration item to be transparent from
the documentation system. So we let it do that too.
As an aside, please do not use this power for evil. Documentation is your friend, and
you really should document your configurations. Hiding your module's configuration
information from the system attempting to enforce some sanity in the universe is something
only a Bond villain would contemplate.
........
Merged revisions 397628 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@397629 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/config_options.c')
-rw-r--r-- | main/config_options.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/main/config_options.c b/main/config_options.c index e789c1cfc..0d869b960 100644 --- a/main/config_options.c +++ b/main/config_options.c @@ -184,7 +184,9 @@ static int link_option_to_types(struct aco_info *info, struct aco_type **types, } if (!ao2_link(type->internal->opts, opt) #ifdef AST_XML_DOCS - || (!opt->no_doc && xmldoc_update_config_option(types, info->module, opt->name, type->name, opt->default_val, opt->match_type == ACO_REGEX, opt->type)) + || (!info->hidden && + !opt->no_doc && + xmldoc_update_config_option(types, info->module, opt->name, type->name, opt->default_val, opt->match_type == ACO_REGEX, opt->type)) #endif /* AST_XML_DOCS */ ) { do { @@ -773,7 +775,9 @@ int aco_info_init(struct aco_info *info) goto error; } #ifdef AST_XML_DOCS - if (!type->hidden && xmldoc_update_config_type(info->module, type->name, type->category, type->matchfield, type->matchvalue, type->category_match == ACO_WHITELIST)) { + if (!info->hidden && + !type->hidden && + xmldoc_update_config_type(info->module, type->name, type->category, type->matchfield, type->matchvalue, type->category_match == ACO_WHITELIST)) { goto error; } #endif /* AST_XML_DOCS */ |