From 600927014b78e4247e36bbc554c188c7a3cca40e Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Thu, 21 Sep 1995 04:01:40 +0000 Subject: Wed Sep 20 18:02:03 1995 Roland McGrath * locale/locale.c: Include errno.h. * locale/localedef.c: Likewise. Tue Sep 19 00:02:06 1995 Roland McGrath * Makefile (distclean-1): Remove config.cache, config.log, config.h. (parent-mostlyclean): Remove all flavors of the parent library. * misc/mntent.c (getmntent): Skip multiple whitespace chars between fields. * hurd/hurdstartup.c (_hurd_startup): If RPC returns EXEC_STACK_ARGS flag, get args from stack. If args on stack but have info from RPC, relocate args on stack to make space for struct hurd_startup_data. * elf/dl-object.c: Include errno.h. * posix/execvp.c: Likewise. * dirent/scandir.c: Likewise. * sysdeps/posix/system.c: Likewise. * sysdeps/generic/setenv.c: Likewise. * stdlib/msort.c: Likewise. * stdio/memstream.c: Likewise. * stdio/fclose.c: Likewise. * stdio/getdelim.c: Likewise. * stdio/setvbuf.c: Likewise. * sysdeps/ieee754/ldexp.c: Likewise. * locale/locfile-parse.c: Likewise. * stdlib/lcong48_r.c: Don't check for null argument; let it fault. * stdlib/seed48_r.c: Likewise. * stdlib/srand48_r.c: Likewise. * stdlib/jrand48_r.c: Likewise. * stdlib/nrand48_r.c: Likewise. * misc/search.h: Many decls for hsearch functions. --- misc/search.h | 101 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 94 insertions(+), 7 deletions(-) (limited to 'misc/search.h') diff --git a/misc/search.h b/misc/search.h index c6d18702ca..31c4f03a1f 100644 --- a/misc/search.h +++ b/misc/search.h @@ -1,4 +1,4 @@ -/* search.h -- declarations for `insque' and `remque' +/* search.h -- declarations for System V style searching functions. Copyright (C) 1995 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -14,16 +14,18 @@ Library General Public License for more details. You should have received a copy of the GNU Library General Public License along with the GNU C Library; see the file COPYING.LIB. If -not, write to the Free Software Foundation, Inc., 675 Mass Ave, -Cambridge, MA 02139, USA. */ - -/* These functions are provided for compatibility with BSD. */ +not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, +Boston, MA 02111-1307, USA. */ #ifndef _SEARCH_H #define _SEARCH_H 1 #include +#define __need_size_t +#define __need_NULL +#include + __BEGIN_DECLS /* Prototype structure for a linked-list data structure. @@ -41,9 +43,94 @@ struct qelem extern void insque __P ((struct qelem *__elem, struct qelem *__prev)); /* Unlink ELEM from the doubly-linked list that it is in. */ -extern void remque __P ((struct qelem *elem)); +extern void remque __P ((struct qelem *__elem)); + + +/* For use with hsearch(3). */ +#ifndef __COMPAR_FN_T +#define __COMPAR_FN_T +typedef int (*__compar_fn_t) __P ((__const __ptr_t, __const __ptr_t)); +#endif + +/* Action which shall be performed in the call the hsearch. */ +typedef enum + { + FIND, + ENTER + } +ACTION; + +typedef struct entry + { + char *key; + char *data; + } +ENTRY; + +/* Opaque type for internal use. */ +struct _ENTRY; + +/* Data type for reentrent functions. */ +struct hsearch_data + { + struct _ENTRY *table; + unsigned int size; + unsigned int filled; + }; + +/* Family of hash table handling functions. The functions also have + reentrent counterparts ending with _r. */ +extern ENTRY *hsearch __P ((ENTRY __item, ACTION __action)); +extern int hcreate __P ((unsigned int __nel)); +extern void hdestroy __P ((void)); + +extern int hsearch_r __P ((ENTRY __item, ACTION __action, ENTRY **__retval, + struct hsearch_data *__htab)); +extern int hcreate_r __P ((unsigned int __nel, struct hsearch_data *htab)); +extern void hdestroy_r __P ((struct hsearch_data *htab)); + + +/* The tsearch routines are very interesting. They make many + assumptions about the compiler. It assumpts 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; + +extern void *tsearch __P ((__const void * __key, void **__rootp, + __compar_fn_t compar)); + +extern void *tfind __P ((__const void * __key, __const void ** __rootp, + __compar_fn_t compar)); + +extern void *tdelete __P ((__const void * __key, void ** __rootp, + __compar_fn_t compar)); + +#ifndef __ACTION_FN_T +#define __ACTION_FN_T +typedef void (*__action_fn_t) __P ((__const void *__nodep, + __const VISIT __value, + __const int __level)); +#endif + +extern void twalk __P ((__const void * __root, __action_fn_t action)); + + +extern void * lfind __P ((__const void * __key, __const void * __base, + size_t * __nmemb, size_t __size, + __compar_fn_t __compar)); +extern void * lsearch __P ((__const void * __key, __const void * __base, + size_t * __nmemb, size_t __size, + __compar_fn_t __compar)); __END_DECLS -#endif /* search.h */ +#endif /* search.h */ -- cgit v1.2.3