summaryrefslogtreecommitdiff
path: root/libc/misc/search
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2008-11-20 22:11:44 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2008-11-20 22:11:44 +0000
commitcb97aadebfeba7f5e8f1b85beee5ab10e88c2990 (patch)
treef5f56f2ef0f3048325419857d0b538135524ff8c /libc/misc/search
parentb133fe1cac9f99b63ea56daf92caa1423b1289d0 (diff)
Last portion of libc_hidden_proto removal.
Appears to build fine (several .configs tried)
Diffstat (limited to 'libc/misc/search')
-rw-r--r--libc/misc/search/_hsearch_r.c6
-rw-r--r--libc/misc/search/_lsearch.c2
-rw-r--r--libc/misc/search/_tsearch.c6
-rw-r--r--libc/misc/search/hsearch.c6
4 files changed, 10 insertions, 10 deletions
diff --git a/libc/misc/search/_hsearch_r.c b/libc/misc/search/_hsearch_r.c
index c9c4a9ccf..85475cf5e 100644
--- a/libc/misc/search/_hsearch_r.c
+++ b/libc/misc/search/_hsearch_r.c
@@ -64,7 +64,7 @@ static int isprime (unsigned int number)
indexing as explained in the comment for the hsearch function.
The contents of the table is zeroed, especially the field used
becomes zero. */
-libc_hidden_proto(hcreate_r)
+/* libc_hidden_proto(hcreate_r) */
int hcreate_r (size_t nel, struct hsearch_data *htab)
{
/* Test for correct arguments. */
@@ -100,7 +100,7 @@ libc_hidden_def(hcreate_r)
#ifdef L_hdestroy_r
/* After using the hash table it has to be destroyed. The used memory can
be freed and the local static variable can be marked as not used. */
-libc_hidden_proto(hdestroy_r)
+/* libc_hidden_proto(hdestroy_r) */
void hdestroy_r (struct hsearch_data *htab)
{
/* Test for correct arguments. */
@@ -137,7 +137,7 @@ libc_hidden_def(hdestroy_r)
/* Experimentally off - libc_hidden_proto(strcmp) */
/* Experimentally off - libc_hidden_proto(strlen) */
-libc_hidden_proto(hsearch_r)
+/* libc_hidden_proto(hsearch_r) */
int hsearch_r (ENTRY item, ACTION action, ENTRY **retval,
struct hsearch_data *htab)
{
diff --git a/libc/misc/search/_lsearch.c b/libc/misc/search/_lsearch.c
index e446489ed..da737bab4 100644
--- a/libc/misc/search/_lsearch.c
+++ b/libc/misc/search/_lsearch.c
@@ -12,7 +12,7 @@
#include <stdio.h>
#include <search.h>
-libc_hidden_proto(lfind)
+/* libc_hidden_proto(lfind) */
#ifdef L_lfind
diff --git a/libc/misc/search/_tsearch.c b/libc/misc/search/_tsearch.c
index 3d43aa543..5f3706d64 100644
--- a/libc/misc/search/_tsearch.c
+++ b/libc/misc/search/_tsearch.c
@@ -50,7 +50,7 @@ register node **rootp; address of tree root
int (*compar)(); ordering function
*/
-libc_hidden_proto(tsearch)
+/* libc_hidden_proto(tsearch) */
void *tsearch(__const void *key, void **vrootp, __compar_fn_t compar)
{
register node *q;
@@ -81,7 +81,7 @@ libc_hidden_def(tsearch)
#endif
#ifdef L_tfind
-libc_hidden_proto(tfind)
+/* libc_hidden_proto(tfind) */
void *tfind(__const void *key, void * __const *vrootp, __compar_fn_t compar)
{
register node **rootp = (node **) vrootp;
@@ -208,7 +208,7 @@ tdestroy_recurse (node *root, __free_fn_t freefct)
free (root);
}
-libc_hidden_proto(tdestroy)
+/* libc_hidden_proto(tdestroy) */
void tdestroy (void *vroot, __free_fn_t freefct)
{
node *root = (node *) vroot;
diff --git a/libc/misc/search/hsearch.c b/libc/misc/search/hsearch.c
index b1228e2ee..3ecc42567 100644
--- a/libc/misc/search/hsearch.c
+++ b/libc/misc/search/hsearch.c
@@ -19,9 +19,9 @@
#include <search.h>
-libc_hidden_proto(hdestroy_r)
-libc_hidden_proto(hsearch_r)
-libc_hidden_proto(hcreate_r)
+/* libc_hidden_proto(hdestroy_r) */
+/* libc_hidden_proto(hsearch_r) */
+/* libc_hidden_proto(hcreate_r) */
/* The non-reentrant version use a global space for storing the table. */
static struct hsearch_data htab;