hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MXS-2304 Use get_bool() instead of config_get_bool()

Browse Source
This commit is contained in:
Esa Korhonen
2019-01-31 15:49:05 +02:00
parent 7cb969b0d9
commit b357717149
19 changed files with 76 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/modules/filter/cache/cachefilter.cc vendored
View File

@ -359,7 +359,7 @@ bool CacheFilter::process_params(MXS_CONFIG_PARAMETER* ppParams, CACHE_CONFIG& c
parameter_selects_values));
config.cache_in_trxs = static_cast<cache_in_trxs_t>(ppParams->get_enum("cache_in_transactions",
parameter_cache_in_trxs_values));
config.enabled = config_get_bool(ppParams, "enabled");
config.enabled = ppParams->get_bool("enabled");
if (!config.storage)
{

4
server/modules/filter/dbfwfilter/dbfwfilter.cc
View File

@ -1202,12 +1202,12 @@ Dbfw::Dbfw(MXS_CONFIG_PARAMETER* params)
, m_filename(config_get_string(params, "rules"))
, m_version(atomic_add(&global_version, 1))
{
if (config_get_bool(params, "log_match"))
if (params->get_bool("log_match"))
{
m_log_match |= FW_LOG_MATCH;
}
if (config_get_bool(params, "log_no_match"))
if (params->get_bool("log_no_match"))
{
m_log_match |= FW_LOG_NO_MATCH;
}

2
server/modules/filter/masking/maskingfilterconfig.cc
View File

@ -113,5 +113,5 @@ MaskingFilterConfig::warn_type_mismatch_t MaskingFilterConfig::get_warn_type_mis
// static
bool MaskingFilterConfig::get_prevent_function_usage(const MXS_CONFIG_PARAMETER* pParams)
{
return config_get_bool(pParams, prevent_function_usage_name);
return pParams->get_bool(prevent_function_usage_name);
}

4
server/modules/filter/mqfilter/mqfilter.cc
View File

@ -586,8 +586,8 @@ static MXS_FILTER* createInstance(const char* name, MXS_CONFIG_PARAMETER* params
my_instance->port = params->get_integer("port");
my_instance->trgtype =
static_cast<log_trigger_t>(params->get_enum("logging_trigger", trigger_values));
my_instance->log_all = config_get_bool(params, "logging_log_all");
my_instance->strict_logging = config_get_bool(params, "logging_strict");
my_instance->log_all = params->get_bool("logging_log_all");
my_instance->strict_logging = params->get_bool("logging_strict");
my_instance->hostname = MXS_STRDUP_A(config_get_string(params, "hostname"));
my_instance->username = MXS_STRDUP_A(config_get_string(params, "username"));
my_instance->password = MXS_STRDUP_A(config_get_string(params, "password"));

4
server/modules/filter/qlafilter/qlafilter.cc
View File

@ -230,8 +230,8 @@ QlaInstance::QlaInstance(const char* name, MXS_CONFIG_PARAMETER* params)
, log_file_data_flags(params->get_enum(PARAM_LOG_DATA, log_data_values))
, filebase(config_get_string(params, PARAM_FILEBASE))
, unified_fp(NULL)
, flush_writes(config_get_bool(params, PARAM_FLUSH))
, append(config_get_bool(params, PARAM_APPEND))
, flush_writes(params->get_bool(PARAM_FLUSH))
, append(params->get_bool(PARAM_APPEND))
, query_newline(config_get_string(params, PARAM_NEWLINE))
, separator(config_get_string(params, PARAM_SEPARATOR))
, write_warning_given(false)

2
server/modules/filter/regexfilter/regexfilter.cc
View File

@ -210,7 +210,7 @@ static MXS_FILTER* createInstance(const char* name, MXS_CONFIG_PARAMETER* params
my_instance->replace = MXS_STRDUP_A(config_get_string(params, "replace"));
my_instance->source = config_copy_string(params, "source");
my_instance->user = config_copy_string(params, "user");
my_instance->log_trace = config_get_bool(params, "log_trace");
my_instance->log_trace = params->get_bool("log_trace");
const char* logfile = config_get_string(params, "log_file");