proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-08-16 23:42:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

confile: do not overwrite global variable

Browse Source 
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
This commit is contained in:
Christian Brauner 2018-10-20 11:03:41 +02:00
parent 2a08398569
commit 33eb2ec186
No known key found for this signature in database
GPG Key ID: 8EB056D53EECB12D
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/lxc/confile.c
View File

@ -156,7 +156,7 @@ lxc_config_define(uts_name);
lxc_config_define(sysctl); lxc_config_define(sysctl);
lxc_config_define(proc); 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.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.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, }, { "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, }, { "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) struct lxc_config_t *lxc_get_config(const char *key)
{ {
size_t i; size_t i;
for (i = 0; i < config_size; i++) for (i = 0; i < config_jump_table_size; i++)
if (!strncmp(config[i].name, key, strlen(config[i].name))) if (!strncmp(config_jump_table[i].name, key, strlen(config_jump_table[i].name)))
return &config[i]; return &config_jump_table[i];
return NULL; return NULL;
} }
@ -5190,8 +5190,8 @@ int lxc_list_config_items(char *retv, int inlen)
else else
memset(retv, 0, inlen); memset(retv, 0, inlen);
for (i = 0; i < config_size; i++) { for (i = 0; i < config_jump_table_size; i++) {
char *s = config[i].name; char *s = config_jump_table[i].name;
if (s[strlen(s) - 1] == '.') if (s[strlen(s) - 1] == '.')
continue; continue;