proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-08-15 22:51:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

confile_utils: make update_hwaddr() static

Browse Source 
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
This commit is contained in:
Christian Brauner 2019-03-04 20:30:41 +01:00
parent 3db41a6cf0
commit 5648fc191c
No known key found for this signature in database
GPG Key ID: 8EB056D53EECB12D
3 changed files with 34 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/lxc/confile.c
View File

@ -2081,6 +2081,40 @@ static int set_config_console_size(const char *key, const char *value,
return 0;
}
/*
* If we find a lxc.net.[i].hwaddr or lxc.network.hwaddr in the original config
* file, we expand it in the unexpanded_config, so that after a save_config we
* store the hwaddr for re-use.
* This is only called when reading the config file, not when executing a
* lxc.include.
* 'x' and 'X' are substituted in-place.
*/
static void update_hwaddr(const char *line)
{
char *p;
line += lxc_char_left_gc(line, strlen(line));
if (line[0] == '#')
return;
if (!lxc_config_net_is_hwaddr(line))
return;
/* Let config_net_hwaddr raise the error. */
p = strchr(line, '=');
if (!p)
return;
p++;
while (isblank(*p))
p++;
if (!*p)
return;
rand_complete_hwaddr(p);
}
int append_unexp_config_line(const char *line, struct lxc_conf *conf)
{
size_t linelen;

35
src/lxc/confile_utils.c
View File

@ -601,40 +601,6 @@ void rand_complete_hwaddr(char *hwaddr)
}
}
/*
* If we find a lxc.net.[i].hwaddr or lxc.network.hwaddr in the original config
* file, we expand it in the unexpanded_config, so that after a save_config we
* store the hwaddr for re-use.
* This is only called when reading the config file, not when executing a
* lxc.include.
* 'x' and 'X' are substituted in-place.
*/
void update_hwaddr(const char *line)
{
char *p;
line += lxc_char_left_gc(line, strlen(line));
if (line[0] == '#')
return;
if (!lxc_config_net_is_hwaddr(line))
return;
/* Let config_net_hwaddr raise the error. */
p = strchr(line, '=');
if (!p)
return;
p++;
while (isblank(*p))
p++;
if (!*p)
return;
rand_complete_hwaddr(p);
}
bool new_hwaddr(char *hwaddr)
{
int ret;
@ -703,7 +669,6 @@ int lxc_get_conf_int(struct lxc_conf *c, char *retv, int inlen, int v)
return fulllen;
}
int lxc_get_conf_size_t(struct lxc_conf *c, char *retv, int inlen, size_t v)
{
int len;

1
src/lxc/confile_utils.h
View File

@ -67,7 +67,6 @@ extern int config_ip_prefix(struct in_addr *addr);
extern int network_ifname(char *valuep, const char *value, size_t size);
extern void rand_complete_hwaddr(char *hwaddr);
extern bool lxc_config_net_is_hwaddr(const char *line);
extern void update_hwaddr(const char *line);
extern bool new_hwaddr(char *hwaddr);
extern int lxc_get_conf_str(char *retv, int inlen, const char *value);
extern int lxc_get_conf_bool(struct lxc_conf *c, char *retv, int inlen, bool v);