From: Eric Blake <eblake@redhat.com>
Date: Wed, 16 May 2012 15:52:44 +0000 (-0600)
Subject: build: fix recent syntax-check breakage
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=3337ba6dc7058412acae7fa8c6b5b3f29acddd66;p=libvirt.git

build: fix recent syntax-check breakage

The use of readlink() in lxc_container.c is intentional; we don't
want an absolute pathname there.

* src/util/cgroup.h (VIR_CGROUP_SYSFS_MOUNT): Indent properly.
* cfg.mk (exclude_file_name_regexp--sc_prohibit_readlink): Add
exemption.
---

diff --git a/cfg.mk b/cfg.mk
index 7f8193389b..07fb7b2b25 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -800,7 +800,8 @@ exclude_file_name_regexp--sc_prohibit_nonreentrant = \
 exclude_file_name_regexp--sc_prohibit_raw_allocation = \
   ^(src/util/memory\.[ch]|examples/.*)$$
 
-exclude_file_name_regexp--sc_prohibit_readlink = ^src/util/util\.c$$
+exclude_file_name_regexp--sc_prohibit_readlink = \
+  ^(src/(util/util|lxc/lxc_container)\.c$$
 
 exclude_file_name_regexp--sc_prohibit_setuid = ^src/util/util\.c$$
 
diff --git a/src/util/cgroup.h b/src/util/cgroup.h
index 857945dc01..05325ae985 100644
--- a/src/util/cgroup.h
+++ b/src/util/cgroup.h
@@ -16,7 +16,7 @@
 struct virCgroup;
 typedef struct virCgroup *virCgroupPtr;
 
-#define VIR_CGROUP_SYSFS_MOUNT "/sys/fs/cgroup"
+# define VIR_CGROUP_SYSFS_MOUNT "/sys/fs/cgroup"
 
 enum {
     VIR_CGROUP_CONTROLLER_CPU,