diff --git a/tests/server/mqttd.c b/tests/server/mqttd.c index 2fc3a5f94a..46760b94dd 100644 --- a/tests/server/mqttd.c +++ b/tests/server/mqttd.c @@ -102,7 +102,6 @@ struct configurable { static struct configurable config; -const char *serverlogfile = DEFAULT_LOGFILE; static const char *configfile = DEFAULT_CONFIG; static const char *logdir = "log"; static char loglockfile[256]; diff --git a/tests/server/resolve.c b/tests/server/resolve.c index 56964e03a9..0a0c884b94 100644 --- a/tests/server/resolve.c +++ b/tests/server/resolve.c @@ -53,8 +53,6 @@ static bool use_ipv6 = FALSE; static const char *ipv_inuse = "IPv4"; -const char *serverlogfile = ""; /* for a util.c function we don't use */ - int main(int argc, char *argv[]) { int arg = 1; diff --git a/tests/server/rtspd.c b/tests/server/rtspd.c index 181568395f..47f52afa46 100644 --- a/tests/server/rtspd.c +++ b/tests/server/rtspd.c @@ -128,7 +128,6 @@ static void storerequest(char *reqbuf, size_t totalsize); #define DEFAULT_LOGFILE "log/rtspd.log" #endif -const char *serverlogfile = DEFAULT_LOGFILE; static const char *logdir = "log"; static char loglockfile[256]; diff --git a/tests/server/sockfilt.c b/tests/server/sockfilt.c index 18f75a5236..90b7b5568b 100644 --- a/tests/server/sockfilt.c +++ b/tests/server/sockfilt.c @@ -135,8 +135,6 @@ test 1003 which tests exceedingly large server response lines */ #define BUFFER_SIZE 17010 -const char *serverlogfile = DEFAULT_LOGFILE; - static bool verbose = FALSE; static bool bind_only = FALSE; #ifdef USE_IPV6 diff --git a/tests/server/socksd.c b/tests/server/socksd.c index 92b261454e..7b3b32cd12 100644 --- a/tests/server/socksd.c +++ b/tests/server/socksd.c @@ -134,7 +134,6 @@ struct configurable { static struct configurable config; -const char *serverlogfile = DEFAULT_LOGFILE; static const char *reqlogfile = DEFAULT_REQFILE; static const char *configfile = DEFAULT_CONFIG; diff --git a/tests/server/sws.c b/tests/server/sws.c index fa83bc6a9a..f65bdd5f92 100644 --- a/tests/server/sws.c +++ b/tests/server/sws.c @@ -135,7 +135,6 @@ static void storerequest(const char *reqbuf, size_t totalsize); #define DEFAULT_LOGFILE "log/sws.log" #endif -const char *serverlogfile = DEFAULT_LOGFILE; static const char *logdir = "log"; static char loglockfile[256]; diff --git a/tests/server/tftpd.c b/tests/server/tftpd.c index 93f6537c6d..28542b15ef 100644 --- a/tests/server/tftpd.c +++ b/tests/server/tftpd.c @@ -205,7 +205,6 @@ static bool use_ipv6 = FALSE; #endif static const char *ipv_inuse = "IPv4"; -const char *serverlogfile = DEFAULT_LOGFILE; static const char *logdir = "log"; static char loglockfile[256]; static const char *pidname = ".tftpd.pid"; diff --git a/tests/server/util.c b/tests/server/util.c index d9f6d2162a..62934233ca 100644 --- a/tests/server/util.c +++ b/tests/server/util.c @@ -62,6 +62,8 @@ #define EINVAL 22 /* errno.h value */ #endif +const char *serverlogfile = DEFAULT_LOGFILE; + static struct timeval tvnow(void); /* This function returns a pointer to STATIC memory. It converts the given