This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.17-550-g7ed3f4e
- From: schwab at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 23 Apr 2013 08:33:14 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.17-550-g7ed3f4e
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via 7ed3f4e859896fbb8d384a4f101e40df47eb0ef0 (commit)
from 5c95f7b66be2e59cf26f3c29cfab7657880bd76d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=7ed3f4e859896fbb8d384a4f101e40df47eb0ef0
commit 7ed3f4e859896fbb8d384a4f101e40df47eb0ef0
Author: Andreas Schwab <schwab@linux-m68k.org>
Date: Sat Apr 20 12:12:35 2013 +0200
Remove non-standard initialisation of flexible array member
This avoids GCC bug 28865.
diff --git a/ChangeLog b/ChangeLog
index 4b41c6d..9a54ec7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2013-04-23 Andreas Schwab <schwab@linux-m68k.org>
+
+ * nss/nss_files/files-init.c (TF): Don't initialize flexible array
+ member.
+ (_nss_files_init): Set it here.
+
2013-04-23 Heiko Carstens <heiko.carstens@de.ibm.com>
* sysdeps/unix/sysv/linux/s390/bits/statfs.h: Change types of
diff --git a/nss/nss_files/files-init.c b/nss/nss_files/files-init.c
index 8aac3fb..a34c49a 100644
--- a/nss/nss_files/files-init.c
+++ b/nss/nss_files/files-init.c
@@ -18,6 +18,7 @@
#ifdef USE_NSCD
+#include <string.h>
#include <nscd/nscd.h>
@@ -30,7 +31,7 @@ static union \
{ \
.file = \
{ \
- .fname = filename, ## __VA_ARGS__ \
+ __VA_ARGS__ \
} \
}
@@ -45,16 +46,22 @@ TF (netgr, "/etc/netgroup");
void
_nss_files_init (void (*cb) (size_t, struct traced_file *))
{
+ strcpy (pwd_traced_file.file.fname, "/etc/passwd");
cb (pwddb, &pwd_traced_file.file);
+ strcpy (grp_traced_file.file.fname, "/etc/group");
cb (grpdb, &grp_traced_file.file);
+ strcpy (hst_traced_file.file.fname, "/etc/hosts");
cb (hstdb, &hst_traced_file.file);
+ strcpy (resolv_traced_file.file.fname, "/etc/resolv.conf");
cb (hstdb, &resolv_traced_file.file);
+ strcpy (serv_traced_file.file.fname, "/etc/services");
cb (servdb, &serv_traced_file.file);
+ strcpy (netgr_traced_file.file.fname, "/etc/netgroup");
cb (netgrdb, &netgr_traced_file.file);
}
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 6 ++++++
nss/nss_files/files-init.c | 9 ++++++++-
2 files changed, 14 insertions(+), 1 deletions(-)
hooks/post-receive
--
GNU C Library master sources