COPYING duplicates information from README. Remove. Move GPL from

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

diff --git a/src/lib/common/type.c b/src/lib/common/type.c
index e01a5aaf02cc2778a64c2bb0a710539131cd1f09..18b0310c8ca8ed152cebb92df716b17d8e035d6f 100644 (file)
--- a/src/lib/common/type.c
+++ b/src/lib/common/type.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2000, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2006, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -19,9 +19,9 @@
  *
  *  ---
  *
- *  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.
  *
  *  ---
  *
@@ -32,9 +32,10 @@
  *     Steve McClure, 2000
  */
 
-#ifdef Rel4
+#include <config.h>
+
+#include <stddef.h>
 #include <string.h>
-#endif /* Rel4 */
 #include "misc.h"
 #include "ship.h"
 #include "land.h"
@@ -43,59 +44,57 @@
 #include "nuke.h"
 #include "file.h"
 #include "common.h"
+#include "match.h"
 
+/*
+ * Return index of sector called NAME in dchr[], or M_NOTFOUND.
+ */
 int
-typematch(s_char *buf, int type)
+sct_typematch(char *name)
 {
-       register int n;
-       int     len;
+    int i;
 
-       len = strlen(buf);
-       switch (type) {
-       case EF_SECTOR: {
-               register struct dchrstr *dcp;
-       
-               if (!buf[0] || buf[1])
-                       return -1;
-               for (dcp=dchr,n=0; dcp->d_name; n++,dcp++)
-                       if (dcp->d_mnem == *buf)
-                               return n;
-               }
-               break;
-       case EF_SHIP: {
-               register struct mchrstr *mcp;
-       
-               for (mcp=mchr,n=0; *mcp->m_name; n++,mcp++)
-                       if (strncmp(mcp->m_name, buf, len) == 0)
-                               return n;
-               }
-               break;
-       case EF_LAND: {
-               register struct lchrstr *lcp;
+    if (name[0] && !name[1])
+       for (i = 0; dchr[i].d_name; ++i)
+           if (dchr[i].d_mnem == *name)
+               return i;
+    return M_NOTFOUND;
+}
 
-               for (lcp=lchr,n=0; *lcp->l_name; n++,lcp++)
-                       if (strncmp(lcp->l_name, buf, len) == 0)
-                               return n;
-               }
-               break;
-       case EF_PLANE: {
-               register struct plchrstr *pcp;
-       
-               for (pcp=plchr,n=0; *pcp->pl_name; n++,pcp++)
-                       if (strncmp(pcp->pl_name, buf, len) == 0)
-                               return n;
-               }
-               break;
-       case EF_NUKE: {
-               register struct nchrstr *ncp;
-       
-               for (ncp=nchr,n=0; *ncp->n_name; n++,ncp++)
-                       if (strncmp(ncp->n_name, buf, len) == 0)
-                               return n;
-               }
-               break;
-       default:
-               break;
-       }
-       return -1;
+/*
+ * Search for NAME in the characteristics table for TYPE, return index.
+ * Return M_NOTFOUND if there are no matches, M_NOTUNIQUE if there are
+ * several.
+ * If TYPE is EF_SECTOR, search dchr[]
+ * If TYPE is EF_SHIP, search mchr[].
+ * If TYPE is EF_PLANE, search plchr[].
+ * If TYPE is EF_LAND, search lchr[].
+ * If TYPE is EF_NUKE, search nchr[].
+ */
+int
+typematch(char *name, int type)
+{
+    switch (type) {
+    case EF_SECTOR:
+       return sct_typematch(name);
+    case EF_SHIP:
+       return stmtch(name, mchr,
+                     offsetof(struct mchrstr, m_name),
+                     sizeof(mchr[0]));
+    case EF_LAND:
+       return stmtch(name, lchr,
+                     offsetof(struct lchrstr, l_name),
+                     sizeof(lchr[0]));
+    case EF_PLANE:
+       return stmtch(name, plchr,
+                     offsetof(struct plchrstr, pl_name),
+                     sizeof(plchr[0]));
+    case EF_NUKE:
+       return stmtch(name, nchr,
+                     offsetof(struct nchrstr, n_name),
+                     sizeof(nchr[0]));
+    default:
+       break;
+    }
+    return M_NOTFOUND;
 }