Update copyright notice

[empserver] / src / lib / lwp / status.c

diff --git a/src/lib/lwp/status.c b/src/lib/lwp/status.c
index 0cff83383969bdbb42cde7e70652407b3523e3b7..2408214fe28be1a37bbbd3c4941012c48d85d9e9 100644 (file)
--- a/src/lib/lwp/status.c
+++ b/src/lib/lwp/status.c
@@ -1,11 +1,12 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2000, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1994-2016, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *                Ken Stevens, Steve McClure, Markus Armbruster
+ *  Copyright (C) 1991-3 Stephen Crane
  *
- *  This program is free software; you can redistribute it and/or modify
+ *  Empire is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
+ *  the Free Software Foundation, either version 3 of the License, or
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
@@ -14,31 +15,29 @@
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  *  ---
  *
- *  See the "LEGAL", "LICENSE", "CREDITS" and "README" files for all the
- *  related information and legal notices. It is expected that any future
- *  projects/authors will amend these files as needed.
+ *  See files README, COPYING and CREDITS in the root of the source
+ *  tree for related information and legal notices.  It is expected
+ *  that future projects/authors will amend these files as needed.
  *
  *  ---
  *
  *  status.c: Process and perhaps display status messages
- * 
+ *
  *  Known contributors to this file:
  *     Dave Pare, 1994
  */
 
+#include <config.h>
+
 #include <stdarg.h>
-#ifdef BOUNDS_CHECK
-#include <bounds/fix-args.h>
-#endif
+#include <stdio.h>
+#include <sys/time.h>
 #include "lwp.h"
-#include "prototypes.h"
-
-#if defined(_EMPTH_LWP)
+#include "lwpint.h"
 
 void
 lwpStatus(struct lwpProc *proc, char *format, ...)
@@ -46,25 +45,23 @@ lwpStatus(struct lwpProc *proc, char *format, ...)
     va_list ap;
     static struct timeval startTime;
     struct timeval tv;
-    char buf[1024];
     int sec, msec;
 
     va_start(ap, format);
     if (proc->flags & LWP_PRINT) {
        if (startTime.tv_sec == 0)
-           gettimeofday(&startTime, 0);
-       gettimeofday(&tv, 0);
+           gettimeofday(&startTime, NULL);
+       gettimeofday(&tv, NULL);
        sec = tv.tv_sec - startTime.tv_sec;
        msec = (tv.tv_usec - startTime.tv_usec) / 1000;
        if (msec < 0) {
            sec++;
            msec += 1000;
        }
-       vsprintf(buf, format, ap);
-       printf("%d:%02d.%03d %17s[%d]: %s\n", sec / 60, sec % 60,
-              msec / 10, proc->name, proc->pri, buf);
+       printf("%d:%02d.%03d %17s[%d]: ",
+              sec / 60, sec % 60, msec / 10, proc->name, proc->pri);
+       vprintf(format, ap);
+       putchar('\n');
     }
     va_end(ap);
 }
-
-#endif