summaryrefslogtreecommitdiff
path: root/lib/libcompat
diff options
context:
space:
mode:
authorchristos <christos@NetBSD.org>1999-05-04 17:10:10 +0000
committerchristos <christos@NetBSD.org>1999-05-04 17:10:10 +0000
commitbc6a12aaec59c31dfd56b538a25599aabc4cfe14 (patch)
treed9ca4d7359286d8d9e1b3999a2744c266b8f6a1f /lib/libcompat
parentd2cc1353b867b6a9bf73e4b4b9500bab42d59627 (diff)
De-constify the code, and add const castaway lint comments.
Diffstat (limited to 'lib/libcompat')
-rw-r--r--lib/libcompat/4.3/lsearch.c16
1 files changed, 9 insertions, 7 deletions
diff --git a/lib/libcompat/4.3/lsearch.c b/lib/libcompat/4.3/lsearch.c
index 63e52f231e8..6573335708d 100644
--- a/lib/libcompat/4.3/lsearch.c
+++ b/lib/libcompat/4.3/lsearch.c
@@ -39,7 +39,7 @@
#if 0
static char sccsid[] = "@(#)lsearch.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: lsearch.c,v 1.4 1998/02/03 18:58:07 perry Exp $");
+__RCSID("$NetBSD: lsearch.c,v 1.5 1999/05/04 17:10:10 christos Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -76,12 +76,14 @@ linear_base(key, base, nelp, width, compar, add_flag)
cmp_fn_t compar;
int add_flag;
{
- const char *element, *end;
+ char *element, *end;
- end = (const char *)base + *nelp * width;
- for (element = base; element < end; element += width)
+ /* 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((void *)element);
+ return element;
if (!add_flag) /* key not found */
return(NULL);
@@ -96,6 +98,6 @@ linear_base(key, base, nelp, width, compar, add_flag)
* manual.
*/
++*nelp;
- memcpy((void *)end, key, width);
- return((void *)end);
+ memcpy(end, key, width);
+ return end;
}