From: Yifeng Tan <tanyifeng1@huawei.com>
Date: Tue, 19 Dec 2017 09:35:01 +0000 (+0800)
Subject: conf.c: small fix for args of mount_entry
X-Git-Tag: lxc-3.0.0.beta1~101^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d6bec4ab7b1934b439c0dfde23c2d0f099cd59b5;p=thirdparty%2Flxc.git

conf.c: small fix for args of mount_entry

Signed-off-by: Yifeng Tan <tanyifeng1@huawei.com>
---

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;
 	}