Minix/rpi_b
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Libraries updates and cleanup

Browse Source 
* Updating common/lib
 * Updating lib/csu
 * Updating lib/libc
 * Updating libexec/ld.elf_so
 * Corrected test on __minix in featuretest to actually follow the
   meaning of the comment.
 * Cleaned up _REENTRANT-related defintions.
 * Disabled -D_REENTRANT for libfetch
 * Removing some unneeded __NBSD_LIBC defines and tests

Change-Id: Ic1394baef74d11b9f86b312f5ff4bbc3cbf72ce2
This commit is contained in:
sambuc
2013-01-14 11:36:26 +01:00
parent f6aac1c3b5
commit f14fb60209
1285 changed files with 44244 additions and 14308 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/libc/stdlib/lsearch.c
+10 -19
View File
@@ -35,7 +35,7 @@
#if 0
static char sccsid[] = "@(#)lsearch.c 8.1 (Berkeley) 6/4/93";
#else
__RCSID("$NetBSD: lsearch.c,v 1.4 2005/07/16 17:32:09 christos Exp $");
__RCSID("$NetBSD: lsearch.c,v 1.7 2012/06/25 22:32:45 abs Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -46,16 +46,13 @@ __RCSID("$NetBSD: lsearch.c,v 1.4 2005/07/16 17:32:09 christos Exp $");
#include <string.h>
#include <search.h>
typedef int (*cmp_fn_t) __P((const void *, const void *));
static void *linear_base __P((const void *, void *, size_t *, size_t,
cmp_fn_t, int));
typedef int (*cmp_fn_t)(const void *, const void *);
static void *linear_base(const void *, void *, size_t *, size_t,
cmp_fn_t, int);
void *
lsearch(key, base, nelp, width, compar)
const void *key;
void *base;
size_t *nelp, width;
cmp_fn_t compar;
lsearch(const void *key, void *base, size_t *nelp, size_t width,
cmp_fn_t compar)
{
_DIAGASSERT(key != NULL);
@@ -66,10 +63,8 @@ lsearch(key, base, nelp, width, compar)
}
void *
lfind(key, base, nelp, width, compar)
const void *key, *base;
size_t *nelp, width;
cmp_fn_t compar;
lfind(const void *key, const void *base, size_t *nelp, size_t width,
cmp_fn_t compar)
{
_DIAGASSERT(key != NULL);
@@ -80,12 +75,8 @@ lfind(key, base, nelp, width, compar)
}
static void *
linear_base(key, base, nelp, width, compar, add_flag)
const void *key;
void *base;
size_t *nelp, width;
cmp_fn_t compar;
int add_flag;
linear_base(const void *key, void *base, size_t *nelp, size_t width,
cmp_fn_t compar, int add_flag)
{
char *element, *end;