Update copyright notice

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

diff --git a/src/lib/common/cnumb.c b/src/lib/common/cnumb.c
index 26a48b1120855451f50b5e41f236a2bb8d4587e7..a01af45abbb71cfbfa47acb8e4cd6f44ab94ebcc 100644 (file)
--- a/src/lib/common/cnumb.c
+++ b/src/lib/common/cnumb.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2008, 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/>.
  *
  *  ---
  *
@@ -26,9 +25,9 @@
  *  ---
  *
  *  cnumb.c: Return country number give country name
- * 
+ *
  *  Known contributors to this file:
- *     
+ *
  */
 
 #include <config.h>
@@ -39,7 +38,7 @@
 #include "prototypes.h"
 
 /*
- * Search for a country matching CNTRY, return its number.
+ * Search for a country matching @cntry, return its number.
  * Return M_NOTFOUND if no such country exists, M_NOTUNIQUE if there
  * are several.
  */
@@ -54,7 +53,7 @@ cnumb(char *cntry)
 
     res = M_NOTFOUND;
     for (cn = 0; cn < MAXNOC; cn++) {
-       if ((natp = getnatp(cn)) == 0)
+       if (!(natp = getnatp(cn)))
            break;
        if (natp->nat_stat == STAT_UNUSED)
            continue;