[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[libvirt] [PATCH] 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.
---

Pushing under the build-breaker rule.

 cfg.mk            |    3 ++-
 src/util/cgroup.h |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/cfg.mk b/cfg.mk
index 7f81933..07fb7b2 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 857945d..05325ae 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,
-- 
1.7.7.6


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]