From 1522c3682ccf373e9d393ca73350be284fcf773b Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Thu, 24 Jul 1997 01:36:01 +0000 Subject: Update. 1997-07-24 03:14 Ulrich Drepper * elf/dl-deps.c: Complete rewrite to handle DT_AUXILIARY correctly. * inet/Makefile (tests): Add htontest. * inet/htontest.c: New file. * inet/netinet/in.h: Cleanup optimization of ntoh/hton functions when they are no noops. * sysdeps/alpha/htonl.S: Don't define __ protected names. * sysdeps/alpha/htons.S: Likewise. * sysdeps/generic/htonl.c: Likewise. * sysdeps/generic/htons.c: Likewise. * sysdeps/i386/htonl.S: Likewise. * sysdeps/i386/htons.S: Likewise. * sysdeps/i386/i486/htonl.S: Likewise. * sysdeps/vax/htonl.s: Likewise. * sysdeps/vax/htons.s: Likewise. * string/Makefile (headers): Add byteswap.h and bits/byteswap.h. * string/byteswap.h: New file. * sysdeps/generic/bits/byteswap.h: New file. * sysdeps/i386/bits/byteswap.h: New file. * sysdeps/generic/bits/htontoh.h: Removed. * sysdeps/i386/bits/htontoh.h: Removed. * misc/search.h: General cleanup. Don't define reentrant hsearch functions uless __USE_GNU. * nss/nsswitch.c: Pretty print. * sunrpc/clnt_udp.c (clntudp_call): Initialize outlen to prevent warning. * sysdeps/unix/i386/sysdep.h (DO_CALL): Use lcall, binutils have been fixed meanwhile. Reported by Zack Weinberg . 1997-07-24 00:53 Philip Blundell * db/hash/hash.c (init_hash): Only use statbuf.st_blksize if it exists for this port. 1997-07-24 00:12 Philip Blundell * sysdeps/standalone/arm/bits/errno.h (ESTALE): Add. 1997-07-22 Andreas Schwab * manual/argp.texi (Argp Option Vectors): Use @minus, not @math, to format a proper minus sign. 1997-07-22 Andreas Schwab * sysdeps/m68k/fpu/fraiseexcpt.c: Don't handle FE_INEXACT specially, the standard doesn't require it. * math/test-fenv.c (test_exceptions): Add IGNORE_INEXACT argument, if non-zero then don't test inexact flag. Callers changed. (set_single_exc): Ignore inexact flag if underflow or overflow exception is raised. 1997-07-23 05:10 Ulrich Drepper * sysdeps/unix/sysv/linux/sys/fsuid.h: New file. Provided by Michael Deutschmann . * sysdeps/unix/sysv/linux/Makefile (headers): Add sys/fsuid.h. * sysdeps/unix/sysv/linux/Dist: Add sys/fsuid.h. 1997-07-16 10:09 Fila Kolodny * resolv/gethnamaddr.c: Define MAXHOSTNAMELEN as 256, since RFC 1034 and 1035 state that a fully qualified domain name cannot exceed 255 octets in length. * resolv/nss_dns/dns-host.c: Likewise. 1997-07-22 09:54 H.J. Lu * inet/netinet/in.h (htons): Fix typos. * sysdeps/i386/bits/htontoh.h (__ntohs): Return the value. 1997-07-22 11:47 Ulrich Drepper * nss/nsswitch.c (nss_lookup_function): Include function.def, not functions.def. Patch by Klaus Espenlaub . --- misc/search.h | 60 ++++++++++++++++++++++++++++++++++++----------------------- 1 file changed, 37 insertions(+), 23 deletions(-) (limited to 'misc') diff --git a/misc/search.h b/misc/search.h index ff0672d39d..2b0106463d 100644 --- a/misc/search.h +++ b/misc/search.h @@ -20,7 +20,7 @@ #ifndef _SEARCH_H #define _SEARCH_H 1 -#include +#include #define __need_size_t #define __need_NULL @@ -28,7 +28,7 @@ __BEGIN_DECLS -#if defined(__USE_SVID) || defined(__USE_XOPEN_EXTENDED) +#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. */ @@ -50,7 +50,7 @@ extern void remque __P ((void *__elem)); /* For use with hsearch(3). */ #ifndef __COMPAR_FN_T -#define __COMPAR_FN_T +# define __COMPAR_FN_T typedef int (*__compar_fn_t) __P ((__const __ptr_t, __const __ptr_t)); #endif @@ -72,6 +72,23 @@ ENTRY; /* 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 __P ((ENTRY __item, ACTION __action)); + +/* Create a new hashing table which will at most contain NEL elements. */ +extern int hcreate __P ((size_t __nel)); + +/* Destroy current internal hashing table. */ +extern void hdestroy __P ((void)); + +#ifdef __USE_GNU /* Data type for reentrant functions. */ struct hsearch_data { @@ -80,16 +97,13 @@ struct hsearch_data unsigned int filled; }; -/* Family of hash table handling functions. The functions also have - reentrant counterparts ending with _r. */ -extern ENTRY *hsearch __P ((ENTRY __item, ACTION __action)); -extern int hcreate __P ((size_t __nel)); -extern void hdestroy __P ((void)); - +/* Reentrant versions which can handle multiple hashing tables at the + same time. */ extern int hsearch_r __P ((ENTRY __item, ACTION __action, ENTRY **__retval, struct hsearch_data *__htab)); extern int hcreate_r __P ((size_t __nel, struct hsearch_data *htab)); extern void hdestroy_r __P ((struct hsearch_data *htab)); +#endif /* The tsearch routines are very interesting. They make many @@ -108,26 +122,26 @@ 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 __P ((__const void * __key, void **__rootp, +extern void *tsearch __P ((__const void *__key, void **__rootp, __compar_fn_t compar)); -extern void *__tsearch __P ((__const void * __key, void **__rootp, +extern void *__tsearch __P ((__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 __P ((__const void * __key, void *__const * __rootp, +extern void *tfind __P ((__const void *__key, void *__const *__rootp, __compar_fn_t compar)); -extern void *__tfind __P ((__const void * __key, void *__const * __rootp, +extern void *__tfind __P ((__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 __P ((__const void * __key, void ** __rootp, +extern void *tdelete __P ((__const void *__key, void **__rootp, __compar_fn_t compar)); -extern void *__tdelete __P ((__const void * __key, void ** __rootp, +extern void *__tdelete __P ((__const void *__key, void **__rootp, __compar_fn_t compar)); #ifndef __ACTION_FN_T -#define __ACTION_FN_T +# define __ACTION_FN_T typedef void (*__action_fn_t) __P ((__const void *__nodep, VISIT __value, int __level)); @@ -135,9 +149,9 @@ typedef void (*__action_fn_t) __P ((__const void *__nodep, /* Walk through the whole tree and call the ACTION callback for every node or leaf. */ -extern void twalk __P ((__const void * __root, __action_fn_t action)); +extern void twalk __P ((__const void *__root, __action_fn_t action)); -extern void __twalk __P ((__const void * __root, __action_fn_t action)); +extern void __twalk __P ((__const void *__root, __action_fn_t action)); #ifdef __USE_GNU /* Callback type for function to free a tree node. If the keys are atomic @@ -152,14 +166,14 @@ extern void tdestroy __P ((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 __P ((__const void *__key, __const void *__base, - size_t *__nmemb, size_t __size, - __compar_fn_t __compar)); +extern void *lfind __P ((__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 __P ((__const void *__key, void *__base, size_t *__nmemb, - size_t __size, __compar_fn_t __compar)); +extern void *lsearch __P ((__const void *__key, void *__base, size_t *__nmemb, + size_t __size, __compar_fn_t __compar)); __END_DECLS -- cgit v1.2.3