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

Fix formatting errors

Browse Source 
Fixed the formatting errors introduced by Astyle. Changed the comment
syntax to use a more Astyle-friendly one.
This commit is contained in:
Markus Mäkelä
2017-09-28 15:04:33 +03:00
parent 9c60b68476
commit 071d364b0a
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/core/dcb.cc
View File

@ -1157,8 +1157,8 @@ void dcb_final_close(DCB* dcb)
if (dcb->dcb_role == DCB_ROLE_BACKEND_HANDLER && // Backend DCB if (dcb->dcb_role == DCB_ROLE_BACKEND_HANDLER && // Backend DCB
dcb->state == DCB_STATE_POLLING && // Being polled dcb->state == DCB_STATE_POLLING && // Being polled
dcb->persistentstart == 0 && // Not already in (> 0) or being evicted from (-1) dcb->persistentstart == 0 && /** Not already in (> 0) or being evicted from (-1)
// the persistent pool. * the persistent pool. */
dcb->server) // And has a server dcb->server) // And has a server
{ {
/* May be a candidate for persistence, so save user name */ /* May be a candidate for persistence, so save user name */

16
server/modules/filter/cache/test/testrules.cc vendored
View File

@ -66,14 +66,14 @@ struct user_test_case
const struct user_test_case user_test_cases[] = const struct user_test_case user_test_cases[] =
{ {
USER_TEST_CASE( =, bob, CACHE_OP_LIKE, bob@.*), USER_TEST_CASE(=, bob, CACHE_OP_LIKE, bob@.*),
USER_TEST_CASE( =, 'bob', CACHE_OP_LIKE, bob@.*), USER_TEST_CASE(=, 'bob', CACHE_OP_LIKE, bob@.*),
USER_TEST_CASE( =, bob@ %, CACHE_OP_LIKE, bob@.*), USER_TEST_CASE(=, bob@%, CACHE_OP_LIKE, bob@.*),
USER_TEST_CASE( =, 'bob'@'%.52', CACHE_OP_LIKE, bob@.*\\.52), USER_TEST_CASE(=, 'bob'@'%.52', CACHE_OP_LIKE, bob@.*\\.52),
USER_TEST_CASE( =, bob@127.0.0.1, CACHE_OP_EQ, bob@127.0.0.1), USER_TEST_CASE(=, bob@127.0.0.1, CACHE_OP_EQ, bob@127.0.0.1),
USER_TEST_CASE( =, b*b@127.0.0.1, CACHE_OP_EQ, b*b@127.0.0.1), USER_TEST_CASE(=, b*b@127.0.0.1, CACHE_OP_EQ, b*b@127.0.0.1),
USER_TEST_CASE( =, b*b@ % .0.0.1, CACHE_OP_LIKE, b\\*b@.*\\.0\\.0\\.1), USER_TEST_CASE(=, b*b@%.0.0.1, CACHE_OP_LIKE, b\\*b@.*\\.0\\.0\\.1),
USER_TEST_CASE( =, b*b@ % .0. % .1, CACHE_OP_LIKE, b\\*b@.*\\.0\\..*\\.1), USER_TEST_CASE(=, b*b@%.0.%.1, CACHE_OP_LIKE, b\\*b@.*\\.0\\..*\\.1),
}; };
const size_t n_user_test_cases = sizeof(user_test_cases) / sizeof(user_test_cases[0]); const size_t n_user_test_cases = sizeof(user_test_cases) / sizeof(user_test_cases[0]);