hsearch_r cleanups (extra code, GNUisms).

Author: saffroy

hsearch_r.c

@@ -22,6 +22,7 @@
 #include <string.h>
 
 #include <search.h>
+#include "search.h"
 
 /* [Aho,Sethi,Ullman] Compilers: Principles, Techniques and Tools, 1986
    [Knuth]            The Art of Computer Programming, part 3 (6.4)  */
@@ -94,7 +95,6 @@ hcreate_r (nel, htab)
   /* everything went alright */
   return 1;
 }
-libc_hidden_def (hcreate_r)
 
 
 /* After using the hash table it has to be destroyed. The used memory can
@@ -117,7 +117,6 @@ hdestroy_r (htab)
   /* the sign for an existing table is an value != NULL in htable */
   htab->table = NULL;
 }
-libc_hidden_def (hdestroy_r)
 
 
 /* This is the search function. It uses double hashing with open addressing.
@@ -226,4 +225,3 @@ hsearch_r (item, action, retval, htab)
   *retval = NULL;
   return 0;
 }
-libc_hidden_def (hsearch_r)

search.h

@@ -17,49 +17,15 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
 
-#ifndef _SEARCH_H
-#define	_SEARCH_H 1
+#ifndef _MY_SEARCH_H
+#define	_MY_SEARCH_H 1
 
-#include <features.h>
-
-#define __need_size_t
-#include <stddef.h>
-
-__BEGIN_DECLS
-
-#if defined __USE_SVID || defined __USE_XOPEN_EXTENDED
-/* Prototype structure for a linked-list data structure.
-   This is the type used by the `insque' and `remque' functions.  */
-
-# ifdef __USE_GNU
-struct qelem
-  {
-    struct qelem *q_forw;
-    struct qelem *q_back;
-    char q_data[1];
-  };
-# endif
-
-
-/* Insert ELEM into a doubly-linked list, after PREV.  */
-extern void insque (void *__elem, void *__prev) __THROW;
-
-/* Unlink ELEM from the doubly-linked list that it is in.  */
-extern void remque (void *__elem) __THROW;
-#endif
-
-
-/* For use with hsearch(3).  */
-#ifndef __COMPAR_FN_T
-# define __COMPAR_FN_T
-typedef int (*__compar_fn_t) (__const void *, __const void *);
-
-# ifdef	__USE_GNU
-typedef __compar_fn_t comparison_fn_t;
-# endif
-#endif
+#define __USE_GNU
+#define __set_errno(_v) (errno = _v)
+#define __THROW
 
 /* Action which shall be performed in the call the hsearch.  */
+#if 0
 typedef enum
   {
     FIND,
@@ -73,26 +39,11 @@ typedef struct entry
     void *data;
   }
 ENTRY;
+#endif
 
 /* Opaque type for internal use.  */
 struct _ENTRY;
 
-/* Family of hash table handling functions.  The functions also
-   have reentrant counterparts ending with _r.  The non-reentrant
-   functions all work on a signle internal hashing table.  */
-
-/* Search for entry matching ITEM.key in internal hash table.  If
-   ACTION is `FIND' return found entry or signal error by returning
-   NULL.  If ACTION is `ENTER' replace existing data (if any) with
-   ITEM.data.  */
-extern ENTRY *hsearch (ENTRY __item, ACTION __action) __THROW;
-
-/* Create a new hashing table which will at most contain NEL elements.  */
-extern int hcreate (size_t __nel) __THROW;
-
-/* Destroy current internal hashing table.  */
-extern void hdestroy (void) __THROW;
-
 #ifdef __USE_GNU
 /* Data type for reentrant functions.  */
 struct hsearch_data
@@ -111,65 +62,4 @@ extern void hdestroy_r (struct hsearch_data *__htab) __THROW;
 #endif
 
 
-/* The tsearch routines are very interesting. They make many
-   assumptions about the compiler.  It assumes that the first field
-   in node must be the "key" field, which points to the datum.
-   Everything depends on that.  */
-/* For tsearch */
-typedef enum
-{
-  preorder,
-  postorder,
-  endorder,
-  leaf
-}
-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,
-		      __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,
-		    __compar_fn_t __compar);
-
-/* Remove the element matching KEY from the tree pointed to by *ROOTP.  */
-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,
-			       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);
-
-#ifdef __USE_GNU
-/* Callback type for function to free a tree node.  If the keys are atomic
-   data this function should do nothing.  */
-typedef void (*__free_fn_t) (void *__nodep);
-
-/* Destroy the whole tree, call FREEFCT for each node or leaf.  */
-extern void tdestroy (void *__root, __free_fn_t __freefct);
-#endif
-
-
-/* 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,
-		    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,
-		      size_t *__nmemb, size_t __size, __compar_fn_t __compar);
-
-__END_DECLS
-
 #endif /* search.h */