From: Jose E. Marchesi <jemarch@gnu.org> Date: Sun, 28 Mar 2010 11:28:34 +0000 (+0200) Subject: maint.mk: s/_header_without_use/_sc_header_without_use/ X-Git-Tag: v0.1~4390 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=8f1ee32b67ce67cff160668f9690ab0d0a2a89b1;p=gnulib.git maint.mk: s/_header_without_use/_sc_header_without_use/ * top/maint.mk (_sc_header_without_use): Rename from _header_without_use. (sc_prohibit_assert_without_use): Use the new name. (sc_prohibit_close_stream_without_use): Likewise. (sc_prohibit_getopt_without_use): Likewise. (sc_prohibit_quotearg_without_use): Likewise. (sc_prohibit_quote_without_use): Likewise. (sc_prohibit_long_options_without_use): Likewise. (sc_prohibit_inttostr_without_use): Likewise. (sc_prohibit_ignore_value_without_use): Likewise. (sc_prohibit_error_without_use): Likewise. (sc_prohibit_xalloc_without_use): Likewise. (sc_prohibit_hash_without_use): Likewise. (sc_prohibit_hash_pjw_without_use): Likewise. (sc_prohibit_safe_read_without_use): Likewise. (sc_prohibit_argmatch_without_use): Likewise. (sc_prohibit_canonicalize_without_use): Likewise. (sc_prohibit_root_dev_ino_without_use): Likewise. (sc_prohibit_openat_without_use): Likewise. (sc_prohibit_c_ctype_without_use): Likewise. (sc_prohibit_signal_without_use): Likewise. (sc_prohibit_intprops_without_use): Likewise. --- diff --git a/ChangeLog b/ChangeLog index a30f717241..87b2083711 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,28 @@ +2010-03-28 Jose E. Marchesi <jemarch@gnu.org> + + maint.mk: s/_header_without_use/_sc_header_without_use/ + * top/maint.mk (_sc_header_without_use): Rename from _header_without_use. + (sc_prohibit_assert_without_use): Use the new name. + (sc_prohibit_close_stream_without_use): Likewise. + (sc_prohibit_getopt_without_use): Likewise. + (sc_prohibit_quotearg_without_use): Likewise. + (sc_prohibit_quote_without_use): Likewise. + (sc_prohibit_long_options_without_use): Likewise. + (sc_prohibit_inttostr_without_use): Likewise. + (sc_prohibit_ignore_value_without_use): Likewise. + (sc_prohibit_error_without_use): Likewise. + (sc_prohibit_xalloc_without_use): Likewise. + (sc_prohibit_hash_without_use): Likewise. + (sc_prohibit_hash_pjw_without_use): Likewise. + (sc_prohibit_safe_read_without_use): Likewise. + (sc_prohibit_argmatch_without_use): Likewise. + (sc_prohibit_canonicalize_without_use): Likewise. + (sc_prohibit_root_dev_ino_without_use): Likewise. + (sc_prohibit_openat_without_use): Likewise. + (sc_prohibit_c_ctype_without_use): Likewise. + (sc_prohibit_signal_without_use): Likewise. + (sc_prohibit_intprops_without_use): Likewise. + 2010-03-30 Eric Blake <eblake@redhat.com> maint: improve module indicators diff --git a/top/maint.mk b/top/maint.mk index d63318858f..bcf4ad13dc 100644 --- a/top/maint.mk +++ b/top/maint.mk @@ -292,7 +292,7 @@ sc_prohibit_HAVE_MBRTOWC: # To use this "command" macro, you must first define two shell variables: # h: the header, enclosed in <> or "" # re: a regular expression that matches IFF something provided by $h is used. -define _header_without_use +define _sc_header_without_use dummy=; : so we do not need a semicolon before each use; \ h_esc=`echo "$$h"|sed 's/\./\\\\./g'`; \ if $(VC_LIST_EXCEPT) | grep -l '\.c$$' > /dev/null; then \ @@ -307,44 +307,44 @@ endef # Prohibit the inclusion of assert.h without an actual use of assert. sc_prohibit_assert_without_use: - @h='<assert.h>' re='\<assert *\(' $(_header_without_use) + @h='<assert.h>' re='\<assert *\(' $(_sc_header_without_use) # Prohibit the inclusion of close-stream.h without an actual use. sc_prohibit_close_stream_without_use: - @h='"close-stream.h"' re='\<close_stream *\(' $(_header_without_use) + @h='"close-stream.h"' re='\<close_stream *\(' $(_sc_header_without_use) # Prohibit the inclusion of getopt.h without an actual use. sc_prohibit_getopt_without_use: - @h='<getopt.h>' re='\<getopt(_long)? *\(' $(_header_without_use) + @h='<getopt.h>' re='\<getopt(_long)? *\(' $(_sc_header_without_use) # Don't include quotearg.h unless you use one of its functions. sc_prohibit_quotearg_without_use: - @h='"quotearg.h"' re='\<quotearg(_[^ ]+)? *\(' $(_header_without_use) + @h='"quotearg.h"' re='\<quotearg(_[^ ]+)? *\(' $(_sc_header_without_use) # Don't include quote.h unless you use one of its functions. sc_prohibit_quote_without_use: - @h='"quote.h"' re='\<quote(_n)? *\(' $(_header_without_use) + @h='"quote.h"' re='\<quote(_n)? *\(' $(_sc_header_without_use) # Don't include this header unless you use one of its functions. sc_prohibit_long_options_without_use: @h='"long-options.h"' re='\<parse_long_options *\(' \ - $(_header_without_use) + $(_sc_header_without_use) # Don't include this header unless you use one of its functions. sc_prohibit_inttostr_without_use: @h='"inttostr.h"' re='\<(off|[iu]max|uint)tostr *\(' \ - $(_header_without_use) + $(_sc_header_without_use) # Don't include this header unless you use one of its functions. sc_prohibit_ignore_value_without_use: @h='"ignore-value.h"' re='\<ignore_(value|ptr) *\(' \ - $(_header_without_use) + $(_sc_header_without_use) # Don't include this header unless you use one of its functions. sc_prohibit_error_without_use: @h='"error.h"' \ re='\<error(_at_line|_print_progname|_one_per_line|_message_count)? *\('\ - $(_header_without_use) + $(_sc_header_without_use) # Don't include xalloc.h unless you use one of its functions. # Consider these symbols: @@ -367,7 +367,7 @@ _xa2 = X([CZ]|N?M)ALLOC sc_prohibit_xalloc_without_use: @h='"xalloc.h"' \ re='\<($(_xa1)|$(_xa2)) *\('\ - $(_header_without_use) + $(_sc_header_without_use) # Extract function names: # perl -lne '/^(?:extern )?(?:void|char) \*?(\w+) \(/ and print $1' lib/hash.h @@ -378,42 +378,42 @@ _hash_struct = (struct )?\<[Hh]ash_(table|tuning)\> sc_prohibit_hash_without_use: @h='"hash.h"' \ re='$(_hash_fn)|$(_hash_struct)'\ - $(_header_without_use) + $(_sc_header_without_use) sc_prohibit_hash_pjw_without_use: @h='"hash-pjw.h"' \ re='\<hash_pjw *\(' \ - $(_header_without_use) + $(_sc_header_without_use) sc_prohibit_safe_read_without_use: @h='"safe-read.h"' re='(\<SAFE_READ_ERROR\>|\<safe_read *\()' \ - $(_header_without_use) + $(_sc_header_without_use) sc_prohibit_argmatch_without_use: @h='"argmatch.h"' \ re='(\<(ARRAY_CARDINALITY|X?ARGMATCH(|_TO_ARGUMENT|_VERIFY))\>|\<argmatch(_exit_fn|_(in)?valid) *\()' \ - $(_header_without_use) + $(_sc_header_without_use) sc_prohibit_canonicalize_without_use: @h='"canonicalize.h"' \ re='CAN_(EXISTING|ALL_BUT_LAST|MISSING)|canonicalize_(mode_t|filename_mode)' \ - $(_header_without_use) + $(_sc_header_without_use) sc_prohibit_root_dev_ino_without_use: @h='"root-dev-ino.h"' \ re='(\<ROOT_DEV_INO_(CHECK|WARN)\>|\<get_root_dev_ino *\()' \ - $(_header_without_use) + $(_sc_header_without_use) sc_prohibit_openat_without_use: @h='"openat.h"' \ re='\<(openat_(permissive|needs_fchdir|(save|restore)_fail)|l?(stat|ch(own|mod))at|(euid)?accessat)\>' \ - $(_header_without_use) + $(_sc_header_without_use) # Prohibit the inclusion of c-ctype.h without an actual use. ctype_re = isalnum|isalpha|isascii|isblank|iscntrl|isdigit|isgraph|islower\ |isprint|ispunct|isspace|isupper|isxdigit|tolower|toupper sc_prohibit_c_ctype_without_use: - @h='[<"]c-ctype.h[">]' re='\<c_($(ctype_re)) *\(' $(_header_without_use) + @h='[<"]c-ctype.h[">]' re='\<c_($(ctype_re)) *\(' $(_sc_header_without_use) _empty = _sp = $(_empty) $(_empty) @@ -450,7 +450,7 @@ _sig_syms_re = $(subst $(_sp),|,$(strip $(_sig_names) $(_sig_types_and_consts))) sc_prohibit_signal_without_use: @h='<signal.h>' \ re='\<($(_sig_function_re)) *\(|\<($(_sig_syms_re))\>' \ - $(_header_without_use) + $(_sc_header_without_use) # Get the list of symbol names with this: # perl -lne '/^# *define (\w+)\(/ and print $1' lib/intprops.h|grep -v '^s'|fmt @@ -463,7 +463,7 @@ _intprops_syms_re = $(subst $(_sp),|,$(strip $(_intprops_names))) sc_prohibit_intprops_without_use: @h='"intprops.h"' \ re='\<($(_intprops_syms_re)) *\(' \ - $(_header_without_use) + $(_sc_header_without_use) sc_obsolete_symbols: @re='\<(HAVE''_FCNTL_H|O''_NDELAY)\>' \