From 5d4fe65b19532affb43749c5dc59fa2c60b6a37f Mon Sep 17 00:00:00 2001 From: Markus Makela Date: Mon, 16 Nov 2015 21:00:22 +0200 Subject: [PATCH] Fixed some misaligned brackets. --- server/modules/monitor/galeramon.c | 9 ++++++--- server/modules/monitor/mmmon.c | 3 ++- server/modules/monitor/mysql_mon.c | 9 ++++++--- server/modules/monitor/ndbclustermon.c | 11 ++++++++--- 4 files changed, 22 insertions(+), 10 deletions(-) diff --git a/server/modules/monitor/galeramon.c b/server/modules/monitor/galeramon.c index 6755294e6..34840e9a2 100644 --- a/server/modules/monitor/galeramon.c +++ b/server/modules/monitor/galeramon.c @@ -48,7 +48,8 @@ static void monitorMain(void *); static char *version_str = "V2.0.0"; -MODULE_INFO info = { +MODULE_INFO info = +{ MODULE_API_MONITOR, MODULE_GA, MONITOR_VERSION, @@ -63,7 +64,8 @@ static MONITOR_SERVERS *set_cluster_master(MONITOR_SERVERS *, MONITOR_SERVERS *, static void disableMasterFailback(void *, int); bool isGaleraEvent(monitor_event_t event); -static MONITOR_OBJECT MyObject = { +static MONITOR_OBJECT MyObject = +{ startMonitor, stopMonitor, diagnostics @@ -758,7 +760,8 @@ availableWhenDonor(void *arg, int disable) memcpy(&handle->availableWhenDonor, &disable, sizeof(int)); } -static monitor_event_t galera_events[] = { +static monitor_event_t galera_events[] = +{ MASTER_DOWN_EVENT, MASTER_UP_EVENT, SLAVE_DOWN_EVENT, diff --git a/server/modules/monitor/mmmon.c b/server/modules/monitor/mmmon.c index 4d18fa5ce..dd60c4a64 100644 --- a/server/modules/monitor/mmmon.c +++ b/server/modules/monitor/mmmon.c @@ -749,7 +749,8 @@ static MONITOR_SERVERS *get_current_master(MONITOR *mon) } -static monitor_event_t mysql_events[] = { +static monitor_event_t mysql_events[] = +{ MASTER_DOWN_EVENT, MASTER_UP_EVENT, SLAVE_DOWN_EVENT, diff --git a/server/modules/monitor/mysql_mon.c b/server/modules/monitor/mysql_mon.c index f1c922581..a638b1c1f 100644 --- a/server/modules/monitor/mysql_mon.c +++ b/server/modules/monitor/mysql_mon.c @@ -60,7 +60,8 @@ static void monitorMain(void *); static char *version_str = "V1.4.0"; -MODULE_INFO info = { +MODULE_INFO info = +{ MODULE_API_MONITOR, MODULE_GA, MONITOR_VERSION, @@ -82,7 +83,8 @@ void check_maxscale_schema_replication(MONITOR *monitor); static bool report_version_err = true; static const char* hb_table_name = "maxscale_schema.replication_heartbeat"; -static MONITOR_OBJECT MyObject = { +static MONITOR_OBJECT MyObject = +{ startMonitor, stopMonitor, diagnostics @@ -1501,7 +1503,8 @@ static int add_slave_to_master(long *slaves_list, int list_size, long node_id) return 0; } -static monitor_event_t mysql_events[] = { +static monitor_event_t mysql_events[] = +{ MASTER_DOWN_EVENT, MASTER_UP_EVENT, SLAVE_DOWN_EVENT, diff --git a/server/modules/monitor/ndbclustermon.c b/server/modules/monitor/ndbclustermon.c index 71005b8ec..5dc810c0b 100644 --- a/server/modules/monitor/ndbclustermon.c +++ b/server/modules/monitor/ndbclustermon.c @@ -37,7 +37,8 @@ static void monitorMain(void *); static char *version_str = "V2.1.0"; -MODULE_INFO info = { +MODULE_INFO info = +{ MODULE_API_MONITOR, MODULE_BETA_RELEASE, MONITOR_VERSION, @@ -49,7 +50,8 @@ static void stopMonitor(void *); static void diagnostics(DCB *, void *); bool isNdbEvent(monitor_event_t event); -static MONITOR_OBJECT MyObject = { +static MONITOR_OBJECT MyObject = +{ startMonitor, stopMonitor, diagnostics @@ -436,7 +438,8 @@ monitorMain(void *arg) } -static monitor_event_t ndb_events[] = { +static monitor_event_t ndb_events[] = +{ MASTER_DOWN_EVENT, MASTER_UP_EVENT, SLAVE_DOWN_EVENT, @@ -465,7 +468,9 @@ bool isNdbEvent(monitor_event_t event) for (i = 0; ndb_events[i] != MAX_MONITOR_EVENT; i++) { if (event == ndb_events[i]) + { return true; + } } return false; }