From 2e89d5b2824801ed49c62db9f6743f32593018bc Mon Sep 17 00:00:00 2001
From: Haru <haru@dotalux.com>
Date: Sun, 24 Jun 2018 05:11:00 +0200
Subject: Fix some warnings caused by static functions defined and unused

Signed-off-by: Haru <haru@dotalux.com>
---
 src/common/showmsg.c |  2 ++
 src/common/socket.c  | 10 ++++------
 src/common/strlib.c  |  9 ---------
 3 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/src/common/showmsg.c b/src/common/showmsg.c
index 91f84e9d3..32d1e7610 100644
--- a/src/common/showmsg.c
+++ b/src/common/showmsg.c
@@ -739,6 +739,7 @@ static void showmsg_clearScreen(void)
 #endif
 }
 
+#if 0 // Unused
 static int ShowMessage_(enum msg_type flag, const char *string, ...) __attribute__((format(printf, 2, 3)));
 static int ShowMessage_(enum msg_type flag, const char *string, ...)
 {
@@ -749,6 +750,7 @@ static int ShowMessage_(enum msg_type flag, const char *string, ...)
 	va_end(ap);
 	return ret;
 }
+#endif // Unused
 
 // direct printf replacement
 static void showmsg_showMessage(const char *string, ...) __attribute__((format(printf, 1, 2)));
diff --git a/src/common/socket.c b/src/common/socket.c
index 6119a5341..290c7a1b3 100644
--- a/src/common/socket.c
+++ b/src/common/socket.c
@@ -78,8 +78,6 @@
 static struct socket_interface sockt_s;
 struct socket_interface *sockt;
 
-static struct socket_data **session;
-
 static const char *SOCKET_CONF_FILENAME = "conf/common/socket.conf";
 
 #ifdef SEND_SHORTLIST
@@ -1332,6 +1330,7 @@ static bool access_list_add(struct config_setting_t *setting, const char *list_n
 #endif  // MINICORE
 //////////////////////////////
 
+#ifndef MINICORE
 /**
  * Reads 'socket_configuration/ip_rules' and initializes required variables.
  *
@@ -1343,7 +1342,6 @@ static bool access_list_add(struct config_setting_t *setting, const char *list_n
  */
 static bool socket_config_read_iprules(const char *filename, struct config_t *config, bool imported)
 {
-#ifndef MINICORE
 	struct config_setting_t *setting = NULL;
 	const char *temp = NULL;
 
@@ -1386,11 +1384,12 @@ static bool socket_config_read_iprules(const char *filename, struct config_t *co
 	} else {
 		access_list_add(setting, "deny_list", &access_deny);
 	}
-#endif // ! MINICORE
 
 	return true;
 }
+#endif // ! MINICORE
 
+#ifndef MINICORE
 /**
  * Reads 'socket_configuration/ddos' and initializes required variables.
  *
@@ -1402,7 +1401,6 @@ static bool socket_config_read_iprules(const char *filename, struct config_t *co
  */
 static bool socket_config_read_ddos(const char *filename, struct config_t *config, bool imported)
 {
-#ifndef MINICORE
 	struct config_setting_t *setting = NULL;
 
 	nullpo_retr(false, filename);
@@ -1419,9 +1417,9 @@ static bool socket_config_read_ddos(const char *filename, struct config_t *confi
 	libconfig->setting_lookup_int(setting, "count", &ddos_count);
 	libconfig->setting_lookup_int(setting, "autoreset", &ddos_autoreset);
 
-#endif // ! MINICORE
 	return true;
 }
+#endif // ! MINICORE
 
 /**
  * Reads 'socket_configuration' and initializes required variables.
diff --git a/src/common/strlib.c b/src/common/strlib.c
index c9448177b..ddb1eb78a 100644
--- a/src/common/strlib.c
+++ b/src/common/strlib.c
@@ -1137,17 +1137,8 @@ void strlib_defaults(void)
 	strlib->normalize_name_ = strlib_normalize_name;
 	strlib->stristr_ = strlib_stristr;
 
-#if !(defined(WIN32) && defined(_MSC_VER)) && !defined(HAVE_STRNLEN)
 	strlib->strnlen_ = strlib_strnlen;
-#else
-	strlib->strnlen_ = NULL;
-#endif
-
-#ifdef WIN32
 	strlib->strtok_r_ = strlib_strtok_r;
-#else
-	strlib->strtok_r_ = NULL;
-#endif
 
 	strlib->e_mail_check_ = strlib_e_mail_check;
 	strlib->config_switch_ = strlib_config_switch;
-- 
cgit v1.2.3-60-g2f50