summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Meyering <meyering@fb.com>2014-09-14 18:52:37 -0700
committerJim Meyering <meyering@fb.com>2014-11-30 18:59:34 -0800
commit72834d8d89a352f21a4ab4937a7439eadc55785b (patch)
treeb0b0bbf389978761da6cde138dbf6b84a30c20a2
parent9cb9a4365304859dc1846f2e0433cc7391ef3387 (diff)
downloadsed-72834d8d89a352f21a4ab4937a7439eadc55785b.tar.gz
maint: enable more checks
* cfg.mk (local-checks-to-skip): Remove exemptions for immutable NEWS as well as the two config.h checks. Also accept "sed.h", since the first thing it does is to include <config.h>. * sed/sed.h: Change "config.h" to <config.h>, for consistency with other GNU tools. * sed/utils.c: Likewise, here and for each of the following. * testsuite/bug-regex10.c: * testsuite/bug-regex11.c: * testsuite/bug-regex12.c: * testsuite/bug-regex13.c: * testsuite/bug-regex14.c: * testsuite/bug-regex15.c: * testsuite/bug-regex16.c: * testsuite/bug-regex21.c: * testsuite/bug-regex7.c: * testsuite/bug-regex8.c: * testsuite/bug-regex9.c: * testsuite/runptests.c: * testsuite/runtests.c: * testsuite/tst-boost.c: * testsuite/tst-pcre.c: * testsuite/tst-regex.c: * testsuite/tst-regex2.c: * testsuite/tst-rxspencer.c:
-rw-r--r--cfg.mk7
-rw-r--r--sed/sed.h2
-rw-r--r--sed/utils.c2
-rw-r--r--testsuite/bug-regex10.c2
-rw-r--r--testsuite/bug-regex11.c2
-rw-r--r--testsuite/bug-regex12.c2
-rw-r--r--testsuite/bug-regex13.c2
-rw-r--r--testsuite/bug-regex14.c2
-rw-r--r--testsuite/bug-regex15.c2
-rw-r--r--testsuite/bug-regex16.c2
-rw-r--r--testsuite/bug-regex21.c2
-rw-r--r--testsuite/bug-regex7.c2
-rw-r--r--testsuite/bug-regex8.c2
-rw-r--r--testsuite/bug-regex9.c2
-rw-r--r--testsuite/runptests.c2
-rw-r--r--testsuite/runtests.c2
-rw-r--r--testsuite/tst-boost.c2
-rw-r--r--testsuite/tst-pcre.c2
-rw-r--r--testsuite/tst-regex.c2
-rw-r--r--testsuite/tst-regex2.c2
-rw-r--r--testsuite/tst-rxspencer.c2
21 files changed, 23 insertions, 24 deletions
diff --git a/cfg.mk b/cfg.mk
index c0bac56..6f5e520 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -29,7 +29,6 @@ local-checks-to-skip = \
sc_cast_of_argument_to_free \
sc_error_message_uppercase \
sc_file_system \
- sc_immutable_NEWS \
sc_long_lines \
sc_m4_quote_check \
sc_makefile_at_at_check \
@@ -41,8 +40,6 @@ local-checks-to-skip = \
sc_prohibit_magic_number_exit \
sc_prohibit_strcmp \
sc_prohibit_strncpy \
- sc_require_config_h \
- sc_require_config_h_first \
sc_space_tab \
sc_prohibit_tab_based_indentation \
sc_texinfo_acronym \
@@ -74,7 +71,7 @@ export VERBOSE = yes
# 836832 6e
export XZ_OPT = -6e
-old_NEWS_hash = d41d8cd98f00b204e9800998ecf8427e
+old_NEWS_hash = b6210de3e57d22c04f064eb481282e11
# Many m4 macros names once began with 'jm_'.
# Make sure that none are inadvertently reintroduced.
@@ -137,6 +134,8 @@ update-copyright-env = \
UPDATE_COPYRIGHT_USE_INTERVALS=1 \
UPDATE_COPYRIGHT_MAX_LINE_LENGTH=79
+config_h_header ?= (<config\.h>|"sed\.h")
+
exclude_file_name_regexp--sc_long_lines = ^tests/.*$$
exclude_file_name_regexp--sc_prohibit_doubled_word = \
^testsuite/(mac-mf|uniq)\.(good|inp)$$
diff --git a/sed/sed.h b/sed/sed.h
index ee9143f..9d6e2fe 100644
--- a/sed/sed.h
+++ b/sed/sed.h
@@ -16,7 +16,7 @@
along with this program; if not, write to the Free Software
Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
-#include "config.h"
+#include <config.h>
#include "basicdefs.h"
#include "regex.h"
#include <stdio.h>
diff --git a/sed/utils.c b/sed/utils.c
index 003ad57..dbf3e14 100644
--- a/sed/utils.c
+++ b/sed/utils.c
@@ -16,7 +16,7 @@
along with this program; if not, write to the Free Software
Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
-#include "config.h"
+#include <config.h>
#include <stdio.h>
#include <stdarg.h>
diff --git a/testsuite/bug-regex10.c b/testsuite/bug-regex10.c
index aedc0ee..b4a84f7 100644
--- a/testsuite/bug-regex10.c
+++ b/testsuite/bug-regex10.c
@@ -18,7 +18,7 @@
Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301 USA. */
-#include "config.h"
+#include <config.h>
#include <locale.h>
#include <stdio.h>
diff --git a/testsuite/bug-regex11.c b/testsuite/bug-regex11.c
index b7ea6f7..b738576 100644
--- a/testsuite/bug-regex11.c
+++ b/testsuite/bug-regex11.c
@@ -18,7 +18,7 @@
Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301 USA. */
-#include "config.h"
+#include <config.h>
#include <sys/types.h>
#ifdef HAVE_MCHECK_H
diff --git a/testsuite/bug-regex12.c b/testsuite/bug-regex12.c
index 9319d29..10fe170 100644
--- a/testsuite/bug-regex12.c
+++ b/testsuite/bug-regex12.c
@@ -18,7 +18,7 @@
Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301 USA. */
-#include "config.h"
+#include <config.h>
#include <sys/types.h>
#ifdef HAVE_MCHECK_H
diff --git a/testsuite/bug-regex13.c b/testsuite/bug-regex13.c
index b87ee81..71477bd 100644
--- a/testsuite/bug-regex13.c
+++ b/testsuite/bug-regex13.c
@@ -18,7 +18,7 @@
Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301 USA. */
-#include "config.h"
+#include <config.h>
#include <sys/types.h>
#ifdef HAVE_MCHECK_H
diff --git a/testsuite/bug-regex14.c b/testsuite/bug-regex14.c
index c105bb3..e72290a 100644
--- a/testsuite/bug-regex14.c
+++ b/testsuite/bug-regex14.c
@@ -18,7 +18,7 @@
Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301 USA. */
-#include "config.h"
+#include <config.h>
#define _REGEX_RE_COMP
#include <sys/types.h>
diff --git a/testsuite/bug-regex15.c b/testsuite/bug-regex15.c
index 97fc69d..4d348a4 100644
--- a/testsuite/bug-regex15.c
+++ b/testsuite/bug-regex15.c
@@ -1,6 +1,6 @@
/* Test for memory/CPU leak in regcomp. */
-#include "config.h"
+#include <config.h>
#include <sys/types.h>
#include <sys/time.h>
diff --git a/testsuite/bug-regex16.c b/testsuite/bug-regex16.c
index c514a2e..c767f42 100644
--- a/testsuite/bug-regex16.c
+++ b/testsuite/bug-regex16.c
@@ -1,6 +1,6 @@
/* Test re_compile_pattern error messages. */
-#include "config.h"
+#include <config.h>
#include <stdio.h>
#include <string.h>
diff --git a/testsuite/bug-regex21.c b/testsuite/bug-regex21.c
index 7c4f57c..c1aeb90 100644
--- a/testsuite/bug-regex21.c
+++ b/testsuite/bug-regex21.c
@@ -18,7 +18,7 @@
Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301 USA. */
-#include "config.h"
+#include <config.h>
#ifdef HAVE_MCHECK_H
#include <mcheck.h>
diff --git a/testsuite/bug-regex7.c b/testsuite/bug-regex7.c
index 92e44f9..019ce45 100644
--- a/testsuite/bug-regex7.c
+++ b/testsuite/bug-regex7.c
@@ -18,7 +18,7 @@
Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301 USA. */
-#include "config.h"
+#include <config.h>
#include <locale.h>
#include <stdio.h>
diff --git a/testsuite/bug-regex8.c b/testsuite/bug-regex8.c
index 7e807d4..30c25bd 100644
--- a/testsuite/bug-regex8.c
+++ b/testsuite/bug-regex8.c
@@ -18,7 +18,7 @@
Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301 USA. */
-#include "config.h"
+#include <config.h>
#include <locale.h>
#include <stdio.h>
diff --git a/testsuite/bug-regex9.c b/testsuite/bug-regex9.c
index fb5d7fe..1a0916e 100644
--- a/testsuite/bug-regex9.c
+++ b/testsuite/bug-regex9.c
@@ -18,7 +18,7 @@
Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301 USA. */
-#include "config.h"
+#include <config.h>
#include <sys/types.h>
#ifdef HAVE_MCHECK_H
diff --git a/testsuite/runptests.c b/testsuite/runptests.c
index 372a174..7d259af 100644
--- a/testsuite/runptests.c
+++ b/testsuite/runptests.c
@@ -18,7 +18,7 @@
Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301 USA. */
-#include "config.h"
+#include <config.h>
#include <sys/types.h>
#include <regex.h>
diff --git a/testsuite/runtests.c b/testsuite/runtests.c
index 325f240..3db7a77 100644
--- a/testsuite/runtests.c
+++ b/testsuite/runtests.c
@@ -22,7 +22,7 @@ PERFORMANCE OF THIS SOFTWARE.
******************************************************************/
-#include "config.h"
+#include <config.h>
#include <sys/types.h>
#include <regex.h>
diff --git a/testsuite/tst-boost.c b/testsuite/tst-boost.c
index 93e1821..6990a81 100644
--- a/testsuite/tst-boost.c
+++ b/testsuite/tst-boost.c
@@ -18,7 +18,7 @@
Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301 USA. */
-#include "config.h"
+#include <config.h>
#include <sys/types.h>
#ifdef HAVE_MCHECK_H
diff --git a/testsuite/tst-pcre.c b/testsuite/tst-pcre.c
index 33cf548..86093ca 100644
--- a/testsuite/tst-pcre.c
+++ b/testsuite/tst-pcre.c
@@ -18,7 +18,7 @@
Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301 USA. */
-#include "config.h"
+#include <config.h>
#include <sys/types.h>
#ifdef HAVE_MCHECK_H
diff --git a/testsuite/tst-regex.c b/testsuite/tst-regex.c
index 0d10cd2..45c0f5a 100644
--- a/testsuite/tst-regex.c
+++ b/testsuite/tst-regex.c
@@ -16,7 +16,7 @@
Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301 USA. */
-#include "config.h"
+#include <config.h>
#include <alloca.h>
#include <assert.h>
diff --git a/testsuite/tst-regex2.c b/testsuite/tst-regex2.c
index 9eac569..dd65bb3 100644
--- a/testsuite/tst-regex2.c
+++ b/testsuite/tst-regex2.c
@@ -1,4 +1,4 @@
-#include "config.h"
+#include <config.h>
#include <errno.h>
#include <fcntl.h>
diff --git a/testsuite/tst-rxspencer.c b/testsuite/tst-rxspencer.c
index e541b79..c19379d 100644
--- a/testsuite/tst-rxspencer.c
+++ b/testsuite/tst-rxspencer.c
@@ -18,7 +18,7 @@
Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301 USA. */
-#include "config.h"
+#include <config.h>
#include <sys/types.h>
#ifdef HAVE_MCHECK_H