qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove non-standard initialisation of flexible array member 

This avoids GCC bug 28865.
This commit is contained in:
Andreas Schwab 2013-04-20 12:12:35 +02:00
parent 5c95f7b66b
commit 7ed3f4e859
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -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> 2013-04-23 Heiko Carstens <heiko.carstens@de.ibm.com>
* sysdeps/unix/sysv/linux/s390/bits/statfs.h: Change types of * sysdeps/unix/sysv/linux/s390/bits/statfs.h: Change types of

9
nss/nss_files/files-init.c
View File

@ -18,6 +18,7 @@
#ifdef USE_NSCD #ifdef USE_NSCD
#include <string.h>
#include <nscd/nscd.h> #include <nscd/nscd.h>
@ -30,7 +31,7 @@ static union \
{ \ { \
.file = \ .file = \
{ \ { \
.fname = filename, ## __VA_ARGS__ \ __VA_ARGS__ \
} \ } \
} }
@ -45,16 +46,22 @@ TF (netgr, "/etc/netgroup");
void void
_nss_files_init (void (*cb) (size_t, struct traced_file *)) _nss_files_init (void (*cb) (size_t, struct traced_file *))
{ {
strcpy (pwd_traced_file.file.fname, "/etc/passwd");
cb (pwddb, &pwd_traced_file.file); cb (pwddb, &pwd_traced_file.file);
strcpy (grp_traced_file.file.fname, "/etc/group");
cb (grpdb, &grp_traced_file.file); cb (grpdb, &grp_traced_file.file);
strcpy (hst_traced_file.file.fname, "/etc/hosts");
cb (hstdb, &hst_traced_file.file); cb (hstdb, &hst_traced_file.file);
strcpy (resolv_traced_file.file.fname, "/etc/resolv.conf");
cb (hstdb, &resolv_traced_file.file); cb (hstdb, &resolv_traced_file.file);
strcpy (serv_traced_file.file.fname, "/etc/services");
cb (servdb, &serv_traced_file.file); cb (servdb, &serv_traced_file.file);
strcpy (netgr_traced_file.file.fname, "/etc/netgroup");
cb (netgrdb, &netgr_traced_file.file); cb (netgrdb, &netgr_traced_file.file);
} }