/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2010, Dave Pare, Jeff Bailey, Thomas Ruschak,
- * Ken Stevens, Steve McClure
+ * Copyright (C) 1986-2011, 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,
* 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/>.
*
* ---
*
* stmtch.c: Matching operations on structures and commands
*
* Known contributors to this file:
- * Markus Armbruster, 2004-2008
+ * Markus Armbruster, 2004-2010
*/
#include <config.h>
* Return M_NOTFOUND if there are no matches, M_NOTUNIQUE if there are
* several.
* Each array element has a pointer to its name stored at offset OFFS.
- * Search stops when this name is a null pointer or empty.
+ * Search stops when this name is a null pointer.
+ * It ignores elements with an empty name.
* NEEDLE is compared to element names with mineq(NEEDLE, NAME).
- * ELT_SIZE gives the size of an array element.
+ * SIZE gives the size of an array element.
*/
int
-stmtch(char *needle, void *haystack, ptrdiff_t offs, size_t elt_size)
+stmtch(char *needle, void *haystack, ptrdiff_t offs, size_t size)
{
-#define ELT_NAME(i) (*(char **)((char *)haystack + (i)*elt_size + offs))
int i, res;
+ char *name;
res = M_NOTFOUND;
- for (i = 0; ELT_NAME(i) && ELT_NAME(i)[0] != 0; i++) {
- switch (mineq(needle, ELT_NAME(i))) {
+ for (i = 0;; i++) {
+ name = *(char **)((char *)haystack + i * size + offs);
+ if (!name)
+ break;
+ if (!*name)
+ continue;
+ switch (mineq(needle, name)) {
case ME_MISMATCH:
break;
case ME_PARTIAL:
}
}
return res;
-#undef ELT_NAME
}
/*