From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Wed, 31 May 2017 16:45:51 +0000 (+0200)
Subject: confile: add clearer for lxc.include
X-Git-Tag: lxc-2.1.0~110^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=973082f5663a2768925efcb3e86e59462501ed3b;p=thirdparty%2Flxc.git

confile: add clearer for lxc.include

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
---

diff --git a/src/lxc/confile.c b/src/lxc/confile.c
index fde08fcd5..5762f2960 100644
--- a/src/lxc/confile.c
+++ b/src/lxc/confile.c
@@ -194,8 +194,8 @@ static int set_config_seccomp(const char *, const char *, struct lxc_conf *);
 static int get_config_seccomp(const char *, char *, int, struct lxc_conf *);
 static int clr_config_seccomp(const char *, struct lxc_conf *);
 
-static int set_config_includefile(const char *, const char *, struct lxc_conf *);
-static int clr_config_includefile(const char *, struct lxc_conf *);
+static int set_config_includefiles(const char *, const char *, struct lxc_conf *);
+static int clr_config_includefiles(const char *, struct lxc_conf *);
 
 static int set_config_autodev(const char *, const char *, struct lxc_conf *);
 static int get_config_autodev(const char *, char *, int, struct lxc_conf *);
@@ -311,7 +311,7 @@ static struct lxc_config_t config[] = {
 	{ "lxc.console.logfile",      set_config_console_logfile,      get_config_console_logfile,   clr_config_console_logfile,   },
 	{ "lxc.console",              set_config_console,              get_config_console,           clr_config_console,           },
 	{ "lxc.seccomp",              set_config_seccomp,              get_config_seccomp,           clr_config_seccomp,           },
-	{ "lxc.include",              set_config_includefile,          NULL,                         clr_config_includefile,       },
+	{ "lxc.include",              set_config_includefiles,         NULL,                         clr_config_includefiles,       },
 	{ "lxc.autodev",              set_config_autodev,              get_config_autodev,           clr_config_autodev,           },
 	{ "lxc.haltsignal",           set_config_haltsignal,           get_config_haltsignal,        clr_config_haltsignal,        },
 	{ "lxc.rebootsignal",         set_config_rebootsignal,         get_config_rebootsignal,      clr_config_rebootsignal,      },
@@ -2447,8 +2447,8 @@ out:
 	return ret;
 }
 
-static int set_config_includefile(const char *key, const char *value,
-				  struct lxc_conf *lxc_conf)
+static int set_config_includefiles(const char *key, const char *value,
+				   struct lxc_conf *lxc_conf)
 {
 	/* Set config value to default. */
 	if (config_value_empty(value)) {
@@ -4241,7 +4241,7 @@ static inline int clr_config_limit(const char *key, struct lxc_conf *c)
 	return lxc_clear_limits(c, key);
 }
 
-static inline int clr_config_includes(const char *key, struct lxc_conf *c)
+static inline int clr_config_includefiles(const char *key, struct lxc_conf *c)
 {
 	lxc_clear_includes(c);
 	return 0;