From e409b214020b334d1946a0cb8a11a39cfc58fc40 Mon Sep 17 00:00:00 2001 From: Christian Brauner Date: Mon, 11 Dec 2017 11:27:24 +0100 Subject: [PATCH] conf: lxc.sysctl coding style fixes Signed-off-by: Christian Brauner --- doc/lxc.container.conf.sgml.in | 2 +- src/lxc/conf.c | 5 +++-- src/lxc/confile.c | 31 ++++++++++++++++--------------- 3 files changed, 20 insertions(+), 18 deletions(-) diff --git a/doc/lxc.container.conf.sgml.in b/doc/lxc.container.conf.sgml.in index 8c14d1507..7a6dd4841 100644 --- a/doc/lxc.container.conf.sgml.in +++ b/doc/lxc.container.conf.sgml.in @@ -1403,7 +1403,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Specify the kernel parameters to be set. The parameters available are those listed under /proc/sys/. - Note that not all sysctls are namespaced.Changing Non-namespaced + Note that not all sysctls are namespaced. Changing Non-namespaced sysctls will cause the system-wide setting to be modified. sysctl diff --git a/src/lxc/conf.c b/src/lxc/conf.c index c59f28706..6a452064b 100644 --- a/src/lxc/conf.c +++ b/src/lxc/conf.c @@ -3311,8 +3311,8 @@ int lxc_clear_cgroups(struct lxc_conf *c, const char *key) if (strcmp(key, "lxc.cgroup") == 0) all = true; - else if (strncmp(key, "lxc.cgroup.", sizeof("lxc.cgroup.")-1) == 0) - k = key + sizeof("lxc.cgroup.")-1; + else if (strncmp(key, "lxc.cgroup.", sizeof("lxc.cgroup.") - 1) == 0) + k = key + sizeof("lxc.cgroup.") - 1; else return -1; @@ -3326,6 +3326,7 @@ int lxc_clear_cgroups(struct lxc_conf *c, const char *key) free(cg); free(it); } + return 0; } diff --git a/src/lxc/confile.c b/src/lxc/confile.c index dba13d5ef..584f93630 100644 --- a/src/lxc/confile.c +++ b/src/lxc/confile.c @@ -1500,12 +1500,12 @@ static int set_config_sysctl(const char *key, const char *value, struct lxc_conf *lxc_conf, void *data) { struct lxc_list *iter; + char *replace_value = NULL; struct lxc_list *sysctl_list = NULL; struct lxc_sysctl *sysctl_elem = NULL; - char *replace_value = NULL; if (lxc_config_value_empty(value)) - return lxc_clear_sysctls(lxc_conf, key); + return clr_config_sysctl(key, lxc_conf, NULL); if (strncmp(key, "lxc.sysctl.", sizeof("lxc.sysctl.") - 1) != 0) return -1; @@ -1515,14 +1515,17 @@ static int set_config_sysctl(const char *key, const char *value, /* find existing list element */ lxc_list_for_each(iter, &lxc_conf->sysctls) { sysctl_elem = iter->elem; - if (strcmp(key, sysctl_elem->key) == 0) { - replace_value = strdup(value); - if (!replace_value) - return -1; - free(sysctl_elem->value); - sysctl_elem->value = replace_value; - return 0; - } + + if (strcmp(key, sysctl_elem->key) != 0) + continue; + + replace_value = strdup(value); + if (!replace_value) + return -1; + + free(sysctl_elem->value); + sysctl_elem->value = replace_value; + return 0; } /* allocate list element */ @@ -1557,8 +1560,6 @@ on_error: free(sysctl_elem); } return -1; - - } static int set_config_idmaps(const char *key, const char *value, @@ -3376,9 +3377,9 @@ static int get_config_prlimit(const char *key, char *retv, int inlen, return fulllen; } -/* If you ask for a specific value, i.e. lxc.sysctl.net.ipv4.ip_forward, then just the value - * will be printed. If you ask for 'lxc.sysctl', then all sysctl entries will be - * printed, in 'lxc.sysctl.key = value' format. +/* If you ask for a specific value, i.e. lxc.sysctl.net.ipv4.ip_forward, then + * just the value will be printed. If you ask for 'lxc.sysctl', then all sysctl + * entries will be printed, in 'lxc.sysctl.key = value' format. */ static int get_config_sysctl(const char *key, char *retv, int inlen, struct lxc_conf *c, void *data)