From: Christian Brauner Date: Thu, 4 Jan 2018 13:59:42 +0000 (+0100) Subject: conf: non-functional changes X-Git-Tag: lxc-3.0.0.beta1~84^2~2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c7e345ae1f1c6b976ec1e6ae47f188567846d829;p=thirdparty%2Flxc.git conf: non-functional changes Signed-off-by: Christian Brauner --- diff --git a/src/lxc/conf.c b/src/lxc/conf.c index 1f303454a..6f2dd0d27 100644 --- a/src/lxc/conf.c +++ b/src/lxc/conf.c @@ -3471,7 +3471,8 @@ int lxc_clear_config_caps(struct lxc_conf *c) return 0; } -static int lxc_free_idmap(struct lxc_list *id_map) { +static int lxc_free_idmap(struct lxc_list *id_map) +{ struct lxc_list *it, *next; lxc_list_for_each_safe(it, id_map, next) { @@ -3479,6 +3480,7 @@ static int lxc_free_idmap(struct lxc_list *id_map) { free(it->elem); free(it); } + return 0; } diff --git a/src/lxc/conf.h b/src/lxc/conf.h index 806a15733..58c6c4d1b 100644 --- a/src/lxc/conf.h +++ b/src/lxc/conf.h @@ -284,9 +284,11 @@ struct lxc_conf { struct lxc_list cgroup; struct { struct lxc_list id_map; + /* Pointer to the idmap entry for the container's root uid in * the id_map list. Do not free! */ struct id_map *root_nsuid_map; + /* Pointer to the idmap entry for the container's root gid in * the id_map list. Do not free! */ struct id_map *root_nsgid_map;