Update copyright notice

[empserver] / src / lib / common / wantupd.c

diff --git a/src/lib/common/wantupd.c b/src/lib/common/wantupd.c
index f58fedec8c85d9f68bbaeee7d86851437f78baad..913960c37b72495af9f719b26dafbc02d05959bc 100644 (file)
--- a/src/lib/common/wantupd.c
+++ b/src/lib/common/wantupd.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2007, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2017, 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/>.
  *
  *  ---
  *
@@ -26,23 +25,15 @@
  *  ---
  *
  *  wantupd.c: Check to se if an update is wanted and/or allowed.
- * 
+ *
  *  Known contributors to this file:
  *     Doug Hay, 1990
  */
 
 #include <config.h>
 
-#include <fcntl.h>
-#include <stdio.h>
-#if defined(_WIN32)
-#include <io.h>
-#endif
 #include <time.h>
-#if !defined(_WIN32)
-#include <unistd.h>
-#endif
-#include "file.h"
+#include "game.h"
 #include "misc.h"
 #include "nat.h"
 #include "optlist.h"
@@ -68,7 +59,7 @@ demand_update_want(int *want, int *pop, int which)
     int whichwants;
 
     whichwants = totpop = totwant = 0;
-    for (cn = 1; 0 != (natp = getnatp(cn)); cn++) {
+    for (cn = 1; (natp = getnatp(cn)); cn++) {
        /* Only countries which are normal. */
        /* Should probably include sanctuaries ..... */
        if (natp->nat_stat == STAT_ACTIVE) {
@@ -116,14 +107,3 @@ demandupdatecheck(void)
        && demand_update_time(&now)
        && demand_check();
 }
-
-int
-updates_disabled(void)
-{
-    int fd;
-
-    if ((fd = open(disablefil, O_RDONLY, 0)) < 0)
-       return 0;
-    close(fd);
-    return 1;
-}