]> xenbits.xensource.com Git - people/liuw/libxenctrl-split/libvirt.git/commitdiff
maint: avoid doubled name in syntax check failures
authorEric Blake <eblake@redhat.com>
Tue, 4 Sep 2012 23:40:04 +0000 (17:40 -0600)
committerEric Blake <eblake@redhat.com>
Wed, 5 Sep 2012 17:16:20 +0000 (11:16 -0600)
Based on the similar gnulib commit 96ad9077.  The use of
$(_sc_search_regexp) already injects $(ME) into any output
messages, so a failure of these rules would look like this,
pre-patch:

maint.mk: maint.mk: use virStrToLong_*, not strtol variants

* cfg.mk (sc_prohibit_strncmp, sc_prohibit_strtol)
(sc_libvirt_unmarked_diagnostics): Drop redundant $(ME).

cfg.mk

diff --git a/cfg.mk b/cfg.mk
index 245e0f2583ff1da3d7886dfd158861c019b1929b..333563fd9ae7b25f289c0992e6cac10b7e44546e 100644 (file)
--- a/cfg.mk
+++ b/cfg.mk
@@ -353,18 +353,18 @@ snp_ = strncmp *\(.+\)
 sc_prohibit_strncmp:
        @prohibit='! *strncmp *\(|\<$(snp_) *[!=]=|[!=]= *$(snp_)'      \
        exclude=':# *define STR(N?EQLEN|PREFIX)\('                      \
-       halt='$(ME): use STREQLEN or STRPREFIX instead of str''ncmp'    \
+       halt='use STREQLEN or STRPREFIX instead of str''ncmp'           \
          $(_sc_search_regexp)
 
 # strtol and friends are too easy to misuse
 sc_prohibit_strtol:
        @prohibit='\bstrto(u?ll?|[ui]max) *\('                          \
        exclude='exempt from syntax-check'                              \
-       halt='$(ME): use virStrToLong_*, not strtol variants'           \
+       halt='use virStrToLong_*, not strtol variants'                  \
          $(_sc_search_regexp)
        @prohibit='\bstrto[df] *\('                                     \
        exclude='exempt from syntax-check'                              \
-       halt='$(ME): use virStrToDouble, not strtod variants'           \
+       halt='use virStrToDouble, not strtod variants'                  \
          $(_sc_search_regexp)
 
 # Use virAsprintf rather than as'printf since *strp is undefined on error.
@@ -550,7 +550,7 @@ func_re := ($(func_or))
 sc_libvirt_unmarked_diagnostics:
        @prohibit='\<$(func_re) *\([^"]*"[^"]*[a-z]{3}'                 \
        exclude='_\('                                                   \
-       halt='$(ME): found unmarked diagnostic(s)'                      \
+       halt='found unmarked diagnostic(s)'                             \
          $(_sc_search_regexp)
        @{ grep     -nE '\<$(func_re) *\(.*;$$' $$($(VC_LIST_EXCEPT));   \
           grep -A1 -nE '\<$(func_re) *\(.*,$$' $$($(VC_LIST_EXCEPT)); } \