]> git.ipfire.org Git - thirdparty/lxc.git/commitdiff
conf.c: small fix for args of mount_entry 2050/head
authorYifeng Tan <tanyifeng1@huawei.com>
Tue, 19 Dec 2017 09:35:01 +0000 (17:35 +0800)
committerYifeng Tan <tanyifeng1@huawei.com>
Tue, 19 Dec 2017 09:35:01 +0000 (17:35 +0800)
Signed-off-by: Yifeng Tan <tanyifeng1@huawei.com>
src/lxc/conf.c
src/tests/parse_config_file.c

index fb02e3e78fe1176fdfd494c32366247a27720abb..38f868afbb66717aa0f3a31f3469fda171a41d52 100644 (file)
@@ -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];
index 8c19ea2b89a43854d68d4f6340972582120283f7..76c631ccde18133cea70abcf418b8c66b8dd0dde 100644 (file)
@@ -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;
        }