summaryrefslogtreecommitdiff
path: root/include/search.h
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2012-11-18 06:17:03 -0500
committerMike Frysinger <vapier@gentoo.org>2012-11-18 06:17:03 -0500
commit290e19f8147d9b3c0166d3520e718ae5603e4cef (patch)
tree3c77d58f8cd8115b861809560e644699341c14ee /include/search.h
parent266bdc1f623fe6fe489e5115e0f8ef723705d949 (diff)
drop support for pre ISO-C compilers
This drops __signed, __volatile, and __const. Only the latter was used in the code base, and for uClibc, not consistently. Much of the code used plain "const" which meant "__const" was useless. Really, the point of this is to stay in sync with what glibc did. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'include/search.h')
-rw-r--r--include/search.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/include/search.h b/include/search.h
index 0ec7b7992..f93c788b4 100644
--- a/include/search.h
+++ b/include/search.h
@@ -51,7 +51,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;
@@ -129,30 +129,30 @@ 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);
libc_hidden_proto(tsearch)
/* 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);
libc_hidden_proto(tfind)
/* 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
@@ -167,13 +167,13 @@ libc_hidden_proto(tdestroy)
/* 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);
libc_hidden_proto(lfind)
/* 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