diff options
| -rw-r--r-- | ChangeLog | 27 | ||||
| -rw-r--r-- | nscd/connections.c | 48 | ||||
| -rw-r--r-- | nscd/grpcache.c | 32 | ||||
| -rw-r--r-- | nscd/hstcache.c | 40 | ||||
| -rw-r--r-- | nscd/pwdcache.c | 44 | ||||
| -rw-r--r-- | resolv/Versions | 3 | ||||
| -rw-r--r-- | resolv/resolv.h | 15 | ||||
| -rw-r--r-- | sysdeps/generic/sysdep-cancel.h | 2 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/i386/fcntl.c | 2 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/wait.c | 2 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/waitpid.c | 2 |
11 files changed, 114 insertions, 103 deletions
@@ -1,3 +1,30 @@ +2002-12-15 Roland McGrath <roland@redhat.com> + + * sysdeps/unix/sysv/linux/readv.c (do_readv): Use prototype defn. + + * sysdeps/unix/sysv/linux/wait.c: Don't include <nptl/pthreadP.h> or + <tls.h> here, no need for it. + * sysdeps/unix/sysv/linux/waitpid.c: Likewise. + + * sysdeps/unix/sysv/linux/i386/fcntl.c (do_fcntl): Take ARG as void * + parameter, not varargs parameter. + + * sysdeps/generic/sysdep-cancel.h (LIBC_CANCEL_RESET): Evaluate the + argument so it's not an unused variable. + + * resolv/resolv.h (__p_key_syms, __p_cert_syms, __p_class_syms, + __p_type_syms, __p_rcode_syms): Remove decls, never really intended + for users. + + * resolv/Versions (libresolv: GLIBC_2.3.2): New set, add __p_rcode. + +2002-12-15 Art Haas <ahaas@airmail.net> + + * nscd/connections.c: C99 initializer conversion. + * nscd/grpcache.c: Same. + * nscd/hstcache.c: Same. + * nscd/pwdcache.c: Same. + 2002-12-15 Ulrich Drepper <drepper@redhat.com> * sysdeps/unix/sysv/linux/i386/fcntl.c (do_fcntl): This is the diff --git a/nscd/connections.c b/nscd/connections.c index 58e05018d3..3abbdc2ff1 100644 --- a/nscd/connections.c +++ b/nscd/connections.c @@ -90,34 +90,34 @@ const char *serv2str[LASTREQ] = static struct database dbs[lastdb] = { [pwddb] = { - lock: PTHREAD_RWLOCK_WRITER_NONRECURSIVE_INITIALIZER_NP, - enabled: 0, - check_file: 1, - filename: "/etc/passwd", - module: 211, - disabled_iov: &pwd_iov_disabled, - postimeout: 3600, - negtimeout: 20 + .lock = PTHREAD_RWLOCK_WRITER_NONRECURSIVE_INITIALIZER_NP, + .enabled = 0, + .check_file = 1, + .filename = "/etc/passwd", + .module = 211, + .disabled_iov = &pwd_iov_disabled, + .postimeout = 3600, + .negtimeout = 20 }, [grpdb] = { - lock: PTHREAD_RWLOCK_WRITER_NONRECURSIVE_INITIALIZER_NP, - enabled: 0, - check_file: 1, - filename: "/etc/group", - module: 211, - disabled_iov: &grp_iov_disabled, - postimeout: 3600, - negtimeout: 60 + .lock = PTHREAD_RWLOCK_WRITER_NONRECURSIVE_INITIALIZER_NP, + .enabled = 0, + .check_file = 1, + .filename = "/etc/group", + .module = 211, + .disabled_iov = &grp_iov_disabled, + .postimeout = 3600, + .negtimeout = 60 }, [hstdb] = { - lock: PTHREAD_RWLOCK_WRITER_NONRECURSIVE_INITIALIZER_NP, - enabled: 0, - check_file: 1, - filename: "/etc/hosts", - module: 211, - disabled_iov: &hst_iov_disabled, - postimeout: 3600, - negtimeout: 20 + .lock = PTHREAD_RWLOCK_WRITER_NONRECURSIVE_INITIALIZER_NP, + .enabled = 0, + .check_file = 1, + .filename = "/etc/hosts", + .module = 211, + .disabled_iov = &hst_iov_disabled, + .postimeout = 3600, + .negtimeout = 20 } }; diff --git a/nscd/grpcache.c b/nscd/grpcache.c index ce84668900..41a36dc674 100644 --- a/nscd/grpcache.c +++ b/nscd/grpcache.c @@ -37,38 +37,38 @@ /* This is the standard reply in case the service is disabled. */ static const gr_response_header disabled = { - version: NSCD_VERSION, - found: -1, - gr_name_len: 0, - gr_passwd_len: 0, - gr_gid: -1, - gr_mem_cnt: 0, + .version = NSCD_VERSION, + .found = -1, + .gr_name_len = 0, + .gr_passwd_len = 0, + .gr_gid = -1, + .gr_mem_cnt = 0, }; /* This is the struct describing how to write this record. */ const struct iovec grp_iov_disabled = { - iov_base: (void *) &disabled, - iov_len: sizeof (disabled) + .iov_base = (void *) &disabled, + .iov_len = sizeof (disabled) }; /* This is the standard reply in case we haven't found the dataset. */ static const gr_response_header notfound = { - version: NSCD_VERSION, - found: 0, - gr_name_len: 0, - gr_passwd_len: 0, - gr_gid: -1, - gr_mem_cnt: 0, + .version = NSCD_VERSION, + .found = 0, + .gr_name_len = 0, + .gr_passwd_len = 0, + .gr_gid = -1, + .gr_mem_cnt = 0, }; /* This is the struct describing how to write this record. */ static const struct iovec iov_notfound = { - iov_base: (void *) ¬found, - iov_len: sizeof (notfound) + .iov_base = (void *) ¬found, + .iov_len = sizeof (notfound) }; diff --git a/nscd/hstcache.c b/nscd/hstcache.c index dd8fc59f61..67f4e50f97 100644 --- a/nscd/hstcache.c +++ b/nscd/hstcache.c @@ -41,42 +41,42 @@ /* This is the standard reply in case the service is disabled. */ static const hst_response_header disabled = { - version: NSCD_VERSION, - found: -1, - h_name_len: 0, - h_aliases_cnt: 0, - h_addrtype: -1, - h_length: -1, - h_addr_list_cnt: 0, - error: NETDB_INTERNAL + .version = NSCD_VERSION, + .found = -1, + .h_name_len = 0, + .h_aliases_cnt = 0, + .h_addrtype = -1, + .h_length = -1, + .h_addr_list_cnt = 0, + .error = NETDB_INTERNAL }; /* This is the struct describing how to write this record. */ const struct iovec hst_iov_disabled = { - iov_base: (void *) &disabled, - iov_len: sizeof (disabled) + .iov_base = (void *) &disabled, + .iov_len = sizeof (disabled) }; /* This is the standard reply in case we haven't found the dataset. */ static const hst_response_header notfound = { - version: NSCD_VERSION, - found: 0, - h_name_len: 0, - h_aliases_cnt: 0, - h_addrtype: -1, - h_length: -1, - h_addr_list_cnt: 0, - error: HOST_NOT_FOUND + .version = NSCD_VERSION, + .found = 0, + .h_name_len = 0, + .h_aliases_cnt = 0, + .h_addrtype = -1, + .h_length = -1, + .h_addr_list_cnt = 0, + .error = HOST_NOT_FOUND }; /* This is the struct describing how to write this record. */ static const struct iovec iov_notfound = { - iov_base: (void *) ¬found, - iov_len: sizeof (notfound) + .iov_base = (void *) ¬found, + .iov_len = sizeof (notfound) }; diff --git a/nscd/pwdcache.c b/nscd/pwdcache.c index 9d88c88a37..a52c7e3355 100644 --- a/nscd/pwdcache.c +++ b/nscd/pwdcache.c @@ -37,44 +37,44 @@ /* This is the standard reply in case the service is disabled. */ static const pw_response_header disabled = { - version: NSCD_VERSION, - found: -1, - pw_name_len: 0, - pw_passwd_len: 0, - pw_uid: -1, - pw_gid: -1, - pw_gecos_len: 0, - pw_dir_len: 0, - pw_shell_len: 0 + .version = NSCD_VERSION, + .found = -1, + .pw_name_len = 0, + .pw_passwd_len = 0, + .pw_uid = -1, + .pw_gid = -1, + .pw_gecos_len = 0, + .pw_dir_len = 0, + .pw_shell_len = 0 }; /* This is the struct describing how to write this record. */ const struct iovec pwd_iov_disabled = { - iov_base: (void *) &disabled, - iov_len: sizeof (disabled) + .iov_base = (void *) &disabled, + .iov_len = sizeof (disabled) }; /* This is the standard reply in case we haven't found the dataset. */ static const pw_response_header notfound = { - version: NSCD_VERSION, - found: 0, - pw_name_len: 0, - pw_passwd_len: 0, - pw_uid: -1, - pw_gid: -1, - pw_gecos_len: 0, - pw_dir_len: 0, - pw_shell_len: 0 + .version = NSCD_VERSION, + .found = 0, + .pw_name_len = 0, + .pw_passwd_len = 0, + .pw_uid = -1, + .pw_gid = -1, + .pw_gecos_len = 0, + .pw_dir_len = 0, + .pw_shell_len = 0 }; /* This is the struct describing how to write this record. */ static const struct iovec iov_notfound = { - iov_base: (void *) ¬found, - iov_len: sizeof (notfound) + .iov_base = (void *) ¬found, + .iov_len = sizeof (notfound) }; diff --git a/resolv/Versions b/resolv/Versions index 2449a41cea..fcbaba5a47 100644 --- a/resolv/Versions +++ b/resolv/Versions @@ -67,6 +67,9 @@ libresolv { __res_nquerydomain; __res_nsearch; __res_nsend; __res_query; __res_querydomain; __res_search; } + GLIBC_2.3.2 { + __p_rcode; + }; GLIBC_PRIVATE { # Needed in libnss_dns. __ns_name_unpack; __ns_name_ntop; diff --git a/resolv/resolv.h b/resolv/resolv.h index 6454f9c3f6..e8f384db92 100644 --- a/resolv/resolv.h +++ b/resolv/resolv.h @@ -260,21 +260,6 @@ int res_send __P((const u_char *, int, u_char *, int)); __END_DECLS #endif -#if !defined(SHARED_LIBBIND) || defined(LIB) -/* - * If libbind is a shared object (well, DLL anyway) - * these externs break the linker when resolv.h is - * included by a lib client (like named) - * Make them go away if a client is including this - * - */ -extern const struct res_sym __p_key_syms[]; -extern const struct res_sym __p_cert_syms[]; -extern const struct res_sym __p_class_syms[]; -extern const struct res_sym __p_type_syms[]; -extern const struct res_sym __p_rcode_syms[]; -#endif /* SHARED_LIBBIND */ - #define b64_ntop __b64_ntop #define b64_pton __b64_pton #define dn_comp __dn_comp diff --git a/sysdeps/generic/sysdep-cancel.h b/sysdeps/generic/sysdep-cancel.h index f065e6e437..8422482819 100644 --- a/sysdeps/generic/sysdep-cancel.h +++ b/sysdeps/generic/sysdep-cancel.h @@ -3,4 +3,4 @@ /* No multi-thread handling enabled. */ #define SINGLE_THREAD_P (1) #define LIBC_CANCEL_ASYNC() 0 /* Just a dummy value. */ -#define LIBC_CANCEL_RESET(val) /* Nothing. */ +#define LIBC_CANCEL_RESET(val) ((void)(val)) /* Nothing, but evaluate it. */ diff --git a/sysdeps/unix/sysv/linux/i386/fcntl.c b/sysdeps/unix/sysv/linux/i386/fcntl.c index bd174fe809..c316769eba 100644 --- a/sysdeps/unix/sysv/linux/i386/fcntl.c +++ b/sysdeps/unix/sysv/linux/i386/fcntl.c @@ -36,7 +36,7 @@ int __have_no_fcntl64; static int -do_fcntl (int fd, int cmd, ...) +do_fcntl (int fd, int cmd, void *arg) { # ifdef __NR_fcntl64 if (! __have_no_fcntl64) diff --git a/sysdeps/unix/sysv/linux/wait.c b/sysdeps/unix/sysv/linux/wait.c index f01d75cc38..3e39ad4bf1 100644 --- a/sysdeps/unix/sysv/linux/wait.c +++ b/sysdeps/unix/sysv/linux/wait.c @@ -21,8 +21,6 @@ #include <sys/resource.h> #include <stddef.h> #include <sysdep-cancel.h> -#include <nptl/pthreadP.h> -#include <tls.h> /* Wait for a child to die. When one does, put its status in *STAT_LOC and return its process ID. For errors, return (pid_t) -1. */ diff --git a/sysdeps/unix/sysv/linux/waitpid.c b/sysdeps/unix/sysv/linux/waitpid.c index 275fb826b4..2b4e7b37d4 100644 --- a/sysdeps/unix/sysv/linux/waitpid.c +++ b/sysdeps/unix/sysv/linux/waitpid.c @@ -20,8 +20,6 @@ #include <sysdep-cancel.h> #include <stdlib.h> #include <sys/wait.h> -#include <nptl/pthreadP.h> -#include <tls.h> __pid_t __libc_waitpid (__pid_t pid, int *stat_loc, int options) |