From 7f45e1ae3741d0e03657c0c883e9b6cd1591f87c Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Tue, 17 Jan 2012 17:56:22 +0100 Subject: [PATCH] maint: remove empty lines at EOF, but excluding modules/* Apply syntax rules at home as well as abroad. Most changes were induced by running this: make srcdir=. _build-aux=build-aux -f top/maint.mk \ sc_prohibit_empty_lines_at_EOF | grep -v modules/ \ | xargs perl -pi -0777 -e 's/\n\n+$/\n/' * cfg.mk (local-checks-to-skip): Enable sc_prohibit_empty_lines_at_EOF. Exempt modules/* and two binary files. Also exclude doc/INSTALL*, per request from Bruno Haible. * doc/regexprops-generic.texi: *Add* a newline at EOF. There was none. * doc/Copyright/assign.translation.manual: Remove empty lines at EOF. * doc/Copyright/request-assign.future: Likewise. * doc/Copyright/request-disclaim.changes: Likewise. * doc/INSTALL: Likewise. * doc/INSTALL.ISO: Likewise. * doc/INSTALL.UTF-8: Likewise. * doc/acl-cygwin.txt: Likewise. * doc/acl-resources.txt: Likewise. * doc/fdl-1.2.texi: Likewise. * doc/fdl-1.3.texi: Likewise. * doc/fdl.texi: Likewise. * lib/argp-pin.c: Likewise. * lib/round.c: Likewise. * lib/unicase/u16-totitle.c: Likewise. * lib/unictype/block_test.c: Likewise. * lib/uninorm/canonical-decomposition.c: Likewise. * m4/README: Likewise. * m4/relocatable-lib.m4: Likewise. * tests/test-isnand-nolibm.c: Likewise. * tests/test-isnand.c: Likewise. * tests/uninorm/NormalizationTest.txt: Likewise. --- ChangeLog | 34 +++++++++++++++++++++++++++++++++ cfg.mk | 5 ++++- doc/Copyright/assign.translation.manual | 2 -- doc/Copyright/request-assign.future | 6 ------ doc/Copyright/request-disclaim.changes | 6 ------ doc/INSTALL | 1 - doc/INSTALL.ISO | 1 - doc/INSTALL.UTF-8 | 1 - doc/acl-cygwin.txt | 1 - doc/acl-resources.txt | 1 - doc/fdl.texi | 1 - doc/regexprops-generic.texi | 2 +- lib/argp-pin.c | 1 - lib/round.c | 1 - lib/unicase/u16-totitle.c | 1 - lib/unictype/block_test.c | 1 - lib/uninorm/canonical-decomposition.c | 1 - m4/README | 1 - m4/relocatable-lib.m4 | 1 - tests/test-isnand-nolibm.c | 1 - tests/test-isnand.c | 1 - tests/uninorm/NormalizationTest.txt | 2 -- 22 files changed, 39 insertions(+), 33 deletions(-) diff --git a/ChangeLog b/ChangeLog index d9ef16b47..f396efdec 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,39 @@ 2012-01-17 Jim Meyering + maint: remove empty lines at EOF, but excluding modules/* + Apply syntax rules at home as well as abroad. Most changes + were induced by running this: + make srcdir=. _build-aux=build-aux -f top/maint.mk \ + sc_prohibit_empty_lines_at_EOF | grep -v modules/ \ + | xargs perl -pi -0777 -e 's/\n\n+$/\n/' + * cfg.mk (local-checks-to-skip): Enable sc_prohibit_empty_lines_at_EOF. + Exempt modules/* and two binary files. + Also exempt doc/INSTALL*, per request from Bruno Haible. + * doc/regexprops-generic.texi: *Add* a newline at EOF. There was none. + * doc/Copyright/assign.translation.manual: Remove empty lines at EOF. + * doc/Copyright/request-assign.future: Likewise. + * doc/Copyright/request-disclaim.changes: Likewise. + * doc/INSTALL: Likewise. + * doc/INSTALL.ISO: Likewise. + * doc/INSTALL.UTF-8: Likewise. + * doc/acl-cygwin.txt: Likewise. + * doc/acl-resources.txt: Likewise. + * doc/fdl-1.2.texi: Likewise. + * doc/fdl-1.3.texi: Likewise. + * doc/fdl.texi: Likewise. + * lib/argp-pin.c: Likewise. + * lib/round.c: Likewise. + * lib/unicase/u16-totitle.c: Likewise. + * lib/unictype/block_test.c: Likewise. + * lib/uninorm/canonical-decomposition.c: Likewise. + * m4/README: Likewise. + * m4/relocatable-lib.m4: Likewise. + * tests/test-isnand-nolibm.c: Likewise. + * tests/test-isnand.c: Likewise. + * tests/uninorm/NormalizationTest.txt: Likewise. + +2012-01-17 Jim Meyering + maint: add framework to run syntax-check rules against gnulib sources * cfg.mk: New file, to disable all currently-failing tests. We'll enable them one by one, as they are made to pass. diff --git a/cfg.mk b/cfg.mk index 045d0aeb0..b4e41715c 100644 --- a/cfg.mk +++ b/cfg.mk @@ -26,7 +26,6 @@ local-checks-to-skip = \ sc_prohibit_cloexec_without_use \ sc_prohibit_dirent_without_use \ sc_prohibit_doubled_word \ - sc_prohibit_empty_lines_at_EOF \ sc_prohibit_error_without_use \ sc_prohibit_getopt_without_use \ sc_prohibit_hash_pjw_without_use \ @@ -54,3 +53,7 @@ local-checks-to-skip = \ sc_two_space_separator_in_usage \ sc_unmarked_diagnostics \ sc_useless_cpp_parens + +empty-at-EOF = /fr/LC_MESSAGES/test-quotearg\.mo$$|^doc/INSTALL(\.(ISO|UTF-8))? +exclude_file_name_regexp--sc_prohibit_empty_lines_at_EOF = \ + ^modules/|^lib/javaversion\.class$$|$(empty-at-EOF) diff --git a/doc/Copyright/assign.translation.manual b/doc/Copyright/assign.translation.manual index 7077bc248..8f6cfd8ac 100644 --- a/doc/Copyright/assign.translation.manual +++ b/doc/Copyright/assign.translation.manual @@ -103,5 +103,3 @@ it separately (eg. in a message) makes extra clerical work for us.] [Please write your snail address here, so we can snail a copy back to you.] - - diff --git a/doc/Copyright/request-assign.future b/doc/Copyright/request-assign.future index f04ccd689..e1184a64d 100644 --- a/doc/Copyright/request-assign.future +++ b/doc/Copyright/request-assign.future @@ -34,9 +34,3 @@ your changes? Do you attend a school which might make such a claim?] [Which files have you changed so far, and which new files have you written so far?] - - - - - - diff --git a/doc/Copyright/request-disclaim.changes b/doc/Copyright/request-disclaim.changes index 400c67f46..209f25c77 100644 --- a/doc/Copyright/request-disclaim.changes +++ b/doc/Copyright/request-disclaim.changes @@ -39,9 +39,3 @@ your changes?] [Please list the files involved, or give a brief description of the changes being disclaimed.] - - - - - - diff --git a/doc/INSTALL b/doc/INSTALL index ef4b78909..6e90e07d2 100644 --- a/doc/INSTALL +++ b/doc/INSTALL @@ -368,4 +368,3 @@ operates. `configure' also accepts some other, not widely useful, options. Run `configure --help' for more details. - diff --git a/doc/INSTALL.ISO b/doc/INSTALL.ISO index 032d47c63..d60e29ab7 100644 --- a/doc/INSTALL.ISO +++ b/doc/INSTALL.ISO @@ -368,4 +368,3 @@ operates. 'configure' also accepts some other, not widely useful, options. Run 'configure --help' for more details. - diff --git a/doc/INSTALL.UTF-8 b/doc/INSTALL.UTF-8 index b41c683c6..89e5f651c 100644 --- a/doc/INSTALL.UTF-8 +++ b/doc/INSTALL.UTF-8 @@ -368,4 +368,3 @@ operates. ‘configure’ also accepts some other, not widely useful, options. Run ‘configure --help’ for more details. - diff --git a/doc/acl-cygwin.txt b/doc/acl-cygwin.txt index e3007f510..82ce6e4e0 100644 --- a/doc/acl-cygwin.txt +++ b/doc/acl-cygwin.txt @@ -135,4 +135,3 @@ permissions according to the combination of the current umask, the explicit permissions requested and the default ACL entries Note: Under Cygwin, the default ACL entries are not taken into account currently. - diff --git a/doc/acl-resources.txt b/doc/acl-resources.txt index 26d5cc707..6edd16551 100644 --- a/doc/acl-resources.txt +++ b/doc/acl-resources.txt @@ -493,4 +493,3 @@ Functions: ... Utilities: cacls - diff --git a/doc/fdl.texi b/doc/fdl.texi index 3b83db466..cb71f05a1 100644 --- a/doc/fdl.texi +++ b/doc/fdl.texi @@ -503,4 +503,3 @@ to permit their use in free software. @c Local Variables: @c ispell-local-pdict: "ispell-dict" @c End: - diff --git a/doc/regexprops-generic.texi b/doc/regexprops-generic.texi index bd0675912..bdd780753 100644 --- a/doc/regexprops-generic.texi +++ b/doc/regexprops-generic.texi @@ -712,4 +712,4 @@ The longest possible match is returned; this applies to the regular expression a @node sed regular expression syntax @subsection @samp{sed} regular expression syntax -This is a synonym for ed. \ No newline at end of file +This is a synonym for ed. diff --git a/lib/argp-pin.c b/lib/argp-pin.c index e50dad81a..aab816051 100644 --- a/lib/argp-pin.c +++ b/lib/argp-pin.c @@ -24,4 +24,3 @@ char *program_invocation_short_name = 0; #ifndef HAVE_PROGRAM_INVOCATION_NAME char *program_invocation_name = 0; #endif - diff --git a/lib/round.c b/lib/round.c index f4c8a35ec..f7b2954a8 100644 --- a/lib/round.c +++ b/lib/round.c @@ -167,4 +167,3 @@ FLOOR_FREE_ROUND (DOUBLE x) return z; } #endif /* FLOOR_FREE_ROUND */ - diff --git a/lib/unicase/u16-totitle.c b/lib/unicase/u16-totitle.c index 9e8f3c2e1..ddb8a1a5c 100644 --- a/lib/unicase/u16-totitle.c +++ b/lib/unicase/u16-totitle.c @@ -24,4 +24,3 @@ #define UNIT uint16_t #define U_CT_TOTITLE u16_ct_totitle #include "u-totitle.h" - diff --git a/lib/unictype/block_test.c b/lib/unictype/block_test.c index 0e328aa37..2751ded71 100644 --- a/lib/unictype/block_test.c +++ b/lib/unictype/block_test.c @@ -28,4 +28,3 @@ uc_is_block (ucs4_t uc, const uc_block_t *block) else return false; } - diff --git a/lib/uninorm/canonical-decomposition.c b/lib/uninorm/canonical-decomposition.c index f2e3e7e43..6efdcb4d7 100644 --- a/lib/uninorm/canonical-decomposition.c +++ b/lib/uninorm/canonical-decomposition.c @@ -105,4 +105,3 @@ uc_canonical_decomposition (ucs4_t uc, ucs4_t *decomposition) } return -1; } - diff --git a/m4/README b/m4/README index 18ed6e728..2fdb556ab 100644 --- a/m4/README +++ b/m4/README @@ -123,4 +123,3 @@ that makes it easy. into # setenv.m4 serial 3 - diff --git a/m4/relocatable-lib.m4 b/m4/relocatable-lib.m4 index 22f82b1ea..8dcc0c93e 100644 --- a/m4/relocatable-lib.m4 +++ b/m4/relocatable-lib.m4 @@ -45,4 +45,3 @@ AC_DEFUN([gl_RELOCATABLE_NOP], AC_SUBST([RELOCATABLE]) AC_MSG_RESULT([$RELOCATABLE]) ]) - diff --git a/tests/test-isnand-nolibm.c b/tests/test-isnand-nolibm.c index d35e9b34c..aa058b039 100644 --- a/tests/test-isnand-nolibm.c +++ b/tests/test-isnand-nolibm.c @@ -19,4 +19,3 @@ #include "isnand-nolibm.h" #include "test-isnand.h" - diff --git a/tests/test-isnand.c b/tests/test-isnand.c index 09b2c6fe8..e28b72f85 100644 --- a/tests/test-isnand.c +++ b/tests/test-isnand.c @@ -19,4 +19,3 @@ #include #include "test-isnand.h" - diff --git a/tests/uninorm/NormalizationTest.txt b/tests/uninorm/NormalizationTest.txt index 03e12e399..215c26f82 100644 --- a/tests/uninorm/NormalizationTest.txt +++ b/tests/uninorm/NormalizationTest.txt @@ -18179,5 +18179,3 @@ D5E4 0334 11B5;D5E4 0334 11B5;1112 1166 0334 11B5;D5E4 0334 11B5;1112 1166 0334 D638 0334 11BC;D638 0334 11BC;1112 1169 0334 11BC;D638 0334 11BC;1112 1169 0334 11BC; D6FC 0334 11AE;D6FC 0334 11AE;1112 1170 0334 11AE;D6FC 0334 11AE;1112 1170 0334 11AE; D750 0334 11B5;D750 0334 11B5;1112 1173 0334 11B5;D750 0334 11B5;1112 1173 0334 11B5; - - -- 2.11.0