Update copyright notice

[empserver] / src / lib / subs / whatitem.c

diff --git a/src/lib/subs/whatitem.c b/src/lib/subs/whatitem.c
index 2b7cfb49e093e4b6c2b73cb605540abfb5a3bd9c..8c2db962f3a5f6d0edd1d6a7d97ec2d3a8c38043 100644 (file)
--- a/src/lib/subs/whatitem.c
+++ b/src/lib/subs/whatitem.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/>.
  *
  *  ---
  *
@@ -37,7 +36,8 @@
 
 /*
  * Get item type argument.
- * If INPUT is not empty, use it, else prompt for more input using PROMPT.
+ * If @input is not empty, use it.
+ * Else prompt for more input using @prompt.
  * Return item characteristics on success, else NULL.
  */
 struct ichrstr *
@@ -48,8 +48,8 @@ whatitem(char *input, char *prompt)
     char buf[1024];
 
     p = getstarg(input, prompt, buf);
-    if (p == 0 || *p == 0)
-       return 0;
+    if (!p || !*p)
+       return NULL;
     ip = item_by_name(p);
     if (!ip)
        pr("Unrecognized item \"%c\"\n", *p);
@@ -57,7 +57,7 @@ whatitem(char *input, char *prompt)
 }
 
 /*
- * Map item type name STR to item characteristics, NULL if not found.
+ * Map item type name @str to item characteristics, NULL if not found.
  */
 struct ichrstr *
 item_by_name(char *str)
@@ -69,5 +69,5 @@ item_by_name(char *str)
        if (*str == ip->i_mnem)
            return ip;
     }
-    return 0;
+    return NULL;
 }