diff options
| author | Ulrich Drepper <drepper@gmail.com> | 2012-01-07 23:57:22 -0500 |
|---|---|---|
| committer | Ulrich Drepper <drepper@gmail.com> | 2012-01-07 23:57:22 -0500 |
| commit | a784e502472fb3a1afa4d01a47c66b52d23e00f6 (patch) | |
| tree | 5ebaa084119dcffe41671a62e2e799b172c57d24 /misc/search.h | |
| parent | 33808bf1164be2e7c8535bdd5ac398c75c33ed49 (diff) | |
| download | glibc-a784e502472fb3a1afa4d01a47c66b52d23e00f6.tar glibc-a784e502472fb3a1afa4d01a47c66b52d23e00f6.tar.gz glibc-a784e502472fb3a1afa4d01a47c66b52d23e00f6.tar.bz2 glibc-a784e502472fb3a1afa4d01a47c66b52d23e00f6.zip | |
Remove pre-ISO C support
No more __const.
Diffstat (limited to 'misc/search.h')
| -rw-r--r-- | misc/search.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/misc/search.h b/misc/search.h index 2ffba697b0..a3610be7db 100644 --- a/misc/search.h +++ b/misc/search.h @@ -1,5 +1,5 @@ /* Declarations for System V style searching functions. - Copyright (C) 1995-1999, 2000 Free Software Foundation, Inc. + Copyright (C) 1995-1999, 2000, 2012 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -52,7 +52,7 @@ extern void remque (void *__elem) __THROW; /* For use with hsearch(3). */ #ifndef __COMPAR_FN_T # define __COMPAR_FN_T -typedef int (*__compar_fn_t) (__const void *, __const void *); +typedef int (*__compar_fn_t) (const void *, const void *); # ifdef __USE_GNU typedef __compar_fn_t comparison_fn_t; @@ -127,28 +127,28 @@ VISIT; /* Search for an entry matching the given KEY in the tree pointed to by *ROOTP and insert a new element if not found. */ -extern void *tsearch (__const void *__key, void **__rootp, +extern void *tsearch (const void *__key, void **__rootp, __compar_fn_t __compar); /* Search for an entry matching the given KEY in the tree pointed to by *ROOTP. If no matching entry is available return NULL. */ -extern void *tfind (__const void *__key, void *__const *__rootp, +extern void *tfind (const void *__key, void *const *__rootp, __compar_fn_t __compar); /* Remove the element matching KEY from the tree pointed to by *ROOTP. */ -extern void *tdelete (__const void *__restrict __key, +extern void *tdelete (const void *__restrict __key, void **__restrict __rootp, __compar_fn_t __compar); #ifndef __ACTION_FN_T # define __ACTION_FN_T -typedef void (*__action_fn_t) (__const void *__nodep, VISIT __value, +typedef void (*__action_fn_t) (const void *__nodep, VISIT __value, int __level); #endif /* Walk through the whole tree and call the ACTION callback for every node or leaf. */ -extern void twalk (__const void *__root, __action_fn_t __action); +extern void twalk (const void *__root, __action_fn_t __action); #ifdef __USE_GNU /* Callback type for function to free a tree node. If the keys are atomic @@ -162,12 +162,12 @@ extern void tdestroy (void *__root, __free_fn_t __freefct); /* Perform linear search for KEY by comparing by COMPAR in an array [BASE,BASE+NMEMB*SIZE). */ -extern void *lfind (__const void *__key, __const void *__base, +extern void *lfind (const void *__key, const void *__base, size_t *__nmemb, size_t __size, __compar_fn_t __compar); /* Perform linear search for KEY by comparing by COMPAR function in array [BASE,BASE+NMEMB*SIZE) and insert entry if not found. */ -extern void *lsearch (__const void *__key, void *__base, +extern void *lsearch (const void *__key, void *__base, size_t *__nmemb, size_t __size, __compar_fn_t __compar); __END_DECLS |