[libvirt] [PATCH] build: Fix prohibit_int_ijk (and iijjkk) on RHEL 5

Martin Kletzander mkletzan at redhat.com
Tue Oct 22 16:19:45 UTC 2013


On RHEL 5, make syntax-check was failing because even strings like
'int isTempChain' matched the 'int i' rule.  To be honest, I haven't
found the root cause, but the change added makes it work as expected
and keeps the proper behavior on newer systems as well.

Signed-off-by: Martin Kletzander <mkletzan at redhat.com>
---

Notes:
    I'm not pushing this one as a build breaker since I haven't found the
    root cause, so feel free to object and fix it differently.

 cfg.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cfg.mk b/cfg.mk
index 56821e2..e9da282 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -555,12 +555,12 @@ sc_avoid_attribute_unused_in_header:
 	  $(_sc_search_regexp)

 sc_prohibit_int_ijk:
-	@prohibit='\<(int|unsigned) ([^(]* )*(i|j|k)(\s|,|;)'		\
+	@prohibit='\<(int|unsigned) ([^(]* )*(i|j|k)\>(\s|,|;)'		\
 	halt='use size_t, not int/unsigned int for loop vars i, j, k'	\
 	  $(_sc_search_regexp)

 sc_prohibit_loop_iijjkk:
-	@prohibit='\<(int|unsigned) ([^=]+ )*(ii|jj|kk)(\s|,|;)'	\
+	@prohibit='\<(int|unsigned) ([^=]+ )*(ii|jj|kk)\>(\s|,|;)'	\
 	halt='use i, j, k for loop iterators, not ii, jj, kk' 		\
 	  $(_sc_search_regexp)

-- 
1.8.4




More information about the libvir-list mailing list