Browse Source

Change lsearch()'s "base" argument to require a non-const pointer to

align with POSIX and other systems.
Pointed out by Elliott Hughes on tech
ok deraadt
OPENBSD_5_6
matthew 10 years ago
parent
commit
3d494c5a79
2 changed files with 4 additions and 4 deletions
  1. +2
    -2
      src/include/search.h
  2. +2
    -2
      src/lib/libc/stdlib/lsearch.c

+ 2
- 2
src/include/search.h View File

@ -1,4 +1,4 @@
/* $OpenBSD: search.h,v 1.9 2012/07/10 11:44:55 guenther Exp $ */
/* $OpenBSD: search.h,v 1.10 2014/07/18 04:16:09 matthew Exp $ */
/* $NetBSD: search.h,v 1.9 1995/08/08 21:14:45 jtc Exp $ */ /* $NetBSD: search.h,v 1.9 1995/08/08 21:14:45 jtc Exp $ */
/* /*
@ -40,7 +40,7 @@ ENTRY *hsearch(ENTRY, ACTION);
void *lfind(const void *, const void *, size_t *, size_t, void *lfind(const void *, const void *, size_t *, size_t,
int (*)(const void *, const void *)); 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 *)); int (*)(const void *, const void *));
void insque(void *, void *); void insque(void *, void *);
void remque(void *); void remque(void *);


+ 2
- 2
src/lib/libc/stdlib/lsearch.c View File

@ -1,4 +1,4 @@
/* $OpenBSD: lsearch.c,v 1.4 2009/10/27 23:59:59 deraadt Exp $ */
/* $OpenBSD: lsearch.c,v 1.5 2014/07/18 04:16:09 matthew Exp $ */
/* /*
* Copyright (c) 1989, 1993 * Copyright (c) 1989, 1993
@ -41,7 +41,7 @@ static void *linear_base(const void *, const void *, size_t *, size_t,
cmp_fn_t, int); cmp_fn_t, int);
void * void *
lsearch(const void *key, const void *base, size_t *nelp, size_t width,
lsearch(const void *key, void *base, size_t *nelp, size_t width,
cmp_fn_t compar) cmp_fn_t compar)
{ {


Loading…
Cancel
Save