Update copyright notice

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

diff --git a/src/lib/subs/whatitem.c b/src/lib/subs/whatitem.c
index e531739c41988d7bbebdfc8e8b0f7f9088acfa12..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-2000, 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,41 +14,60 @@
  *  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.
  *
  *  ---
  *
  *  whatitem.c: Return pointer to item chr struct given an item name
- * 
+ *
  *  Known contributors to this file:
- * 
+ *
  */
 
-#include "misc.h"
-#include "item.h"
+#include <config.h>
+
 #include "prototypes.h"
 
+/*
+ * Get item type argument.
+ * If @input is not empty, use it.
+ * Else prompt for more input using @prompt.
+ * Return item characteristics on success, else NULL.
+ */
 struct ichrstr *
-whatitem(s_char *ptr, s_char *prompt)
+whatitem(char *input, char *prompt)
 {
-       register s_char *p;
-       register struct ichrstr *ip;
-       s_char  buf[1024];
+    char *p;
+    struct ichrstr *ip;
+    char buf[1024];
 
-       p = getstarg(ptr, prompt, buf);
-       if (p == 0 || *p == 0)
-               return 0;
-       for (ip = &ichr[1]; ip->i_mnem != 0; ip++) {
-               if (*p == ip->i_mnem)
-                       return ip;
-       }
+    p = getstarg(input, prompt, buf);
+    if (!p || !*p)
+       return NULL;
+    ip = item_by_name(p);
+    if (!ip)
        pr("Unrecognized item \"%c\"\n", *p);
-       return 0;
+    return ip;
+}
+
+/*
+ * Map item type name @str to item characteristics, NULL if not found.
+ */
+struct ichrstr *
+item_by_name(char *str)
+{
+    struct ichrstr *ip;
+
+    for (ip = ichr; ip->i_mnem != 0; ip++) {
+       /* FIXME check i_name if str[2]? */
+       if (*str == ip->i_mnem)
+           return ip;
+    }
+    return NULL;
 }