From d44cfc189dc3ae86d6eee28a53f243c8cd7d156c Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Sun, 29 Nov 2009 17:18:48 +0100 Subject: maint: enable two checks * cfg.mk (local-checks-to-skip): Enable two: sc_prohibit_xalloc_without_use sc_two_space_separator_in_usage * src/grep.c (usage): Conform: use two spaces, not 1. * src/kwset.c (malloc): Define as a function-macro so that the syntax-check rule sees that we are indeed using xmalloc here. --- cfg.mk | 2 -- src/grep.c | 4 ++-- src/kwset.c | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/cfg.mk b/cfg.mk index ef116cc9..aa22cb61 100644 --- a/cfg.mk +++ b/cfg.mk @@ -33,9 +33,7 @@ local-checks-to-skip = \ sc_prohibit_have_config_h \ sc_prohibit_magic_number_exit \ sc_prohibit_strcmp \ - sc_prohibit_xalloc_without_use \ sc_space_tab \ - sc_two_space_separator_in_usage \ sc_useless_cpp_parens # Tools used to bootstrap this package, used for "announcement". diff --git a/src/grep.c b/src/grep.c index c6590652..fbeb0899 100644 --- a/src/grep.c +++ b/src/grep.c @@ -1472,8 +1472,8 @@ Output control:\n\ --include=FILE_PATTERN search only files that match FILE_PATTERN\n\ --exclude=FILE_PATTERN skip files and directories matching FILE_PATTERN\n\ --exclude-from=FILE skip files matching any file pattern from FILE\n\ - --exclude-dir=PATTERN directories that match PATTERN will be skipped.\n\ - -L, --files-without-match print only names of FILEs containing no match\n\ + --exclude-dir=PATTERN directories that match PATTERN will be skipped.\n\ + -L, --files-without-match print only names of FILEs containing no match\n\ -l, --files-with-matches print only names of FILEs containing matches\n\ -c, --count print only a count of matching lines per FILE\n\ -T, --initial-tab make tabs line up (if needed)\n\ diff --git a/src/kwset.c b/src/kwset.c index 0957f660..2d90ca59 100644 --- a/src/kwset.c +++ b/src/kwset.c @@ -40,7 +40,7 @@ #ifdef GREP # include "xalloc.h" # undef malloc -# define malloc xmalloc +# define malloc(s) xmalloc(s) #endif #define NCHAR (UCHAR_MAX + 1) -- cgit v1.2.1