From: Michal Privoznik <mprivozn@redhat.com>
Date: Fri, 2 Nov 2012 10:07:54 +0000 (+0100)
Subject: logging.c: Properly indent and ignore one syntax-check rule
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=30b398d5ef8ee0d668cf0c17aa232a78f8046d5b;p=libvirt.git

logging.c: Properly indent and ignore one syntax-check rule

With our fix of mkostemp (pushed as 2b435c15) we define a macro
to compile with uclibc. However, this definition is conditional
and thus needs to be properly indented. Moreover, with this definition
sc_prohibit_mkstemp syntax-check rule keeps yelling:

  src/util/logging.c:63:# define mkostemp(x,y) mkstemp(x)
  maint.mk: use mkostemp with O_CLOEXEC instead of mkstemp

Therefore we should ignore this file for this rule.
---

diff --git a/cfg.mk b/cfg.mk
index cda04e418a..963f642f18 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -817,3 +817,5 @@ exclude_file_name_regexp--sc_unmarked_diagnostics = \
   ^(docs/apibuild.py|tests/virt-aa-helper-test)$$
 
 exclude_file_name_regexp--sc_size_of_brackets = cfg.mk
+
+exclude_file_name_regexp--sc_prohibit_mkstemp = ^src/util/logging\.c$$
diff --git a/src/util/logging.c b/src/util/logging.c
index c0b2f0b65b..27bd74c7b8 100644
--- a/src/util/logging.c
+++ b/src/util/logging.c
@@ -60,7 +60,7 @@
 
 #ifdef __UCLIBC__
 /* uclibc does not implement mkostemp GNU extention */
-#define mkostemp(x,y) mkstemp(x)
+# define mkostemp(x,y) mkstemp(x)
 #endif
 
 VIR_ENUM_DECL(virLogSource)