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

Format all sources with Uncrustify

Browse Source 
Formatted all sources and manually tuned some files to make the code look
neater.
This commit is contained in:
Markus Mäkelä
2018-09-10 12:40:03 +03:00
parent edd5ddcc88
commit d11c78ad80
183 changed files with 1865 additions and 1695 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/modules/filter/binlogfilter/binlogfiltersession.cc
View File

@ -461,8 +461,8 @@ void BinlogFilterSession::skipDatabaseTable(const uint8_t* data,
&& db == fConfig.dbname)
{
// Config Db name matches: 1.1 OR 1.2
m_skip = fConfig.table.empty() /* 1.1 */
|| table == fConfig.table; /* 1.2 */
m_skip = fConfig.table.empty() /* 1.1 */
|| table == fConfig.table; /* 1.2 */
}
else
{

2
server/modules/filter/cache/cache_storage_api.h vendored
View File

@ -169,7 +169,7 @@ typedef struct cache_storage_api
* created.
*/
CACHE_STORAGE* (*createInstance)(const char* name,
const CACHE_STORAGE_CONFIG* config,
const CACHE_STORAGE_CONFIG * config,
int argc, char* argv[]);
/**

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

@ -81,7 +81,7 @@ typedef enum cache_in_trxs
typedef struct cache_config
{
uint64_t max_resultset_rows;/**< The maximum number of rows of a resultset for it to be
uint64_t max_resultset_rows; /**< The maximum number of rows of a resultset for it to be
* cached. */
uint64_t max_resultset_size;/**< The maximum size of a resultset for it to be cached. */
char* rules; /**< Name of rules file. */

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

@ -161,7 +161,7 @@ static bool cache_rules_parse_json(CACHE_RULES* self, json_t* root);
typedef bool (* cache_rules_parse_element_t)(CACHE_RULES* self, json_t* object, size_t index);
static bool cache_rules_parse_array(CACHE_RULES * self, json_t* store, const char* name,
static bool cache_rules_parse_array(CACHE_RULES* self, json_t* store, const char* name,
cache_rules_parse_element_t);
static bool cache_rules_parse_store_element(CACHE_RULES* self, json_t* object, size_t index);
static bool cache_rules_parse_use_element(CACHE_RULES* self, json_t* object, size_t index);

14
server/modules/filter/ccrfilter/ccrfilter.cc
View File

@ -103,9 +103,9 @@ typedef struct
static const MXS_ENUM_VALUE option_values[] =
{
{"ignorecase", PCRE2_CASELESS },
{"case", 0 },
{"extended", PCRE2_EXTENDED },
{"ignorecase", PCRE2_CASELESS},
{"case", 0 },
{"extended", PCRE2_EXTENDED},
{NULL}
};
@ -169,14 +169,14 @@ extern "C"
{
{"count",
MXS_MODULE_PARAM_COUNT,
"0" },
"0"},
{"time",
MXS_MODULE_PARAM_COUNT,
CCR_DEFAULT_TIME },
CCR_DEFAULT_TIME},
{PARAM_MATCH,
MXS_MODULE_PARAM_REGEX },
MXS_MODULE_PARAM_REGEX},
{PARAM_IGNORE,
MXS_MODULE_PARAM_REGEX },
MXS_MODULE_PARAM_REGEX},
{
"options",
MXS_MODULE_PARAM_ENUM,

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

@ -504,9 +504,9 @@ static void dbfw_thr_finish()
static const MXS_ENUM_VALUE action_values[] =
{
{"allow", FW_ACTION_ALLOW },
{"block", FW_ACTION_BLOCK },
{"ignore", FW_ACTION_IGNORE },
{"allow", FW_ACTION_ALLOW },
{"block", FW_ACTION_BLOCK },
{"ignore", FW_ACTION_IGNORE},
{NULL}
};
@ -524,8 +524,8 @@ MXS_MODULE* MXS_CREATE_MODULE()
{
modulecmd_arg_type_t args_rules_reload[] =
{
{MODULECMD_ARG_FILTER | MODULECMD_ARG_NAME_MATCHES_DOMAIN, "Filter to reload" },
{MODULECMD_ARG_STRING | MODULECMD_ARG_OPTIONAL, "Path to rule file" }
{MODULECMD_ARG_FILTER | MODULECMD_ARG_NAME_MATCHES_DOMAIN, "Filter to reload" },
{MODULECMD_ARG_STRING | MODULECMD_ARG_OPTIONAL, "Path to rule file"}
};
modulecmd_register_command(MXS_MODULE_NAME,

30
server/modules/filter/insertstream/insertstream.cc
View File

@ -72,19 +72,19 @@ enum ds_state
*/
typedef struct
{
MXS_DOWNSTREAM down; /**< Downstream filter */
MXS_UPSTREAM up; /**< Upstream filter*/
GWBUF* queue; /**< Queue containing a stored
* query */
bool active; /**< Whether the session is active
* */
uint8_t packet_num; /**< If stream is open, the
* current packet sequence number
* */
DCB* client_dcb; /**< Client DCB */
enum ds_state state; /**< The current state of the
* stream */
char target[MYSQL_TABLE_MAXLEN + MYSQL_DATABASE_MAXLEN + 1]; /**< Current target table */
MXS_DOWNSTREAM down; /**< Downstream filter */
MXS_UPSTREAM up; /**< Upstream filter*/
GWBUF* queue; /**< Queue containing a stored
* query */
bool active; /**< Whether the session is active
* */
uint8_t packet_num; /**< If stream is open, the
* current packet sequence number
* */
DCB* client_dcb; /**< Client DCB */
enum ds_state state; /**< The current state of the
* stream */
char target[MYSQL_TABLE_MAXLEN + MYSQL_DATABASE_MAXLEN + 1]; /**< Current target table */
} DS_SESSION;
extern "C"
@ -131,8 +131,8 @@ extern "C"
NULL,
NULL,
{
{"source", MXS_MODULE_PARAM_STRING },
{"user", MXS_MODULE_PARAM_STRING },
{"source", MXS_MODULE_PARAM_STRING },
{"user", MXS_MODULE_PARAM_STRING },
{MXS_END_MODULE_PARAMS}
}
};

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

@ -113,8 +113,8 @@ extern "C"
NULL, /* Thread init. */
NULL, /* Thread finish. */
{
{"global_script", MXS_MODULE_PARAM_PATH, NULL, MXS_MODULE_OPT_PATH_R_OK},
{"session_script", MXS_MODULE_PARAM_PATH, NULL, MXS_MODULE_OPT_PATH_R_OK},
{"global_script", MXS_MODULE_PARAM_PATH, NULL, MXS_MODULE_OPT_PATH_R_OK},
{"session_script", MXS_MODULE_PARAM_PATH, NULL, MXS_MODULE_OPT_PATH_R_OK},
{MXS_END_MODULE_PARAMS}
}
};

9
server/modules/filter/masking/maskingfilter.cc
View File

@ -98,9 +98,12 @@ extern "C" MXS_MODULE* MXS_CREATE_MODULE()
NULL, /* Thread finish.
* */
{
{Config::rules_name,
MXS_MODULE_PARAM_STRING,
NULL, MXS_MODULE_OPT_REQUIRED},
{
Config::rules_name,
MXS_MODULE_PARAM_STRING,
NULL,
MXS_MODULE_OPT_REQUIRED
},
{
Config::warn_type_mismatch_name,
MXS_MODULE_PARAM_ENUM,

6
server/modules/filter/masking/maskingrules.cc
View File

@ -751,11 +751,11 @@ bool rule_get_values(json_t* pRule,
// Get Key object based on 'rule_type' param
if ((pKeyObj = rule_get_object(pRule,
rule_type))
&& // Run checks on user access
&& // Run checks on user access
rule_run_common_checks(pRule,
applies_to,
exempted)
&& // Extract values from the rule
&& // Extract values from the rule
rule_get_common_values(pKeyObj,
column,
table,
@ -1004,7 +1004,7 @@ auto_ptr<MaskingRules::Rule> MaskingRules::MatchRule::create_from(json_t* pRule)
&table,
&database,
KEY_REPLACE)
&& rule_get_match_value_fill(pRule, // get match/value/fill
&& rule_get_match_value_fill(pRule, // get match/value/fill
&match,
&value,
&fill))

3
server/modules/filter/maxrows/maxrows.cc
View File

@ -1154,8 +1154,7 @@ static int send_ok_upstream(MAXROWS_SESSION_DATA* csdata)
{
/* Note: sequence id is always 01 (4th byte) */
const static uint8_t ok[MYSQL_OK_PACKET_MIN_LEN] = {07, 00, 00, 01, 00, 00,
00, 02, 00, 00, 00
};
00, 02, 00, 00, 00};
mxb_assert(csdata->res.data != NULL);

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

@ -246,10 +246,10 @@ bool sendMessage(void* data);
static const MXS_ENUM_VALUE trigger_values[] =
{
{"source", TRG_SOURCE },
{"schema", TRG_SCHEMA },
{"object", TRG_OBJECT },
{"all", TRG_ALL },
{"source", TRG_SOURCE},
{"schema", TRG_SCHEMA},
{"object", TRG_OBJECT},
{"all", TRG_ALL },
{NULL}
};
@ -297,39 +297,39 @@ extern "C"
NULL, /* Thread finish. */
{
{"hostname", MXS_MODULE_PARAM_STRING,
"localhost" },
"localhost"},
{"username", MXS_MODULE_PARAM_STRING,
"guest" },
"guest"},
{"password", MXS_MODULE_PARAM_STRING,
"guest" },
"guest"},
{"vhost", MXS_MODULE_PARAM_STRING,
"/" },
"/"},
{"port", MXS_MODULE_PARAM_COUNT,
"5672" },
"5672"},
{"exchange", MXS_MODULE_PARAM_STRING,
"default_exchange" },
"default_exchange"},
{"key", MXS_MODULE_PARAM_STRING,
"key" },
"key"},
{"queue", MXS_MODULE_PARAM_STRING},
{"ssl_client_certificate", MXS_MODULE_PARAM_PATH, NULL,
MXS_MODULE_OPT_PATH_R_OK },
{"ssl_client_key", MXS_MODULE_PARAM_PATH, NULL,
MXS_MODULE_OPT_PATH_R_OK },
{"ssl_CA_cert", MXS_MODULE_PARAM_PATH, NULL,
MXS_MODULE_OPT_PATH_R_OK },
{"ssl_client_certificate", MXS_MODULE_PARAM_PATH, NULL,
MXS_MODULE_OPT_PATH_R_OK},
{"ssl_client_key", MXS_MODULE_PARAM_PATH, NULL,
MXS_MODULE_OPT_PATH_R_OK},
{"ssl_CA_cert", MXS_MODULE_PARAM_PATH, NULL,
MXS_MODULE_OPT_PATH_R_OK},
{"exchange_type", MXS_MODULE_PARAM_STRING,
"direct" },
{"logging_trigger", MXS_MODULE_PARAM_ENUM, "all",
"direct"},
{"logging_trigger", MXS_MODULE_PARAM_ENUM, "all",
MXS_MODULE_OPT_NONE,
trigger_values },
trigger_values},
{"logging_source_user", MXS_MODULE_PARAM_STRING},
{"logging_source_host", MXS_MODULE_PARAM_STRING},
{"logging_schema", MXS_MODULE_PARAM_STRING},
{"logging_object", MXS_MODULE_PARAM_STRING},
{"logging_log_all", MXS_MODULE_PARAM_BOOL,
"false" },
"false"},
{"logging_strict", MXS_MODULE_PARAM_BOOL,
"true" },
"true"},
{MXS_END_MODULE_PARAMS}
}
};

14
server/modules/filter/namedserverfilter/namedserverfilter.cc
View File

@ -54,9 +54,9 @@ static StringVector param_names_target_indexed;
static const MXS_ENUM_VALUE option_values[] =
{
{"ignorecase", PCRE2_CASELESS },
{"case", 0 },
{"extended", PCRE2_EXTENDED }, // Ignore white space and # comments
{"ignorecase", PCRE2_CASELESS},
{"case", 0 },
{"extended", PCRE2_EXTENDED}, // Ignore white space and # comments
{NULL}
};
@ -944,13 +944,13 @@ extern "C" MXS_MODULE* MXS_CREATE_MODULE()
NULL, /* Thread finish. */
{
{"source",
MXS_MODULE_PARAM_STRING },
MXS_MODULE_PARAM_STRING},
{"user",
MXS_MODULE_PARAM_STRING },
MXS_MODULE_PARAM_STRING},
{MATCH_STR,
MXS_MODULE_PARAM_STRING },
MXS_MODULE_PARAM_STRING},
{SERVER_STR,
MXS_MODULE_PARAM_SERVER },
MXS_MODULE_PARAM_SERVER},
{
"options",
MXS_MODULE_PARAM_ENUM,

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

@ -113,9 +113,9 @@ static bool cb_log(const MODULECMD_ARG* argv, json_t** output);
static const MXS_ENUM_VALUE option_values[] =
{
{"ignorecase", PCRE2_CASELESS },
{"case", 0 },
{"extended", PCRE2_EXTENDED },
{"ignorecase", PCRE2_CASELESS},
{"case", 0 },
{"extended", PCRE2_EXTENDED},
{NULL}
};
@ -128,12 +128,12 @@ static const MXS_ENUM_VALUE log_type_values[] =
static const MXS_ENUM_VALUE log_data_values[] =
{
{"service", LOG_DATA_SERVICE },
{"session", LOG_DATA_SESSION },
{"date", LOG_DATA_DATE },
{"user", LOG_DATA_USER },
{"query", LOG_DATA_QUERY },
{"reply_time", LOG_DATA_REPLY_TIME },
{"service", LOG_DATA_SERVICE },
{"session", LOG_DATA_SESSION },
{"date", LOG_DATA_DATE },
{"user", LOG_DATA_USER },
{"query", LOG_DATA_QUERY },
{"reply_time", LOG_DATA_REPLY_TIME},
{NULL}
};

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

@ -91,8 +91,8 @@ void log_nomatch(REGEX_INSTANCE* inst, char* re, char* old);
static const MXS_ENUM_VALUE option_values[] =
{
{"ignorecase", PCRE2_CASELESS },
{"case", 0 },
{"ignorecase", PCRE2_CASELESS},
{"case", 0 },
{NULL}
};
@ -125,37 +125,49 @@ extern "C"
NULL, // No destroyInstance
};
static const char description[] = "A query rewrite filter that uses regular "
"expressions to rewrite queries";
static MXS_MODULE info =
{
MXS_MODULE_API_FILTER,
MXS_MODULE_GA,
MXS_FILTER_VERSION,
"A query rewrite filter that uses regular expressions to rewrite queries",
description,
"V1.1.0",
RCAP_TYPE_CONTIGUOUS_INPUT,
&MyObject,
NULL, /* Process init. */
NULL, /* Process finish. */
NULL, /* Thread init. */
NULL, /* Thread finish. */
NULL,
NULL,
NULL,
NULL,
{
{"match", MXS_MODULE_PARAM_STRING,
NULL,
MXS_MODULE_OPT_REQUIRED },
{"replace", MXS_MODULE_PARAM_STRING,
NULL,
MXS_MODULE_OPT_REQUIRED },
{"source",
MXS_MODULE_PARAM_STRING},
{"user",
MXS_MODULE_PARAM_STRING},
{"log_trace", MXS_MODULE_PARAM_BOOL,
"false" },
{"log_file",
MXS_MODULE_PARAM_STRING},
{"options", MXS_MODULE_PARAM_ENUM,
"ignorecase", MXS_MODULE_OPT_NONE,
option_values},
{
"match",
MXS_MODULE_PARAM_STRING,
NULL,
MXS_MODULE_OPT_REQUIRED
},
{
"replace",
MXS_MODULE_PARAM_STRING,
NULL,
MXS_MODULE_OPT_REQUIRED
},
{
"options",
MXS_MODULE_PARAM_ENUM,
"ignorecase",
MXS_MODULE_OPT_NONE,
option_values
},
{
"log_trace",
MXS_MODULE_PARAM_BOOL,
"false"
},
{"source", MXS_MODULE_PARAM_STRING },
{"user", MXS_MODULE_PARAM_STRING },
{"log_file", MXS_MODULE_PARAM_STRING },
{MXS_END_MODULE_PARAMS}
}
};

3
server/modules/filter/throttlefilter/throttlefilter.cc
View File

@ -101,8 +101,7 @@ ThrottleFilter* ThrottleFilter::create(const char* zName, MXS_CONFIG_PARAMETER*
maxbase::Duration continuous_duration {std::chrono::milliseconds(cont_msecs)};
ThrottleConfig config = {max_qps, sampling_duration,
throttling_duration, continuous_duration
};
throttling_duration, continuous_duration};
filter = new ThrottleFilter(config);
}

31
server/modules/filter/topfilter/topfilter.cc
View File

@ -124,9 +124,9 @@ typedef struct
static const MXS_ENUM_VALUE option_values[] =
{
{"ignorecase", REG_ICASE },
{"case", 0 },
{"extended", REG_EXTENDED },
{"ignorecase", REG_ICASE },
{"case", 0 },
{"extended", REG_EXTENDED},
{NULL}
};
@ -164,23 +164,22 @@ extern "C"
MXS_MODULE_API_FILTER,
MXS_MODULE_GA,
MXS_FILTER_VERSION,
"A top N query logging filter",
"A top N query "
"logging filter",
"V1.0.1",
RCAP_TYPE_CONTIGUOUS_INPUT,
&MyObject,
NULL, /* Process init. */
NULL, /* Process finish. */
NULL, /* Thread init. */
NULL, /* Thread finish. */
NULL,
NULL,
NULL,
NULL,
{
{"count", MXS_MODULE_PARAM_COUNT,
"10" },
{"filebase", MXS_MODULE_PARAM_STRING, NULL,
MXS_MODULE_OPT_REQUIRED },
{"match", MXS_MODULE_PARAM_STRING},
{"exclude", MXS_MODULE_PARAM_STRING},
{"source", MXS_MODULE_PARAM_STRING},
{"user", MXS_MODULE_PARAM_STRING},
{"count", MXS_MODULE_PARAM_COUNT, "10" },
{"filebase", MXS_MODULE_PARAM_STRING, NULL, MXS_MODULE_OPT_REQUIRED},
{"match", MXS_MODULE_PARAM_STRING},
{"exclude", MXS_MODULE_PARAM_STRING},
{"source", MXS_MODULE_PARAM_STRING},
{"user", MXS_MODULE_PARAM_STRING},
{
"options",
MXS_MODULE_PARAM_ENUM,

27
server/modules/filter/tpmfilter/tpmfilter.cc
View File

@ -163,6 +163,7 @@ extern "C"
*/
MXS_MODULE* MXS_CREATE_MODULE()
{
static const char description[] = "Transaction Performance Monitoring filter";
static MXS_FILTER_OBJECT MyObject =
{
createInstance,
@ -184,25 +185,21 @@ extern "C"
MXS_MODULE_API_FILTER,
MXS_MODULE_GA,
MXS_FILTER_VERSION,
"Transaction Performance Monitoring filter",
description,
"V1.0.1",
RCAP_TYPE_CONTIGUOUS_INPUT,
&MyObject,
NULL, /* Process init. */
NULL, /* Process finish. */
NULL, /* Thread init. */
NULL, /* Thread finish. */
NULL,
NULL,
NULL,
NULL,
{
{"named_pipe", MXS_MODULE_PARAM_STRING,
DEFAULT_NAMED_PIPE },
{"filename", MXS_MODULE_PARAM_STRING,
DEFAULT_FILE_NAME },
{"delimiter", MXS_MODULE_PARAM_STRING,
DEFAULT_LOG_DELIMITER },
{"query_delimiter", MXS_MODULE_PARAM_STRING,
DEFAULT_QUERY_DELIMITER },
{"source", MXS_MODULE_PARAM_STRING},
{"user", MXS_MODULE_PARAM_STRING},
{"named_pipe", MXS_MODULE_PARAM_STRING, DEFAULT_NAMED_PIPE },
{"filename", MXS_MODULE_PARAM_STRING, DEFAULT_FILE_NAME },
{"delimiter", MXS_MODULE_PARAM_STRING, DEFAULT_LOG_DELIMITER },
{"query_delimiter", MXS_MODULE_PARAM_STRING, DEFAULT_QUERY_DELIMITER},
{"source", MXS_MODULE_PARAM_STRING},
{"user", MXS_MODULE_PARAM_STRING},
{MXS_END_MODULE_PARAMS}
}
};