Jim Meyering wrote: > Eric Blake wrote: ... >> Incomplete. I'd rather see this patch nuke all of the .x-sc files and >> convert them into exclude_file_name_regexp entries. > > That will be an improvement, but it does not belong in this series. > This series is addressing preexisting (and a few new, with sync) > syntax-check failures. What you're proposing is most welcome (moving the > exemptions from numerous separate files into cfg.mk), but it qualifies > as a no-semantic-change and deserves to be separate.
I did as you suggested. >From 46322d672635d018949a05775cc120d36c15be6e Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyer...@redhat.com> Date: Sat, 21 Jan 2012 16:12:45 +0100 Subject: [PATCH] maint: convert .x-sc_* into exclude_file_name_regexp--sc_* exemptions Many of the .x-sc_* exemptions were no long necessary. Remove those files and instead, provide exemptions via variable definitions in cfg.mk to address the few remaining exceptions. * .x-sc_prohibit_atoi_atof: Remove file. * .x-sc_space_tab: Likewise. * .x-sc_sun_os_names: Likewise. * .x-sc_trailing_blank: Likewise. * .x-sc_two_space_separator_in_usage: Likewise. * .x-sc_useless_cpp_parens: Likewise. * cfg.mk: Add minimal exemptions. * cfg.mk: Add minimal exemptions. * doc/standards.texi (Standard C): Address the sole useless-cpp-parens violation in this file: -#if defined (__STDC__) || defined (WINDOWSNT) +#if defined __STDC__ || defined WINDOWSNT With that, the only remaining offender is config.guess, whose name is now listed in cfg.mk. Suggested by Eric Blake. --- .x-sc_prohibit_atoi_atof | 3 --- .x-sc_space_tab | 4 ---- .x-sc_sun_os_names | 1 - .x-sc_trailing_blank | 5 ----- .x-sc_two_space_separator_in_usage | 1 - .x-sc_useless_cpp_parens | 2 -- cfg.mk | 6 ++++++ doc/standards.texi | 4 ++-- 8 files changed, 8 insertions(+), 18 deletions(-) delete mode 100644 .x-sc_prohibit_atoi_atof delete mode 100644 .x-sc_space_tab delete mode 100644 .x-sc_sun_os_names delete mode 100644 .x-sc_trailing_blank delete mode 100644 .x-sc_two_space_separator_in_usage delete mode 100644 .x-sc_useless_cpp_parens diff --git a/.x-sc_prohibit_atoi_atof b/.x-sc_prohibit_atoi_atof deleted file mode 100644 index 4d68f47..0000000 --- a/.x-sc_prohibit_atoi_atof +++ /dev/null @@ -1,3 +0,0 @@ -ChangeLog -maint.mk -doc/autoconf.texi diff --git a/.x-sc_space_tab b/.x-sc_space_tab deleted file mode 100644 index f1d23c7..0000000 --- a/.x-sc_space_tab +++ /dev/null @@ -1,4 +0,0 @@ -build-aux/config.guess -build-aux/config.sub -aclocal.m4 -configure diff --git a/.x-sc_sun_os_names b/.x-sc_sun_os_names deleted file mode 100644 index c05fdfd..0000000 --- a/.x-sc_sun_os_names +++ /dev/null @@ -1 +0,0 @@ -build-aux/config.guess diff --git a/.x-sc_trailing_blank b/.x-sc_trailing_blank deleted file mode 100644 index 0227407..0000000 --- a/.x-sc_trailing_blank +++ /dev/null @@ -1,5 +0,0 @@ -build-aux/gendocs.sh -build-aux/texinfo.tex -doc/gendocs_template -doc/gnu-oids.texi -doc/standards.texi diff --git a/.x-sc_two_space_separator_in_usage b/.x-sc_two_space_separator_in_usage deleted file mode 100644 index 1b03a24..0000000 --- a/.x-sc_two_space_separator_in_usage +++ /dev/null @@ -1 +0,0 @@ -gnupload diff --git a/.x-sc_useless_cpp_parens b/.x-sc_useless_cpp_parens deleted file mode 100644 index 9c134e2..0000000 --- a/.x-sc_useless_cpp_parens +++ /dev/null @@ -1,2 +0,0 @@ -build-aux/config.guess -doc/standards.texi diff --git a/cfg.mk b/cfg.mk index 77e0487..3cfb1cc 100644 --- a/cfg.mk +++ b/cfg.mk @@ -133,3 +133,9 @@ old_NEWS_hash = 33207c359dd7db17cc0cd151da6b9567 exclude_file_name_regexp--sc_prohibit_undesirable_word_seq = ^maint\.mk$$ exclude_file_name_regexp--sc_prohibit_test_minus_ao = \ ^(maint\.mk|doc/autoconf\.texi)$$ + +exclude_file_name_regexp--sc_prohibit_atoi_atof = ^doc/autoconf\.texi$$ +exclude_file_name_regexp--sc_useless_cpp_parens = ^build-aux/config\.guess$$ +exclude_file_name_regexp--sc_trailing_blank = ^build-aux/texinfo\.tex$$ +exclude_file_name_regexp--sc_two_space_separator_in_usage = \ + ^build-aux/gnupload$$ diff --git a/doc/standards.texi b/doc/standards.texi index 06fd9c7..642a4ff 100644 --- a/doc/standards.texi +++ b/doc/standards.texi @@ -3,7 +3,7 @@ @setfilename standards.info @settitle GNU Coding Standards @c This date is automagically updated when you save this file: -@set lastupdate January 8, 2012 +@set lastupdate January 21, 2012 @c %**end of header @dircategory GNU organization @@ -472,7 +472,7 @@ Standard C @example /* Declare the prototype for a general external function. */ -#if defined (__STDC__) || defined (WINDOWSNT) +#if defined __STDC__ || defined WINDOWSNT #define P_(proto) proto #else #define P_(proto) () -- 1.7.9.rc2.2.g183d6
