[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
enable a few more checks
|
From: |
Jim Meyering |
|
Subject: |
enable a few more checks |
|
Date: |
Fri, 04 Dec 2009 09:52:18 +0100 |
FYI, I've just pushed these:
>From 196b828887ae5a92e695b8a75501aacdd5370122 Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Fri, 4 Dec 2009 09:00:07 +0100
Subject: [PATCH 1/4] maint: enable po-check
* cfg.mk (local-checks-to-skip): Enable sc_po_check.
* po/POTFILES.in: Sort and update.
---
cfg.mk | 1 -
po/POTFILES.in | 14 ++++++--------
2 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/cfg.mk b/cfg.mk
index aa22cb6..04321a3 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -29,7 +29,6 @@ local-checks-to-skip = \
sc_error_message_uppercase \
sc_m4_quote_check \
sc_makefile_TAB_only_indentation \
- sc_po_check \
sc_prohibit_have_config_h \
sc_prohibit_magic_number_exit \
sc_prohibit_strcmp \
diff --git a/po/POTFILES.in b/po/POTFILES.in
index b71c9e7..9bd2743 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -16,17 +16,15 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-src/dfa.c
-src/kwset.c
-src/grep.c
-src/search.c
-src/system.h
-
-# Library files
lib/closeout.c
lib/error.c
lib/getopt.c
lib/obstack.c
lib/quotearg.c
lib/regex.c
-lib/xmalloc.c
+lib/xalloc-die.c
+lib/xstrtol-error.c
+src/dfa.c
+src/grep.c
+src/kwset.c
+src/search.c
--
1.6.6.rc1.280.ge45b
>From ac30aea14477c4b9e73e78987418ef5faf3526dd Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Fri, 4 Dec 2009 09:07:29 +0100
Subject: [PATCH 2/4] maint: enable useless-if-before-free check
* cfg.mk (local-checks-to-skip): Enable sc_avoid_if_before_free.
* .x-sc_avoid_if_before_free: New file. Exempt regex.c and dfa.c,
in case anyone ever tries to merge their contents with other versions.
* src/grep.c (print_line_middle, grepdir): Remove useless if-before-free.
* src/search.c (IF_BK, EXECUTE_FCT): Likewise.
---
.x-sc_avoid_if_before_free | 2 ++
cfg.mk | 1 -
src/grep.c | 6 ++----
src/search.c | 13 +++++--------
4 files changed, 9 insertions(+), 13 deletions(-)
create mode 100644 .x-sc_avoid_if_before_free
diff --git a/.x-sc_avoid_if_before_free b/.x-sc_avoid_if_before_free
new file mode 100644
index 0000000..b9b3074
--- /dev/null
+++ b/.x-sc_avoid_if_before_free
@@ -0,0 +1,2 @@
+^lib/regex\.c$
+^src/dfa\.c$
diff --git a/cfg.mk b/cfg.mk
index 04321a3..7233197 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -22,7 +22,6 @@ gpg_key_ID = B9AB9A16
# Tests not to run as part of "make distcheck".
local-checks-to-skip = \
- sc_avoid_if_before_free \
sc_cast_of_alloca_return_value \
sc_cast_of_argument_to_free \
sc_cast_of_x_alloc_return_value \
diff --git a/src/grep.c b/src/grep.c
index fbeb089..6539d4c 100644
--- a/src/grep.c
+++ b/src/grep.c
@@ -854,8 +854,7 @@ print_line_middle (const char *beg, const char *lim,
cur = b + match_size;
}
- if (buf)
- free(buf); /* XXX */
+ free (buf); /* XXX */
if (only_matching)
cur = lim;
@@ -1388,8 +1387,7 @@ grepdir (char const *dir, struct stats const *stats)
status &= grepfile (file, &child);
}
out_file -= !no_filenames;
- if (file)
- free (file);
+ free (file);
free (name_space);
}
diff --git a/src/search.c b/src/search.c
index b011cc7..f4a9598 100644
--- a/src/search.c
+++ b/src/search.c
@@ -273,8 +273,7 @@ GEAcompile (char const *pattern, size_t size, reg_syntax_t
syntax_bits)
dfacomp (pattern, size, &dfa, 1);
kwsmusts ();
- if (motif)
- free((char *) motif);
+ free((char *) motif);
}
#ifndef EGREP_PROGRAM
@@ -479,9 +478,8 @@ EXECUTE_FCT(EGexecute)
if (MB_CUR_MAX > 1)
{
if (match_icase)
- free((char*)buf);
- if (mb_properties)
- free(mb_properties);
+ free ((char *) buf);
+ free (mb_properties);
}
#endif /* MBS_SUPPORT */
return ret_val;
@@ -595,9 +593,8 @@ EXECUTE_FCT(Fexecute)
if (MB_CUR_MAX > 1)
{
if (match_icase)
- free((char*)buf);
- if (mb_properties)
- free(mb_properties);
+ free ((char *) buf);
+ free (mb_properties);
}
#endif /* MBS_SUPPORT */
return ret_val;
--
1.6.6.rc1.280.ge45b
>From bdce2ecb29071213104fa49ca2179815c63aa864 Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Fri, 4 Dec 2009 09:19:59 +0100
Subject: [PATCH 3/4] maint: make .gitignore ignore more
* .gitignore: Ignore more.
---
.gitignore | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/.gitignore b/.gitignore
index 56ad2b9..20435c2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,7 @@
/INSTALL
/aclocal.m4
/autom4te.cache
+/build-aux/compile
/config.cache
/config.h
/config.hin
@@ -14,8 +15,17 @@
/config.status
/configure
/configure.ac
+/lib/charset.alias
+/lib/configmake.h
+/lib/uniwidth/
/maint.mk
+/po/POTFILES
+/po/stamp-po
/stamp-h1
+/tests/*.log
+/tests/csinput
+/tests/cspatfile
+/tests/yesno.txt
ABOUT-NLS
ChangeLog
Makefile
--
1.6.6.rc1.280.ge45b
>From 4f67550194ca691d9ae2196a030472d80bf73f52 Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Fri, 4 Dec 2009 09:24:32 +0100
Subject: [PATCH 4/4] maint: remove "missing" script
* missing: Remove now-unused file.
---
missing | 375 ---------------------------------------------------------------
1 files changed, 0 insertions(+), 375 deletions(-)
delete mode 100644 missing
diff --git a/missing b/missing
deleted file mode 100644
index f359dae..0000000
--- a/missing
+++ /dev/null
@@ -1,375 +0,0 @@
-#! /bin/sh
-# Common stub for a few missing GNU programs while installing.
-
-scriptversion=2008-12-21.33
-
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
-# 2008 Free Software Foundation, Inc.
-# Originally by Fran,cois Pinard <address@hidden>, 1996.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-if test $# -eq 0; then
- echo 1>&2 "Try \`$0 --help' for more information"
- exit 1
-fi
-
-run=:
-sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
-sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
-
-# In the cases where this matters, `missing' is being run in the
-# srcdir already.
-if test -f configure.ac; then
- configure_ac=configure.ac
-else
- configure_ac=configure.in
-fi
-
-msg="missing on your system"
-
-case $1 in
---run)
- # Try to run requested program, and just exit if it succeeds.
- run=
- shift
- "$@" && exit 0
- # Exit code 63 means version mismatch. This often happens
- # when the user try to use an ancient version of a tool on
- # a file that requires a minimum version. In this case we
- # we should proceed has if the program had been absent, or
- # if --run hadn't been passed.
- if test $? = 63; then
- run=:
- msg="probably too old"
- fi
- ;;
-
- -h|--h|--he|--hel|--help)
- echo "\
-$0 [OPTION]... PROGRAM [ARGUMENT]...
-
-Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
-error status if there is no known handling for PROGRAM.
-
-Options:
- -h, --help display this help and exit
- -v, --version output version information and exit
- --run try to run the given command, and emulate it if it fails
-
-Supported PROGRAM values:
- aclocal touch file \`aclocal.m4'
- autoconf touch file \`configure'
- autoheader touch file \`config.h.in'
- autom4te touch the output file, or create a stub one
- automake touch all \`Makefile.in' files
- bison create \`y.tab.[ch]', if possible, from existing .[ch]
- flex create \`lex.yy.c', if possible, from existing .c
- help2man touch the output file
- lex create \`lex.yy.c', if possible, from existing .c
- makeinfo touch the output file
- tar try tar, gnutar, gtar, then tar without non-portable flags
- yacc create \`y.tab.[ch]', if possible, from existing .[ch]
-
-Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
-\`g' are ignored when checking the name.
-
-Send bug reports to <address@hidden>."
- exit $?
- ;;
-
- -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
- echo "missing $scriptversion (GNU Automake)"
- exit $?
- ;;
-
- -*)
- echo 1>&2 "$0: Unknown \`$1' option"
- echo 1>&2 "Try \`$0 --help' for more information"
- exit 1
- ;;
-
-esac
-
-# normalize program name to check for.
-program=`echo "$1" | sed '
- s/^gnu-//; t
- s/^gnu//; t
- s/^g//; t'`
-
-# Now exit if we have it, but it failed. Also exit now if we
-# don't have it and --version was passed (most likely to detect
-# the program). This is about non-GNU programs, so use $1 not
-# $program.
-case $1 in
- lex*|yacc*)
- # Not GNU programs, they don't have --version.
- ;;
-
- tar*)
- if test -n "$run"; then
- echo 1>&2 "ERROR: \`tar' requires --run"
- exit 1
- elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
- exit 1
- fi
- ;;
-
- *)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
- # Could not run --version or --help. This is probably someone
- # running `$TOOL --version' or `$TOOL --help' to check whether
- # $TOOL exists and not knowing $TOOL uses missing.
- exit 1
- fi
- ;;
-esac
-
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case $program in
- aclocal*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified \`acinclude.m4' or \`${configure_ac}'. You might want
- to install the \`Automake' and \`Perl' packages. Grab them from
- any GNU archive site."
- touch aclocal.m4
- ;;
-
- autoconf*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified \`${configure_ac}'. You might want to install the
- \`Autoconf' and \`GNU m4' packages. Grab them from any GNU
- archive site."
- touch configure
- ;;
-
- autoheader*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified \`acconfig.h' or \`${configure_ac}'. You might want
- to install the \`Autoconf' and \`GNU m4' packages. Grab them
- from any GNU archive site."
- files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p'
${configure_ac}`
- test -z "$files" && files="config.h"
- touch_files=
- for f in $files; do
- case $f in
- *:*) touch_files="$touch_files "`echo "$f" |
- sed -e 's/^[^:]*://' -e 's/:.*//'`;;
- *) touch_files="$touch_files $f.in";;
- esac
- done
- touch $touch_files
- ;;
-
- automake*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
- You might want to install the \`Automake' and \`Perl' packages.
- Grab them from any GNU archive site."
- find . -type f -name Makefile.am -print |
- sed 's/\.am$/.in/' |
- while read f; do touch "$f"; done
- ;;
-
- autom4te*)
- echo 1>&2 "\
-WARNING: \`$1' is needed, but is $msg.
- You might have modified some files without having the
- proper tools for further handling them.
- You can get \`$1' as part of \`Autoconf' from any GNU
- archive site."
-
- file=`echo "$*" | sed -n "$sed_output"`
- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
- if test -f "$file"; then
- touch $file
- else
- test -z "$file" || exec >$file
- echo "#! /bin/sh"
- echo "# Created by GNU Automake missing as a replacement of"
- echo "# $ $@"
- echo "exit 0"
- chmod +x $file
- exit 1
- fi
- ;;
-
- bison*|yacc*)
- echo 1>&2 "\
-WARNING: \`$1' $msg. You should only need it if
- you modified a \`.y' file. You may need the \`Bison' package
- in order for those modifications to take effect. You can get
- \`Bison' from any GNU archive site."
- rm -f y.tab.c y.tab.h
- if test $# -ne 1; then
- eval LASTARG="\${$#}"
- case $LASTARG in
- *.y)
- SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if test -f "$SRCFILE"; then
- cp "$SRCFILE" y.tab.c
- fi
- SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if test -f "$SRCFILE"; then
- cp "$SRCFILE" y.tab.h
- fi
- ;;
- esac
- fi
- if test ! -f y.tab.h; then
- echo >y.tab.h
- fi
- if test ! -f y.tab.c; then
- echo 'main() { return 0; }' >y.tab.c
- fi
- ;;
-
- lex*|flex*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified a \`.l' file. You may need the \`Flex' package
- in order for those modifications to take effect. You can get
- \`Flex' from any GNU archive site."
- rm -f lex.yy.c
- if test $# -ne 1; then
- eval LASTARG="\${$#}"
- case $LASTARG in
- *.l)
- SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if test -f "$SRCFILE"; then
- cp "$SRCFILE" lex.yy.c
- fi
- ;;
- esac
- fi
- if test ! -f lex.yy.c; then
- echo 'main() { return 0; }' >lex.yy.c
- fi
- ;;
-
- help2man*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified a dependency of a manual page. You may need the
- \`Help2man' package in order for those modifications to take
- effect. You can get \`Help2man' from any GNU archive site."
-
- file=`echo "$*" | sed -n "$sed_output"`
- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
- if test -f "$file"; then
- touch $file
- else
- test -z "$file" || exec >$file
- echo ".ab help2man is required to generate this page"
- exit $?
- fi
- ;;
-
- makeinfo*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified a \`.texi' or \`.texinfo' file, or any other file
- indirectly affecting the aspect of the manual. The spurious
- call might also be the consequence of using a buggy \`make' (AIX,
- DU, IRIX). You might want to install the \`Texinfo' package or
- the \`GNU make' package. Grab either from any GNU archive site."
- # The file to touch is that specified with -o ...
- file=`echo "$*" | sed -n "$sed_output"`
- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
- if test -z "$file"; then
- # ... or it is the one specified with @setfilename ...
- infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '
- /address@hidden/{
- s/.* \([^ ]*\) *$/\1/
- p
- q
- }' $infile`
- # ... or it is derived from the source name (dir/f.texi becomes f.info)
- test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
- fi
- # If the file does not exist, the user really needs makeinfo;
- # let's fail without touching anything.
- test -f $file || exit 1
- touch $file
- ;;
-
- tar*)
- shift
-
- # We have already tried tar in the generic part.
- # Look for gnutar/gtar before invocation to avoid ugly error
- # messages.
- if (gnutar --version > /dev/null 2>&1); then
- gnutar "$@" && exit 0
- fi
- if (gtar --version > /dev/null 2>&1); then
- gtar "$@" && exit 0
- fi
- firstarg="$1"
- if shift; then
- case $firstarg in
- *o*)
- firstarg=`echo "$firstarg" | sed s/o//`
- tar "$firstarg" "$@" && exit 0
- ;;
- esac
- case $firstarg in
- *h*)
- firstarg=`echo "$firstarg" | sed s/h//`
- tar "$firstarg" "$@" && exit 0
- ;;
- esac
- fi
-
- echo 1>&2 "\
-WARNING: I can't seem to be able to run \`tar' with the given arguments.
- You may want to install GNU tar or Free paxutils, or check the
- command line arguments."
- exit 1
- ;;
-
- *)
- echo 1>&2 "\
-WARNING: \`$1' is needed, and is $msg.
- You might have modified some files without having the
- proper tools for further handling them. Check the \`README' file,
- it often tells you about the needed prerequisites for installing
- this package. You may also peek at any GNU archive site, in case
- some other package would contain this missing \`$1' program."
- exit 1
- ;;
-esac
-
-exit 0
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:
--
1.6.6.rc1.280.ge45b
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- enable a few more checks,
Jim Meyering <=