aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--malloc/obstack.h2
-rw-r--r--stdio-common/printf-parsemb.c3
3 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index b6ba4c9c70..7b7fa0682e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-06-29 Ulrich Drepper <drepper@redhat.com>
+
+ * stdio-common/printf-parsemb.c (__parse_one_specmb): Initialize
+ info.extra. Patch by Marcus Meissner.
+
2004-06-29 Kaz Kojima <kkojima@rr.iij4u.or.jp>
* sysdeps/unix/sysv/linux/sh/sysdep.h (SYSCALL_ERROR_HANDLER):
diff --git a/malloc/obstack.h b/malloc/obstack.h
index 2cf7d3be11..d18ef40b6e 100644
--- a/malloc/obstack.h
+++ b/malloc/obstack.h
@@ -194,7 +194,7 @@ extern int obstack_exit_failure;
Note that this might not be the final address of the object
because a new chunk might be needed to hold the final size. */
-#define obstack_base(h) (void *)((h)->object_base)
+#define obstack_base(h) ((void *) (h)->object_base)
/* Size for allocating ordinary chunks. */
diff --git a/stdio-common/printf-parsemb.c b/stdio-common/printf-parsemb.c
index 4a651cfedc..c55b97060c 100644
--- a/stdio-common/printf-parsemb.c
+++ b/stdio-common/printf-parsemb.c
@@ -1,5 +1,5 @@
/* Helper functions for parsing printf format strings.
- Copyright (C) 1995-1999, 2000, 2002, 2003 Free Software Foundation, Inc.
+ Copyright (C) 1995-2000, 2002, 2003, 2004 Free Software Foundation, Inc.
This file is part of th GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -104,6 +104,7 @@ __parse_one_specmb (const UCHAR_T *format, size_t posn,
spec->info.showsign = 0;
spec->info.group = 0;
spec->info.i18n = 0;
+ spec->info.extra = 0;
spec->info.pad = ' ';
spec->info.wide = sizeof (UCHAR_T) > 1;