mirror of
git://sourceware.org/git/glibc.git
synced 2024-12-15 04:20:28 +08:00
498afc54df
This patch cleans up following the obsoletion of _BSD_SOURCE and _SVID_SOURCE by combining __USE_BSD and __USE_SVID into __USE_MISC. The only non-mechanical part of this patch is the changes to features.h; everything else is simple substitution of __USE_MISC for the old macros. Thus, this patch leaves obviously redundant conditionals such as "defined __USE_MISC || defined __USE_MISC", and does not update #endif comments where they referred to BSD or SVID in words instead of the literal macro name. This is intended to facilitate patch review by separating the less mechanical changes from these purely mechanical changes into a separate patch. (I do intend to integrate all the changes from <https://sourceware.org/ml/libc-alpha/2013-12/msg00226.html>, which I believe includes all the trailing comment updates, in subsequent patches.) Tested x86_64. * include/features.h (__USE_BSD): Remove macro definitions. (__USE_SVID): Likewise. (_BSD_SOURCE): Likewise. (_SVID_SOURCE): Likewise. [!defined _BSD_SOURCE && !defined _SVID_SOURCE]: Remove condition from definition of _DEFAULT_SOURCE. [_BSD_SOURCE || _SVID_SOURCE]: Change condition to [_DEFAULT_SOURCE]. * bits/fcntl.h [__USE_BSD]: Change condition to [__USE_MISC]. * bits/mman.h [__USE_BSD]: Likewise. * bits/termios.h [__USE_BSD]: Likewise. * bits/waitstatus.h [__USE_BSD]: Likewise. * ctype/ctype.h [__USE_SVID]: Likewise. * dirent/dirent.h [__USE_BSD]: Likewise. * grp/grp.h [__USE_SVID]: Likewise. [__USE_BSD]: Likewise. * inet/netinet/igmp.h [__USE_BSD]: Likewise. * io/fcntl.h [__USE_BSD]: Likewise. * io/ftw.h [__USE_BSD]: Likewise. * io/sys/stat.h [__USE_BSD]: Likewise. * libio/bits/stdio-ldbl.h [__USE_BSD]: Likewise. * libio/bits/stdio2.h [__USE_BSD]: Likewise. * libio/stdio.h [__USE_SVID]: Likewise. [__USE_BSD]: Likewise. * math/math.h [__USE_SVID]: Likewise. [__USE_BSD]: Likewise. * misc/bits/syslog-ldbl.h [__USE_BSD]: Likewise. * misc/bits/syslog.h [__USE_BSD]: Likewise. * misc/search.h [__USE_SVID]: Likewise. * misc/sys/mman.h [__USE_BSD]: Likewise. * misc/sys/syslog.h [__USE_BSD]: Likewise. * misc/sys/uio.h [__USE_BSD]: Likewise. * posix/bits/unistd.h [__USE_BSD]: Likewise. * posix/glob.h [__USE_BSD]: Likewise. * posix/regex.h [__USE_BSD]: Likewise. * posix/sys/types.h [__USE_BSD]: Likewise. [__USE_SVID]: Likewise. * posix/sys/utsname.h [__USE_SVID]: Likewise. * posix/sys/wait.h [__USE_BSD]: Likewise. [__USE_SVID]: Likewise. * posix/unistd.h [__USE_BSD]: Likewise. [__USE_SVID]: Likewise. * pwd/pwd.h [__USE_SVID]: Likewise. * resolv/netdb.h [__USE_BSD]: Likewise. * setjmp/setjmp.h [__USE_BSD]: Likewise. * signal/signal.h [__USE_BSD]: Likewise. [__USE_SVID]: Likewise. * socket/sys/socket.h [__USE_BSD]: Likewise. * stdlib/fmtmsg.h [__USE_SVID]: Likewise. * stdlib/stdlib.h [__USE_BSD]: Likewise. [__USE_SVID]: Likewise. * string/bits/string2.h [__USE_BSD]: Likewise. [__USE_SVID]: Likewise. * string/bits/string3.h [__USE_BSD]: Likewise. * string/endian.h [__USE_BSD]: Likewise. * string/string.h [__USE_SVID]: Likewise. [__USE_BSD]: Likewise. * string/strings.h [__USE_BSD]: Likewise. * sysdeps/generic/netinet/ip.h [__USE_BSD]: Likewise. * sysdeps/gnu/netinet/ip_icmp.h [__USE_BSD]: Likewise. * sysdeps/mach/hurd/bits/fcntl.h [__USE_BSD]: Likewise. * sysdeps/mach/hurd/bits/stat.h [__USE_BSD]: Likewise. * sysdeps/unix/sysv/linux/alpha/bits/mman.h [__USE_BSD]: Likewise. * sysdeps/unix/sysv/linux/alpha/bits/termios.h [__USE_BSD]: Likewise. * sysdeps/unix/sysv/linux/bits/fcntl-linux.h [__USE_BSD]: Likewise. * sysdeps/unix/sysv/linux/bits/mman-linux.h [__USE_BSD]: Likewise. * sysdeps/unix/sysv/linux/bits/sys_errlist.h [__USE_BSD]: Likewise. * sysdeps/unix/sysv/linux/bits/termios.h [__USE_BSD]: Likewise. * sysdeps/unix/sysv/linux/mips/bits/termios.h [__USE_BSD]: Likewise. * sysdeps/unix/sysv/linux/netinet/if_ether.h [__USE_BSD]: Likewise. * sysdeps/unix/sysv/linux/netinet/if_fddi.h [__USE_BSD]: Likewise. * sysdeps/unix/sysv/linux/netinet/if_tr.h [__USE_BSD]: Likewise. * sysdeps/unix/sysv/linux/powerpc/bits/termios.h [__USE_BSD]: Likewise. * sysdeps/unix/sysv/linux/sparc/bits/termios.h [__USE_BSD]: Likewise. * sysdeps/x86/bits/string.h [__USE_BSD]: Likewise. * sysvipc/sys/ipc.h [__USE_SVID]: Likewise. * termios/termios.h [__USE_BSD]: Likewise. * time/sys/time.h [__USE_BSD]: Likewise. * time/time.h [__USE_BSD]: Likewise. [__USE_SVID]: Likewise. * sysdeps/unix/sysv/linux/hppa/bits/mman.h [__USE_BSD]: Change condition to [__USE_MISC].
175 lines
5.1 KiB
C
175 lines
5.1 KiB
C
/* Declarations for System V style searching functions.
|
|
Copyright (C) 1995-2014 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 of the License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, see
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
#ifndef _SEARCH_H
|
|
#define _SEARCH_H 1
|
|
|
|
#include <features.h>
|
|
|
|
#define __need_size_t
|
|
#include <stddef.h>
|
|
|
|
__BEGIN_DECLS
|
|
|
|
#if defined __USE_MISC || 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
|
|
|
|
/* Action which shall be performed in the call the hsearch. */
|
|
typedef enum
|
|
{
|
|
FIND,
|
|
ENTER
|
|
}
|
|
ACTION;
|
|
|
|
typedef struct entry
|
|
{
|
|
char *key;
|
|
void *data;
|
|
}
|
|
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 (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
|
|
{
|
|
struct _ENTRY *table;
|
|
unsigned int size;
|
|
unsigned int filled;
|
|
};
|
|
|
|
/* Reentrant versions which can handle multiple hashing tables at the
|
|
same time. */
|
|
extern int hsearch_r (ENTRY __item, ACTION __action, ENTRY **__retval,
|
|
struct hsearch_data *__htab) __THROW;
|
|
extern int hcreate_r (size_t __nel, struct hsearch_data *__htab) __THROW;
|
|
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 */
|