From: Christian Brauner Date: Sat, 20 Oct 2018 09:03:41 +0000 (+0200) Subject: confile: do not overwrite global variable X-Git-Tag: lxc-3.1.0~29^2~17 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=33eb2ec1862579b535cbc99db08c09f835bdba6d;p=thirdparty%2Flxc.git confile: do not overwrite global variable Signed-off-by: Christian Brauner --- diff --git a/src/lxc/confile.c b/src/lxc/confile.c index 5f1485a79..68d36489e 100644 --- a/src/lxc/confile.c +++ b/src/lxc/confile.c @@ -156,7 +156,7 @@ lxc_config_define(uts_name); lxc_config_define(sysctl); lxc_config_define(proc); -static struct lxc_config_t config[] = { +static struct lxc_config_t config_jump_table[] = { { "lxc.arch", set_config_personality, get_config_personality, clr_config_personality, }, { "lxc.apparmor.profile", set_config_apparmor_profile, get_config_apparmor_profile, clr_config_apparmor_profile, }, { "lxc.apparmor.allow_incomplete", set_config_apparmor_allow_incomplete, get_config_apparmor_allow_incomplete, clr_config_apparmor_allow_incomplete, }, @@ -246,15 +246,15 @@ static struct lxc_config_t config[] = { { "lxc.proc", set_config_proc, get_config_proc, clr_config_proc, }, }; -static const size_t config_size = sizeof(config) / sizeof(struct lxc_config_t); +static const size_t config_jump_table_size = sizeof(config_jump_table) / sizeof(struct lxc_config_t); struct lxc_config_t *lxc_get_config(const char *key) { size_t i; - for (i = 0; i < config_size; i++) - if (!strncmp(config[i].name, key, strlen(config[i].name))) - return &config[i]; + for (i = 0; i < config_jump_table_size; i++) + if (!strncmp(config_jump_table[i].name, key, strlen(config_jump_table[i].name))) + return &config_jump_table[i]; return NULL; } @@ -5190,8 +5190,8 @@ int lxc_list_config_items(char *retv, int inlen) else memset(retv, 0, inlen); - for (i = 0; i < config_size; i++) { - char *s = config[i].name; + for (i = 0; i < config_jump_table_size; i++) { + char *s = config_jump_table[i].name; if (s[strlen(s) - 1] == '.') continue;