mirrors/coreutils
0
0
Fork 0
mirror of https://github.com/coreutils/coreutils.git synced 2024-12-19 14:57:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

maint: remove -Wmissing-field-initializers workarounds

Browse Source 
* configure.ac: Rather than disabling -Wmissing-field-initializers,
use the fact that gnulib now disables it automatically when required
(on versions of GCC older than 4.7).
* src/system.h: Remove the no longer needed DECLARE_ZEROED_AGGREGATE.
* src/ls.c: Likewise.
* src/pathchk.c: Likewise.
* src/shred.c: Likewise.
* src/stty.c: Likewise.
* src/wc.c: Likewise.
This commit is contained in:
Pádraig Brady 2011-04-26 10:30:05 +01:00
parent 3c8ff029d4
commit 73fd918bd0
7 changed files with 6 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configure.ac
View File

@ -96,7 +96,6 @@ if test "$gl_gcc_warnings" = yes; then
for w in $ws; do
gl_WARN_ADD([$w])
done
gl_WARN_ADD([-Wno-missing-field-initializers]) # We need this one
gl_WARN_ADD([-Wno-sign-compare]) # Too many warnings for now
gl_WARN_ADD([-Wno-unused-parameter]) # Too many warnings for now

2
src/ls.c
View File

@ -3891,7 +3891,7 @@ quote_name (FILE *out, const char *name, struct quoting_options const *options,
reach its end, replacing each non-printable multibyte
character with a single question mark. */
{
DECLARE_ZEROED_AGGREGATE (mbstate_t, mbstate);
mbstate_t mbstate = { 0, };
do
{
wchar_t wc;

2
src/pathchk.c
View File

@ -196,7 +196,7 @@ portable_chars_only (char const *file, size_t filelen)
if (*invalid)
{
DECLARE_ZEROED_AGGREGATE (mbstate_t, mbstate);
mbstate_t mbstate = { 0, };
size_t charlen = mbrlen (invalid, filelen - validlen, &mbstate);
error (0, 0,
_("nonportable character %s in file name %s"),

2
src/shred.c
View File

@ -1098,7 +1098,7 @@ int
main (int argc, char **argv)
{
bool ok = true;
DECLARE_ZEROED_AGGREGATE (struct Options, flags);
struct Options flags = { 0, };
char **file;
int n_files;
int c;

4
src/stty.c
View File

@ -730,7 +730,7 @@ main (int argc, char **argv)
{
/* Initialize to all zeroes so there is no risk memcmp will report a
spurious difference in an uninitialized portion of the structure. */
DECLARE_ZEROED_AGGREGATE (struct termios, mode);
struct termios mode = { 0, };
enum output_type output_type;
int optc;
@ -1003,7 +1003,7 @@ main (int argc, char **argv)
{
/* Initialize to all zeroes so there is no risk memcmp will report a
spurious difference in an uninitialized portion of the structure. */
DECLARE_ZEROED_AGGREGATE (struct termios, new_mode);
struct termios new_mode = { 0, };
if (tcsetattr (STDIN_FILENO, TCSADRAIN, &mode))
error (EXIT_FAILURE, errno, "%s", device_name);

13
src/system.h
View File

@ -467,19 +467,6 @@ enum
# define IF_LINT(Code) /* empty */
#endif
/* With -Dlint, avoid warnings from gcc about code like mbstate_t m = {0,};
by wasting space on a static variable of the same type, that is thus
guaranteed to be initialized to 0, and use that on the RHS. */
#define DZA_CONCAT0(x,y) x ## y
#define DZA_CONCAT(x,y) DZA_CONCAT0 (x, y)
#ifdef lint
# define DECLARE_ZEROED_AGGREGATE(Type, Var) \
static Type DZA_CONCAT (s0_, __LINE__); Type Var = DZA_CONCAT (s0_, __LINE__)
#else
# define DECLARE_ZEROED_AGGREGATE(Type, Var) \
Type Var = { 0, }
#endif
#ifndef __attribute__
# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 8)
# define __attribute__(x) /* empty */

2
src/wc.c
View File

@ -285,7 +285,7 @@ wc (int fd, char const *file_x, struct fstatus *fstatus)
{
bool in_word = false;
uintmax_t linepos = 0;
DECLARE_ZEROED_AGGREGATE (mbstate_t, state);
mbstate_t state = { 0, };
bool in_shift = false;
# if SUPPORT_OLD_MBRTOWC
/* Back-up the state before each multibyte character conversion and