From: Alexander Barton <alex@barton.de>
Date: Mon, 29 Jan 2018 22:32:06 +0000 (+0100)
Subject: Fix compiler warning in Option_String()
X-Git-Tag: rel-25-rc1~17
X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=commitdiff_plain;h=d9f81ac66942000861d46cd33708585a729b1207

Fix compiler warning in Option_String()

When compiling ngIRCd without support for SSL and without support for
ZLIB, gcc outputs the following warning:

  irc.c:493:9: warning: variable ‘options’ set but not used
    [-Wunused-but-set-variable]

Fix it by providing a dummy function in this case.
---

diff --git a/src/ngircd/irc.c b/src/ngircd/irc.c
index 7acd84ee..dc3b2f2e 100644
--- a/src/ngircd/irc.c
+++ b/src/ngircd/irc.c
@@ -483,11 +483,8 @@ Help(CLIENT *Client, const char *Topic)
  * @return Pointer to static (global) string buffer.
  */
 static char *
-#ifdef ZLIB
+#if defined(SSL_SUPPORT) || defined(ZLIB)
 Option_String(CONN_ID Idx)
-#else
-Option_String(UNUSED CONN_ID Idx)
-#endif
 {
 	static char option_txt[8];
 	UINT16 options;
@@ -507,6 +504,11 @@ Option_String(UNUSED CONN_ID Idx)
 #endif
 
 	return option_txt;
+#else
+Option_String(UNUSED CONN_ID Idx)
+{
+	return "";
+#endif
 } /* Option_String */
 
 /**