From 2566e5f3a377e31c7c974bdddee8cb55ebdafb1f Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Thu, 12 Aug 2004 17:42:16 +0000 Subject: [PATCH] Update. 2004-08-12 Jakub Jelinek * resolv/res_query.c (__libc_res_nsearch): Protect the debugging printf with #ifdef DEBUG and RES_DEBUG check. * sysdeps/unix/sysv/linux/bits/shm.h: Move __END_DECLS after __USE_MISC #endif. * sysdeps/generic/bits/shm.h: Add __BEGIN_DECLS for __getpagesize declaration. * sysdeps/gnu/bits/shm.h: Likewise. * sysdeps/unix/sysv/linux/alpha/bits/shm.h: Likewise. * sysdeps/unix/sysv/linux/powerpc/bits/shm.h: Likewise. * sysdeps/unix/sysv/linux/s390/bits/shm.h: Likewise. * sysdeps/unix/sysv/linux/sparc/bits/shm.h: Likewise. * sysdeps/unix/sysv/linux/x86_64/bits/shm.h: Likewise. --- ChangeLog | 16 ++++++++++++++++ bits/shm.h | 7 ++++++- resolv/res_query.c | 7 +++++-- sysdeps/generic/bits/shm.h | 7 ++++++- sysdeps/gnu/bits/shm.h | 7 ++++++- sysdeps/unix/sysv/linux/alpha/bits/shm.h | 7 ++++++- sysdeps/unix/sysv/linux/bits/shm.h | 4 ++-- sysdeps/unix/sysv/linux/powerpc/bits/shm.h | 7 ++++++- sysdeps/unix/sysv/linux/s390/bits/shm.h | 6 +++++- sysdeps/unix/sysv/linux/sparc/bits/shm.h | 7 ++++++- sysdeps/unix/sysv/linux/x86_64/bits/shm.h | 7 ++++++- 11 files changed, 70 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index fcd8789..7c76540 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,19 @@ +2004-08-12 Jakub Jelinek + + * resolv/res_query.c (__libc_res_nsearch): Protect the debugging + printf with #ifdef DEBUG and RES_DEBUG check. + + * sysdeps/unix/sysv/linux/bits/shm.h: Move __END_DECLS after + __USE_MISC #endif. + * sysdeps/generic/bits/shm.h: Add __BEGIN_DECLS for __getpagesize + declaration. + * sysdeps/gnu/bits/shm.h: Likewise. + * sysdeps/unix/sysv/linux/alpha/bits/shm.h: Likewise. + * sysdeps/unix/sysv/linux/powerpc/bits/shm.h: Likewise. + * sysdeps/unix/sysv/linux/s390/bits/shm.h: Likewise. + * sysdeps/unix/sysv/linux/sparc/bits/shm.h: Likewise. + * sysdeps/unix/sysv/linux/x86_64/bits/shm.h: Likewise. + 2004-08-12 Ulrich Drepper * po/ca.po: Update from translation team. diff --git a/bits/shm.h b/bits/shm.h index 44a18d6..746a863 100644 --- a/bits/shm.h +++ b/bits/shm.h @@ -1,4 +1,5 @@ -/* Copyright (C) 1995, 1996, 1997, 2000, 2002 Free Software Foundation, Inc. +/* Copyright (C) 1995, 1996, 1997, 2000, 2002, 2004 + 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 @@ -31,6 +32,8 @@ #define SHM_LOCK 11 /* lock segment (root only) */ #define SHM_UNLOCK 12 /* unlock segment (root only) */ +__BEGIN_DECLS + /* Segment low boundary address multiple. */ #define SHMLBA (__getpagesize ()) extern int __getpagesize (void) __THROW __attribute__ ((__const__)); @@ -51,3 +54,5 @@ struct shmid_ds __pid_t shm_lpid; /* pid of last shmop */ shmatt_t shm_nattch; /* number of current attaches */ }; + +__END_DECLS diff --git a/resolv/res_query.c b/resolv/res_query.c index bad1495..d2ef3b5 100644 --- a/resolv/res_query.c +++ b/resolv/res_query.c @@ -239,8 +239,11 @@ __libc_res_nsearch(res_state statp, return (__libc_res_nquery(statp, cp, class, type, answer, anslen, answerp)); - printf("dots=%d, statp->ndots=%d, trailing_dot=%d, name=%s\n", - (int)dots,(int)statp->ndots,(int)trailing_dot,name); +#ifdef DEBUG + if (statp->options & RES_DEBUG) + printf("dots=%d, statp->ndots=%d, trailing_dot=%d, name=%s\n", + (int)dots,(int)statp->ndots,(int)trailing_dot,name); +#endif /* * If there are enough dots in the name, let's just give it a diff --git a/sysdeps/generic/bits/shm.h b/sysdeps/generic/bits/shm.h index 44a18d6..746a863 100644 --- a/sysdeps/generic/bits/shm.h +++ b/sysdeps/generic/bits/shm.h @@ -1,4 +1,5 @@ -/* Copyright (C) 1995, 1996, 1997, 2000, 2002 Free Software Foundation, Inc. +/* Copyright (C) 1995, 1996, 1997, 2000, 2002, 2004 + 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 @@ -31,6 +32,8 @@ #define SHM_LOCK 11 /* lock segment (root only) */ #define SHM_UNLOCK 12 /* unlock segment (root only) */ +__BEGIN_DECLS + /* Segment low boundary address multiple. */ #define SHMLBA (__getpagesize ()) extern int __getpagesize (void) __THROW __attribute__ ((__const__)); @@ -51,3 +54,5 @@ struct shmid_ds __pid_t shm_lpid; /* pid of last shmop */ shmatt_t shm_nattch; /* number of current attaches */ }; + +__END_DECLS diff --git a/sysdeps/gnu/bits/shm.h b/sysdeps/gnu/bits/shm.h index 2c41833..cbda9ce 100644 --- a/sysdeps/gnu/bits/shm.h +++ b/sysdeps/gnu/bits/shm.h @@ -1,4 +1,5 @@ -/* Copyright (C) 1995, 1996, 1997, 2000, 2002 Free Software Foundation, Inc. +/* Copyright (C) 1995, 1996, 1997, 2000, 2002, 2004 + 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 @@ -36,6 +37,8 @@ #define SHM_LOCK 11 /* lock segment (root only) */ #define SHM_UNLOCK 12 /* unlock segment (root only) */ +__BEGIN_DECLS + /* Segment low boundary address multiple. */ #define SHMLBA (__getpagesize ()) extern int __getpagesize (void) __THROW __attribute__ ((__const__)); @@ -90,3 +93,5 @@ struct shm_info }; #endif /* __USE_MISC */ + +__END_DECLS diff --git a/sysdeps/unix/sysv/linux/alpha/bits/shm.h b/sysdeps/unix/sysv/linux/alpha/bits/shm.h index 4184265..bbee434 100644 --- a/sysdeps/unix/sysv/linux/alpha/bits/shm.h +++ b/sysdeps/unix/sysv/linux/alpha/bits/shm.h @@ -1,4 +1,5 @@ -/* Copyright (C) 1995, 1996, 1997, 2000, 2002 Free Software Foundation, Inc. +/* Copyright (C) 1995, 1996, 1997, 2000, 2002, 2004 + 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 @@ -35,6 +36,8 @@ #define SHM_LOCK 11 /* lock segment (root only) */ #define SHM_UNLOCK 12 /* unlock segment (root only) */ +__BEGIN_DECLS + /* Segment low boundary address multiple. */ #define SHMLBA (__getpagesize ()) extern int __getpagesize (void) __THROW __attribute__ ((__const__)); @@ -93,3 +96,5 @@ struct shm_info }; #endif /* __USE_MISC */ + +__END_DECLS diff --git a/sysdeps/unix/sysv/linux/bits/shm.h b/sysdeps/unix/sysv/linux/bits/shm.h index 639c126..225b89d 100644 --- a/sysdeps/unix/sysv/linux/bits/shm.h +++ b/sysdeps/unix/sysv/linux/bits/shm.h @@ -97,6 +97,6 @@ struct shm_info unsigned long int swap_successes; }; -__END_DECLS - #endif /* __USE_MISC */ + +__END_DECLS diff --git a/sysdeps/unix/sysv/linux/powerpc/bits/shm.h b/sysdeps/unix/sysv/linux/powerpc/bits/shm.h index 38379ac..7705fb6 100644 --- a/sysdeps/unix/sysv/linux/powerpc/bits/shm.h +++ b/sysdeps/unix/sysv/linux/powerpc/bits/shm.h @@ -1,4 +1,5 @@ -/* Copyright (C) 1995, 1996, 1997, 2000, 2002 Free Software Foundation, Inc. +/* Copyright (C) 1995, 1996, 1997, 2000, 2002, 2004 + 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 @@ -35,6 +36,8 @@ #define SHM_LOCK 11 /* lock segment (root only) */ #define SHM_UNLOCK 12 /* unlock segment (root only) */ +__BEGIN_DECLS + /* Segment low boundary address multiple. */ #define SHMLBA (__getpagesize ()) extern int __getpagesize (void) __THROW __attribute__ ((__const__)); @@ -105,3 +108,5 @@ struct shm_info }; #endif /* __USE_MISC */ + +__END_DECLS diff --git a/sysdeps/unix/sysv/linux/s390/bits/shm.h b/sysdeps/unix/sysv/linux/s390/bits/shm.h index 682e24e..b7c2ad0 100644 --- a/sysdeps/unix/sysv/linux/s390/bits/shm.h +++ b/sysdeps/unix/sysv/linux/s390/bits/shm.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001, 2002 Free Software Foundation, Inc. +/* Copyright (C) 2001, 2002, 2004 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 @@ -36,6 +36,8 @@ #define SHM_LOCK 11 /* lock segment (root only) */ #define SHM_UNLOCK 12 /* unlock segment (root only) */ +__BEGIN_DECLS + /* Segment low boundary address multiple. */ #define SHMLBA (__getpagesize ()) extern int __getpagesize (void) __THROW __attribute__ ((__const__)); @@ -103,3 +105,5 @@ struct shm_info }; #endif /* __USE_MISC */ + +__END_DECLS diff --git a/sysdeps/unix/sysv/linux/sparc/bits/shm.h b/sysdeps/unix/sysv/linux/sparc/bits/shm.h index 144f311..f075be8 100644 --- a/sysdeps/unix/sysv/linux/sparc/bits/shm.h +++ b/sysdeps/unix/sysv/linux/sparc/bits/shm.h @@ -1,4 +1,5 @@ -/* Copyright (C) 1995, 1996, 1997, 2000, 2002 Free Software Foundation, Inc. +/* Copyright (C) 1995, 1996, 1997, 2000, 2002, 2004 + 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 @@ -36,6 +37,8 @@ #define SHM_LOCK 11 /* lock segment (root only) */ #define SHM_UNLOCK 12 /* unlock segment (root only) */ +__BEGIN_DECLS + /* Segment low boundary address multiple. */ #define SHMLBA (__getpagesize ()) extern int __getpagesize (void) __THROW __attribute__ ((__const__)); @@ -103,3 +106,5 @@ struct shm_info }; #endif /* __USE_MISC */ + +__END_DECLS diff --git a/sysdeps/unix/sysv/linux/x86_64/bits/shm.h b/sysdeps/unix/sysv/linux/x86_64/bits/shm.h index 005d643..4282d75 100644 --- a/sysdeps/unix/sysv/linux/x86_64/bits/shm.h +++ b/sysdeps/unix/sysv/linux/x86_64/bits/shm.h @@ -1,4 +1,5 @@ -/* Copyright (C) 1995, 1996, 1997, 2000, 2002 Free Software Foundation, Inc. +/* Copyright (C) 1995, 1996, 1997, 2000, 2002, 2004 + 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 @@ -35,6 +36,8 @@ #define SHM_LOCK 11 /* lock segment (root only) */ #define SHM_UNLOCK 12 /* unlock segment (root only) */ +__BEGIN_DECLS + /* Segment low boundary address multiple. */ #define SHMLBA (__getpagesize ()) extern int __getpagesize (void) __THROW __attribute__ ((__const__)); @@ -102,3 +105,5 @@ struct shm_info }; #endif /* __USE_MISC */ + +__END_DECLS -- 2.7.4