[Findutils-patches] [PATCH 18/19] cfg.mk: simplify variables

[James Youngman]

* cfg.mk: Append the names of checks to skip to
local-checks-to-skip rather than inventing 7 new variables.

Signed-off-by: James Youngman <address@hidden>
---
 ChangeLog |    4 ++++
 cfg.mk    |   20 +++++++++-----------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 472cabe..b71bd00 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2010-04-02  James Youngman  <address@hidden>
 
+       * cfg.mk: Append the names of checks to skip to
+       local-checks-to-skip rather than inventing 7 new variables.
+
        Don't include quote.h/quotearg.h where it is not used.
        * find/find.c: Don't include "quote.h", it's not used.
        * find/ftsfind.c: Likewise.
@@ -7,6 +10,7 @@
        * locate/locate.c: Likewise.
        * locate/word_io.c: Likewise.
        * cfg.mk (skip_dunno): Enable check sc_prohibit_quote_without_use.
+
        * find/find.c: Don't include "quotearg.h", it's not used.
        * lib/fdleak.c: Likewise.
 
diff --git a/cfg.mk b/cfg.mk
index 24d7f83..e06740a 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -14,38 +14,36 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+local-checks-to-skip :=
+
 # Errors I think are too picky anyway.
-skip_too_picky = sc_error_message_period sc_error_message_uppercase \
+local-checks-to-skip += sc_error_message_period sc_error_message_uppercase \
        sc_file_system
 
 # Errors I have not investigated; diagnose and fix later.
-skip_dunno = sc_immutable_NEWS sc_makefile_at_at_check
+local-checks-to-skip += sc_immutable_NEWS sc_makefile_at_at_check
 
 # False positives I don't have a workaround for yet.
 # sc_space_tab: several .xo test output files contain this sequence
 #               for testing xargs's handling of white space.
-false_positives = sc_obsolete_symbols sc_prohibit_cvs_keyword \
+local-checks-to-skip += sc_obsolete_symbols sc_prohibit_cvs_keyword \
        sc_two_space_separator_in_usage \
        sc_space_tab
 
 # Problems that have some false positives and some real ones; tease
 # apart later.
-mix_positives = sc_trailing_blank
+local-checks-to-skip += sc_trailing_blank
 
 # Problems partly fixed in other patches which aren't merged yet.
-skip_blocked_patch = sc_useless_cpp_parens
+local-checks-to-skip += sc_useless_cpp_parens
 
 # Problems we can't esaily fixed because they apply to files which we need
 # to keep in sync, so can't easily make a local change to.
 # sc_texinfo_acronym: perms.texi from coreutils uses @acronym{GNU}.
-skip_blocked_notours = \
+local-checks-to-skip += \
        sc_texinfo_acronym
 
 # sc_prohibit_strcmp is broken because it gives false positives for cases
 # where neither argument is a string literal.
 # sc_prohibit_stat_st_blocks produces a false positive on definition of 
ST_NBLOCKS.
-skip_broken_checks = sc_prohibit_strcmp sc_prohibit_stat_st_blocks
-
-local-checks-to-skip = \
-       $(skip_too_picky) $(skip_dunno) $(false_positives) \
-       $(mix_positives) $(skip_blocked_patch) $(skip_blocked_notours) 
$(skip_broken_checks)
+local-checks-to-skip += sc_prohibit_strcmp sc_prohibit_stat_st_blocks
-- 
1.7.0