Update copyright notice

[empserver] / src / lib / gen / log.c

diff --git a/src/lib/gen/log.c b/src/lib/gen/log.c
index 668111eb46759fe87f1add0276b34ef5a67a8cac..3ad05e182777d34cdfdd5809c3ead9b576f36155 100644 (file)
--- a/src/lib/gen/log.c
+++ b/src/lib/gen/log.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2009, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2016, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *                Ken Stevens, Steve McClure, Markus Armbruster
  *
- *  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,8 +14,7 @@
  *  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/>.
  *
  *  ---
  *
@@ -29,7 +28,7 @@
  *
  *  Known contributors to this file:
  *     Dave Pare, 1989
- *     Markus Armbruster, 2003-2009
+ *     Markus Armbruster, 2003-2010
  */
 
 #include <config.h>
@@ -42,8 +41,6 @@
 #include <time.h>
 #include <unistd.h>
 #include "misc.h"
-#include "optlist.h"
-#include "player.h"
 #include "prototypes.h"
 
 void (*oops_handler)(void) = abort;
@@ -54,7 +51,7 @@ static int logfd = -1;
 static int logopen(void);
 
 /*
- * Points log file at PROGRAM.log
+ * Points log file at @program.log
  */
 int
 loginit(char *program)
@@ -126,16 +123,13 @@ logerror(char *format, ...)
 }
 
 /*
- * Log internal error MSG occured in FILE:LINE.
- * Call oops handler, and if it returns, return 1.
- * Oops handler defaults to abort().
+ * Log internal error @msg occured in @file:@line, call oops handler.
  */
-int
+void
 oops(char *msg, char *file, int line)
 {
     logerror("Oops: %s in %s:%d", msg ? msg : "bug", file, line);
     oops_handler();
-    return 1;
 }
 
 /*