(loginit, main): Pass log file basename as parameter.

(logerror): Require prior call of loginit().
(empth_exit) [_EMPTH_WIN32]: Don't print the log file name here, it's
not modular.
(program, getlogfile): Unused, remove.

diff --git a/include/prototypes.h b/include/prototypes.h
index 0e75ff644ce71a596b7326063efde8412606fcac..3a479d6ec76dbe3d8715cc2a9ef0fbbe95e8a103 100644 (file)
--- a/include/prototypes.h
+++ b/include/prototypes.h
@@ -332,7 +332,7 @@ extern int has_units_with_mob(coord, coord, natid);
 extern int adj_units(coord, coord, natid);
 extern int has_helpful_engineer(coord x, coord y, natid cn);
 /* log.c */
-extern void loginit(void);
+extern void loginit(s_char *);
 extern void logerror(s_char *, ...);
 /* maps.c */
 extern int draw_map(int, s_char, int, struct nstr_sect *, int);

diff --git a/src/lib/common/log.c b/src/lib/common/log.c
index 9a5abb1b95da091f07e2971202fb5ed499bf515e..dc42373e6e320e0ad7c78098f1e082dd64d0985a 100644 (file)
--- a/src/lib/common/log.c
+++ b/src/lib/common/log.c
@@ -49,19 +49,12 @@
 
 static s_char *logfile = 0;
 
-s_char *
-getlogfile(void)
-{
-    return (s_char *)logfile;
-}
-
 /*
  * Points logfile at datadir/"program".log
  */
 void
-loginit(void)
+loginit(s_char *program)
 {
-    extern s_char program[];
     s_char buf[1024];
 
 #if !defined(_WIN32)
@@ -85,8 +78,6 @@ logerror(s_char *format, ...)
     int logf;
     s_char *p;
 
-    if (logfile == 0)
-       loginit();
     va_start(list, format);
     vsprintf(buf, format, list);
     if ((p = strchr(buf, '\n')) != 0)

diff --git a/src/lib/empthread/ntthread.c b/src/lib/empthread/ntthread.c
index d2b73fe3ff57c795a6de39cd6ab41e642ddbfbd2..54bb324f24ec244cf2dfbfa94ccd8796397ad326 100644 (file)
--- a/src/lib/empthread/ntthread.c
+++ b/src/lib/empthread/ntthread.c
@@ -454,8 +454,6 @@ empth_self(void)
 void
 empth_exit(void)
 {
-    s_char *getlogfile();
-
     loc_Thread_t *pThread =
        (loc_Thread_t *)TlsGetValue(loc_GVAR.dwTLSIndex);
 
@@ -466,9 +464,6 @@ empth_exit(void)
     if (pThread->bMainThread) {
        char buf[20];
        /* The main line.  Wait forever. */
-       if (getlogfile() == (s_char *)0)
-           loginit();
-       printf("log file: %s\n", getlogfile());
        while (1) {
            printf("\nEmpire Server>");
            fgets(buf, sizeof(buf), stdin);

diff --git a/src/server/main.c b/src/server/main.c
index 70a6ece2568b70d973803fbca213d8c314852706..bd8ae4905a641a6deae3a974b6152f4822cee8f3 100644 (file)
--- a/src/server/main.c
+++ b/src/server/main.c
@@ -67,8 +67,6 @@
 #include "server.h"
 #include "prototypes.h"
 
-s_char program[] = "server";
-
 void nullify_objects(void);
 void init_files(void);
 void close_files(void);
@@ -101,6 +99,8 @@ main(int argc, char **argv)
     struct sigaction act;
 #endif /* POSIXSIGNALS */
 
+    loginit("server");
+
 #if !defined(_WIN32)
     mainpid = getpid();