aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2001-07-24 22:16:09 +0000
committerUlrich Drepper <drepper@redhat.com>2001-07-24 22:16:09 +0000
commitf369623d6d7af1f7cddfa7bcda413b88107db2e6 (patch)
tree73473a65cf454c625a71426eaadf42ef5fd1b075
parent0db597422f2e5aa5a15342b95b56a0c1247af27f (diff)
downloadglibc-f369623d6d7af1f7cddfa7bcda413b88107db2e6.tar
glibc-f369623d6d7af1f7cddfa7bcda413b88107db2e6.tar.gz
glibc-f369623d6d7af1f7cddfa7bcda413b88107db2e6.tar.bz2
glibc-f369623d6d7af1f7cddfa7bcda413b88107db2e6.zip
Update.
2001-07-22 Bruno Haible <haible@clisp.cons.org> * intl/libintl.h (ngettext, dngettext, dcngettext): Use both msgid1 and msgid2 for printf format argument checking.
-rw-r--r--ChangeLog5
-rw-r--r--intl/libintl.h6
-rw-r--r--linuxthreads/ChangeLog5
-rw-r--r--linuxthreads/tst-context.c5
-rw-r--r--misc/sys/cdefs.h5
5 files changed, 21 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index aa3dffed18..ed81dbcebc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-07-22 Bruno Haible <haible@clisp.cons.org>
+
+ * intl/libintl.h (ngettext, dngettext, dcngettext): Use both msgid1
+ and msgid2 for printf format argument checking.
+
2001-07-24 Ulrich Drepper <drepper@redhat.com>
* iconv/gconv_cache.c (find_module): Don't allocate room for the
diff --git a/intl/libintl.h b/intl/libintl.h
index dd69ec20a8..95eb90015e 100644
--- a/intl/libintl.h
+++ b/intl/libintl.h
@@ -54,20 +54,20 @@ extern char *__dcgettext (__const char *__domainname,
number N. */
extern char *ngettext (__const char *__msgid1, __const char *__msgid2,
unsigned long int __n)
- __THROW __attribute_format_arg__ (1);
+ __THROW __attribute_format_arg__ (1) __attribute_format_arg__ (2);
/* Similar to `dgettext' but select the plural form corresponding to the
number N. */
extern char *dngettext (__const char *__domainname, __const char *__msgid1,
__const char *__msgid2, unsigned long int __n)
- __THROW __attribute_format_arg__ (2);
+ __THROW __attribute_format_arg__ (2) __attribute_format_arg__ (3);
/* Similar to `dcgettext' but select the plural form corresponding to the
number N. */
extern char *dcngettext (__const char *__domainname, __const char *__msgid1,
__const char *__msgid2, unsigned long int __n,
int __category)
- __THROW __attribute_format_arg__ (2);
+ __THROW __attribute_format_arg__ (2) __attribute_format_arg__ (3);
/* Set the current default message catalog to DOMAINNAME.
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index 8644edae60..36ae2fa51d 100644
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/ChangeLog
@@ -1,3 +1,8 @@
+2001-07-24 Ulrich Drepper <drepper@redhat.com>
+
+ * tst-context.c (main): Print explanation before bailing out
+ because context handling is not supported.
+
2001-07-23 Ulrich Drepper <drepper@redhat.com>
* Makefile (tests): Add tst-context.
diff --git a/linuxthreads/tst-context.c b/linuxthreads/tst-context.c
index cf4783dec1..82a877cffe 100644
--- a/linuxthreads/tst-context.c
+++ b/linuxthreads/tst-context.c
@@ -67,7 +67,10 @@ main (void)
if (getcontext (&mctx) != 0)
{
if (errno == ENOSYS)
- exit (0);
+ {
+ puts ("context handling not supported");
+ exit (0);
+ }
printf ("%s: getcontext: %m\n", __FUNCTION__);
exit (1);
diff --git a/misc/sys/cdefs.h b/misc/sys/cdefs.h
index 4bdfa08762..02454ee4da 100644
--- a/misc/sys/cdefs.h
+++ b/misc/sys/cdefs.h
@@ -162,7 +162,10 @@
/* At some point during the gcc 2.8 development the `format_arg' attribute
for functions was introduced. We don't want to use it unconditionally
- (although this would be possible) since it generates warnings. */
+ (although this would be possible) since it generates warnings.
+ If several `format_arg' attributes are given for the same function, in
+ gcc-3.0 and older, all but the last one are ignored. In newer gccs,
+ all designated arguments are considered. */
#if __GNUC_PREREQ (2,8)
# define __attribute_format_arg__(x) __attribute__ ((__format_arg__ (x)))
#else