empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Change stmtch() to recognize only null as sentinel

Browse source 
Before, it also recognized "" (since commit 844b654d, v4.2.14), but
no caller depends on that.

While there, back out the macro cleverness added in commit 844b654d.
This commit is contained in:
Markus Armbruster 2011-04-25 14:21:44 +02:00
parent 29d7b30b2f
commit 1e9c9c8273
1 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/lib/common/stmtch.c
View file

@ -39,19 +39,22 @@
* Return M_NOTFOUND if there are no matches, M_NOTUNIQUE if there are * Return M_NOTFOUND if there are no matches, M_NOTUNIQUE if there are
* several. * several.
* Each array element has a pointer to its name stored at offset OFFS. * 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.
* NEEDLE is compared to element names with mineq(NEEDLE, 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 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; int i, res;
char *name;
res = M_NOTFOUND; res = M_NOTFOUND;
for (i = 0; ELT_NAME(i) && ELT_NAME(i)[0] != 0; i++) { for (i = 0;; i++) {
switch (mineq(needle, ELT_NAME(i))) { name = *(char **)((char *)haystack + i * size + offs);
if (!name)
break;
switch (mineq(needle, name)) {
case ME_MISMATCH: case ME_MISMATCH:
break; break;
case ME_PARTIAL: case ME_PARTIAL:
@ -65,7 +68,6 @@ stmtch(char *needle, void *haystack, ptrdiff_t offs, size_t elt_size)
} }
} }
return res; return res;
#undef ELT_NAME
} }
/* /*