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

Deactive some uncrustify settings

Browse Source 
This only deactivates some of the more heavy-handed features. All files have
been formatted with the new settings, which seems to have only affected lines
which were not formatted before.
This commit is contained in:
Esa Korhonen
2018-09-12 17:33:23 +03:00
parent 4e41978069
commit 4ba0112668
5 changed files with 30 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
maxscale-system-test/bug601.cpp
View File

@ -93,10 +93,12 @@ int main(int argc, char* argv[])
for (int i = 0; i < iterations; i++) for (int i = 0; i < iterations; i++)
{ {
Test->set_timeout(15); Test->set_timeout(15);
Test->add_result(mysql_change_user(Test->maxscales->conn_rwsplit[0], "user", "pass2", (char *) "test"), Test->add_result(mysql_change_user(Test->maxscales->conn_rwsplit[0], "user", "pass2", (char*) "test"),
"change_user failed! %s", mysql_error(Test->maxscales->conn_rwsplit[0])); "change_user failed! %s", mysql_error(Test->maxscales->conn_rwsplit[0]));
Test->add_result(mysql_change_user(Test->maxscales->conn_rwsplit[0], Test->maxscales->user_name, Test->maxscales->password, Test->add_result(mysql_change_user(Test->maxscales->conn_rwsplit[0], Test->maxscales->user_name,
(char *) "test"), "change_user failed! %s", mysql_error(Test->maxscales->conn_rwsplit[0])); Test->maxscales->password,
(char*) "test"), "change_user failed! %s",
mysql_error(Test->maxscales->conn_rwsplit[0]));
} }
Test->tprintf("Waiting for all threads to finish"); Test->tprintf("Waiting for all threads to finish");

22
maxscale-system-test/open_close_connections.cpp
View File

@ -79,14 +79,20 @@ void* query_thread1(void* ptr)
data->Test->add_result(mysql_errno(conn1), data->Test->add_result(mysql_errno(conn1),
"Error opening RWsplit conn, thread num is %d, iteration %li, error is: %s\n", "Error opening RWsplit conn, thread num is %d, iteration %li, error is: %s\n",
data->thread_id, data->i, mysql_error(conn1)); data->thread_id, data->i, mysql_error(conn1));
MYSQL *conn2 = data->Test->maxscales->open_readconn_master_connection(0); MYSQL* conn2 = data->Test->maxscales->open_readconn_master_connection(0);
data->Test->add_result(mysql_errno(conn2), data->Test->add_result(mysql_errno(
"Error opening ReadConn master conn, thread num is %d, iteration %li, error is: %s\n", data->thread_id, conn2),
data->i, mysql_error(conn2)); "Error opening ReadConn master conn, thread num is %d, iteration %li, error is: %s\n",
MYSQL *conn3 = data->Test->maxscales->open_readconn_slave_connection(0); data->thread_id,
data->Test->add_result(mysql_errno(conn3), data->i,
"Error opening ReadConn master conn, thread num is %d, iteration %li, error is: %s\n", data->thread_id, mysql_error(conn2));
data->i, mysql_error(conn3)); MYSQL* conn3 = data->Test->maxscales->open_readconn_slave_connection(0);
data->Test->add_result(mysql_errno(
conn3),
"Error opening ReadConn master conn, thread num is %d, iteration %li, error is: %s\n",
data->thread_id,
data->i,
mysql_error(conn3));
// USE test here is a hack to prevent Maxscale from failure; should be removed when fixed // USE test here is a hack to prevent Maxscale from failure; should be removed when fixed
if (conn1 != NULL) if (conn1 != NULL)
{ {

4
maxscale-system-test/testconnections.h
View File

@ -274,10 +274,10 @@ public:
* @param result 0 if step PASSED * @param result 0 if step PASSED
* @param format ... message to pring if result is not 0 * @param format ... message to pring if result is not 0
*/ */
void add_result(bool result, const char *format, ...) __attribute__((format(printf, 3, 4))); void add_result(bool result, const char* format, ...) __attribute__ ((format(printf, 3, 4)));
/** Same as add_result() but inverted */ /** Same as add_result() but inverted */
void expect(bool result, const char *format, ...) __attribute__((format(printf, 3, 4))); void expect(bool result, const char* format, ...) __attribute__ ((format(printf, 3, 4)));
/** /**
* @brief ReadEnv Reads all Maxscale and Master/Slave and Galera setups info from environmental variables * @brief ReadEnv Reads all Maxscale and Master/Slave and Galera setups info from environmental variables

2
server/modules/routing/binlogrouter/blr_master.cc
View File

@ -1535,7 +1535,7 @@ static void blr_log_identity(ROUTER_INSTANCE* router)
if (router->set_master_hostname) if (router->set_master_hostname)
{ {
master_hostname = MXS_STRDUP(router->set_master_hostname); master_hostname = MXS_STRDUP(router->set_master_hostname);
} }
else else
{ {

16
uncrustify.cfg
View File

@ -1115,10 +1115,10 @@ nl_func_decl_args = ignore # ignore/add/remove/force
nl_func_def_args = ignore # ignore/add/remove/force nl_func_def_args = ignore # ignore/add/remove/force
# Whether to add newline after each ',' in a function declaration if '(' and ')' are in different lines. # Whether to add newline after each ',' in a function declaration if '(' and ')' are in different lines.
nl_func_decl_args_multi_line = true # false/true nl_func_decl_args_multi_line = false # false/true
# Whether to add newline after each ',' in a function definition if '(' and ')' are in different lines. # Whether to add newline after each ',' in a function definition if '(' and ')' are in different lines.
nl_func_def_args_multi_line = true # false/true nl_func_def_args_multi_line = false # false/true
# Add or remove newline before the ')' in a function declaration. # Add or remove newline before the ')' in a function declaration.
nl_func_decl_end = ignore # ignore/add/remove/force nl_func_decl_end = ignore # ignore/add/remove/force
@ -1151,7 +1151,7 @@ nl_func_call_empty = remove # ignore/add/remove/force
nl_func_call_start_multi_line = false # false/true nl_func_call_start_multi_line = false # false/true
# Whether to add newline after each ',' in a function call if '(' and ')' are in different lines. # Whether to add newline after each ',' in a function call if '(' and ')' are in different lines.
nl_func_call_args_multi_line = true # false/true nl_func_call_args_multi_line = false # false/true
# Whether to add newline before ')' in a function call if '(' and ')' are in different lines. # Whether to add newline before ')' in a function call if '(' and ')' are in different lines.
nl_func_call_end_multi_line = false # false/true nl_func_call_end_multi_line = false # false/true
@ -1429,20 +1429,20 @@ nl_between_annotation = ignore # ignore/add/remove/force
# #
# The position of arithmetic operators in wrapped expressions. # The position of arithmetic operators in wrapped expressions.
pos_arith = lead # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force pos_arith = ignore # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force
# The position of assignment in wrapped expressions. # The position of assignment in wrapped expressions.
# Do not affect '=' followed by '{'. # Do not affect '=' followed by '{'.
pos_assign = lead # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force pos_assign = ignore # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force
# The position of boolean operators in wrapped expressions. # The position of boolean operators in wrapped expressions.
pos_bool = lead # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force pos_bool = ignore # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force
# The position of comparison operators in wrapped expressions. # The position of comparison operators in wrapped expressions.
pos_compare = lead # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force pos_compare = ignore # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force
# The position of conditional (b ? t : f) operators in wrapped expressions. # The position of conditional (b ? t : f) operators in wrapped expressions.
pos_conditional = lead # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force pos_conditional = ignore # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force
# The position of the comma in wrapped expressions. # The position of the comma in wrapped expressions.
# nantti: found a bug here. If pos_comma=lead, and long functions are split (ls_func_split_full), comma goes to # nantti: found a bug here. If pos_comma=lead, and long functions are split (ls_func_split_full), comma goes to