[lxc-devel] [lxc/master] conf.c: small fix for args of mount_entry

tanyifeng on Github lxc-bot at linuxcontainers.org
Tue Dec 19 01:08:51 UTC 2017


A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 350 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20171219/716fa803/attachment.bin>
-------------- next part --------------
From d6bec4ab7b1934b439c0dfde23c2d0f099cd59b5 Mon Sep 17 00:00:00 2001
From: Yifeng Tan <tanyifeng1 at huawei.com>
Date: Tue, 19 Dec 2017 17:35:01 +0800
Subject: [PATCH] conf.c: small fix for args of mount_entry

Signed-off-by: Yifeng Tan <tanyifeng1 at huawei.com>
---
 src/lxc/conf.c                | 4 ++--
 src/tests/parse_config_file.c | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/lxc/conf.c b/src/lxc/conf.c
index fb02e3e78..38f868afb 100644
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -1813,8 +1813,8 @@ static char *get_field(char *src, int nfields)
 
 static int mount_entry(const char *fsname, const char *target,
 		       const char *fstype, unsigned long mountflags,
-		       const char *data, int optional, int dev,
-		       int relative, const char *rootfs)
+		       const char *data, bool optional, bool dev,
+		       bool relative, const char *rootfs)
 {
 	int ret;
 	char srcbuf[MAXPATHLEN];
diff --git a/src/tests/parse_config_file.c b/src/tests/parse_config_file.c
index 8c19ea2b8..76c631ccd 100644
--- a/src/tests/parse_config_file.c
+++ b/src/tests/parse_config_file.c
@@ -478,7 +478,7 @@ int main(int argc, char *argv[])
 	}
 
 	if (!c->get_config_item(c, "lxc.id_map", retval, sizeof(retval))) {
-		lxc_error("%s\n", "failed to get config item \"lxc.cgroup\"");
+		lxc_error("%s\n", "failed to get config item \"lxc.id_map\"");
 		return -1;
 	}
 
@@ -506,7 +506,7 @@ int main(int argc, char *argv[])
 	}
 
 	if (!c->get_config_item(c, "lxc.idmap", retval, sizeof(retval))) {
-		lxc_error("%s\n", "failed to get config item \"lxc.cgroup\"");
+		lxc_error("%s\n", "failed to get config item \"lxc.idmap\"");
 		return -1;
 	}
 


More information about the lxc-devel mailing list