nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-30 23:53:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

config: Invert sense of _is_invisible, and rename to is_listable()

Browse Source
This commit is contained in:
Nick Mathewson 2019-09-05 11:48:25 -04:00
parent 22e7d33735
commit 16cf9424c1
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/config/config.c
View File

@ -8128,7 +8128,7 @@ getinfo_helper_config(control_connection_t *conn,
smartlist_t *vars = config_mgr_list_vars(get_options_mgr()); smartlist_t *vars = config_mgr_list_vars(get_options_mgr());
SMARTLIST_FOREACH_BEGIN(vars, const config_var_t *, var) { SMARTLIST_FOREACH_BEGIN(vars, const config_var_t *, var) {
/* don't tell controller about invisible options */ /* don't tell controller about invisible options */
if (config_var_is_invisible(var)) if (! config_var_is_listable(var))
continue; continue;
const char *type = struct_var_get_typename(&var->member); const char *type = struct_var_get_typename(&var->member);
if (!type) if (!type)

10
src/app/config/confparse.c
View File

@ -534,11 +534,17 @@ config_var_is_contained(const config_var_t *var)
{ {
return struct_var_is_contained(&var->member); return struct_var_is_contained(&var->member);
} }
/**
* Return true iff variable <b>var</b> should appear on list of variables
* given to the controller or the CLI.
**/
bool bool
config_var_is_invisible(const config_var_t *var) config_var_is_listable(const config_var_t *var)
{ {
return (var->flags & CVFLAG_INVISIBLE) != 0; return (var->flags & CVFLAG_INVISIBLE) == 0;
} }
bool bool
config_var_is_dumpable(const config_var_t *var) config_var_is_dumpable(const config_var_t *var)
{ {

2
src/app/config/confparse.h
View File

@ -191,7 +191,7 @@ void warn_deprecated_option(const char *what, const char *why);
bool config_var_is_settable(const config_var_t *var); bool config_var_is_settable(const config_var_t *var);
bool config_var_is_contained(const config_var_t *var); bool config_var_is_contained(const config_var_t *var);
bool config_var_is_invisible(const config_var_t *var); bool config_var_is_listable(const config_var_t *var);
bool config_var_is_dumpable(const config_var_t *var); bool config_var_is_dumpable(const config_var_t *var);
/* Helper macros to compare an option across two configuration objects */ /* Helper macros to compare an option across two configuration objects */