Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

The source array of lsearch() shouldn't be "const". 

Being here, cleanup the const castaway stuff.
This commit is contained in:
drochner 2005-07-06 15:47:15 +00:00
parent e866f2794b
commit ecef4b3d3f
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/search.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: search.h,v 1.17 2005/03/22 20:13:42 kleink Exp $ */
/* $NetBSD: search.h,v 1.18 2005/07/06 15:47:15 drochner Exp $ */
/*
* Written by J.T. Conklin <jtc@NetBSD.org>
@ -52,7 +52,7 @@ ENTRY *hsearch(ENTRY, ACTION);
void *lfind(const void *, const void *, size_t *, size_t,
int (*)(const void *, const void *));
void *lsearch(const void *, const void *, size_t *, size_t,
void *lsearch(const void *, void *, size_t *, size_t,
int (*)(const void *, const void *));
void insque(void *, void *);
void remque(void *);

14
lib/libc/stdlib/lsearch.c
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.1 2005/07/06 14:43:24 drochner Exp $");
__RCSID("$NetBSD: lsearch.c,v 1.2 2005/07/06 15:47:15 drochner Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@ -47,12 +47,13 @@ __RCSID("$NetBSD: lsearch.c,v 1.1 2005/07/06 14:43:24 drochner Exp $");
#include <search.h>
typedef int (*cmp_fn_t) __P((const void *, const void *));
static void *linear_base __P((const void *, const void *, size_t *, size_t,
static void *linear_base __P((const void *, void *, size_t *, size_t,
cmp_fn_t, int));
void *
lsearch(key, base, nelp, width, compar)
const void *key, *base;
const void *key;
void *base;
size_t *nelp, width;
cmp_fn_t compar;
{
@ -75,12 +76,13 @@ lfind(key, base, nelp, width, compar)
_DIAGASSERT(base != NULL);
_DIAGASSERT(compar != NULL);
return(linear_base(key, base, nelp, width, compar, 0));
return(linear_base(key, __UNCONST(base), nelp, width, compar, 0));
}
static void *
linear_base(key, base, nelp, width, compar, add_flag)
const void *key, *base;
const void *key;
void *base;
size_t *nelp, width;
cmp_fn_t compar;
int add_flag;
@ -91,9 +93,7 @@ linear_base(key, base, nelp, width, compar, add_flag)
_DIAGASSERT(base != NULL);
_DIAGASSERT(compar != NULL);
/* LINTED const castaway */
end = (char *)base + *nelp * width;
/* LINTED const castaway */
for (element = (char *)base; element < end; element += width)
if (!compar(element, key)) /* key found */
return element;