From: Szabolcs Nagy Date: Sun, 5 Mar 2017 22:03:35 +0000 (+0100) Subject: fix lsearch and lfind to pass key as first arg to the compar callback X-Git-Tag: v1.1.17~103 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=827c4e6fbe46142049ef3d8bcb8f35951712797d;p=oweals%2Fmusl.git fix lsearch and lfind to pass key as first arg to the compar callback this is not a conformance issue as posix does not specify the argument order, but the order is specified for bsearch and some systems document the order for lsearch consistently (openbsd). since there were two indpendent reports of this issue it's better to use the more widely expected argument order. --- diff --git a/src/search/lsearch.c b/src/search/lsearch.c index 63f31922..5eb5cc2b 100644 --- a/src/search/lsearch.c +++ b/src/search/lsearch.c @@ -9,7 +9,7 @@ void *lsearch(const void *key, void *base, size_t *nelp, size_t width, size_t i; for (i = 0; i < n; i++) - if (compar(p[i], key) == 0) + if (compar(key, p[i]) == 0) return p[i]; *nelp = n+1; return memcpy(p[n], key, width); @@ -23,7 +23,7 @@ void *lfind(const void *key, const void *base, size_t *nelp, size_t i; for (i = 0; i < n; i++) - if (compar(p[i], key) == 0) + if (compar(key, p[i]) == 0) return p[i]; return 0; }