From: Eric Blake <eblake@redhat.com>
Date: Wed, 3 Sep 2014 17:17:01 +0000 (-0600)
Subject: maint: enforce previous if-else {} cleanups
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=143cfa8ee882a81207d90cb56cd9fb8065ac1c78;p=libvirt.git

maint: enforce previous if-else {} cleanups

Done as a separate commit in case earlier cleanups are backported
independently.

* cfg.mk (sc_require_space_before_label): New rule.

Signed-off-by: Eric Blake <eblake@redhat.com>
---

diff --git a/cfg.mk b/cfg.mk
index 307009e54b..122cf58c00 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -910,6 +910,13 @@ sc_require_space_before_label:
 	halt="Top-level labels should be indented by one space"        \
 	  $(_sc_search_regexp)
 
+# Doesn't catch all cases of mismatched braces across if-else, but it helps
+sc_require_if_else_matching_braces:
+	@prohibit='(  else( if .*\))? {|} else( if .*\))?$$)'		\
+	in_vc_files='\.[chx]$$'						\
+	halt="if one side of if-else uses {}, both sides must use it"	\
+	  $(_sc_search_regexp)
+
 sc_curly_braces_style:
 	@files=$$($(VC_LIST_EXCEPT) | grep '\.[ch]$$');                \
 	$(GREP) -nHP                                                   \