From dbeb208a5ca812b8f531d4b18bb5bbc4a08bb4b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= Date: Thu, 19 Jan 2017 15:18:14 +0200 Subject: [PATCH] Remove unnecessary function from header The function was only used in one place. Also added a debug assertion for the monitor event detection mechanism. --- server/core/maxscale/monitor.h | 2 -- server/core/monitor.c | 3 ++- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/server/core/maxscale/monitor.h b/server/core/maxscale/monitor.h index c6be6a502..2c98f5182 100644 --- a/server/core/maxscale/monitor.h +++ b/server/core/maxscale/monitor.h @@ -66,8 +66,6 @@ extern bool monitorSetNetworkTimeout(MXS_MONITOR *, int, int); mxs_monitor_event_t mon_get_event_type(MXS_MONITOR_SERVERS* node); const char* mon_get_event_name(MXS_MONITOR_SERVERS* node); -void mon_log_state_change(MXS_MONITOR_SERVERS *ptr); - /** * @brief Serialize the servers of a monitor to a file * diff --git a/server/core/monitor.c b/server/core/monitor.c index 7c1612d97..f5f504516 100644 --- a/server/core/monitor.c +++ b/server/core/monitor.c @@ -917,6 +917,7 @@ mon_get_event_name(MXS_MONITOR_SERVERS* node) } } + ss_dassert(false); return "undefined_event"; } @@ -1176,7 +1177,7 @@ mon_log_connect_error(MXS_MONITOR_SERVERS* database, mxs_connect_result_t rval) mysql_error(database->con)); } -void mon_log_state_change(MXS_MONITOR_SERVERS *ptr) +static void mon_log_state_change(MXS_MONITOR_SERVERS *ptr) { SERVER srv; srv.status = ptr->mon_prev_status;