diff options
| author |   Daniel Lezcano <daniel.lezcano@free.fr> | 2009-11-19 15:06:02 +0100 |
|---|---|---|
| committer |   Daniel Lezcano <dlezcano@fr.ibm.com> | 2009-11-19 15:06:02 +0100 |
| commit | 16950ecb45ecfd7be5c4bb0b65d8dbe1a6e7bdc3 (patch) | |
| tree | 79fea1b3eea50bebc5ff22dcf822a319294bd004 | |
| parent | factor out common config evaluating code (diff) | |
| download | lxc-16950ecb45ecfd7be5c4bb0b65d8dbe1a6e7bdc3.tar.gz lxc-16950ecb45ecfd7be5c4bb0b65d8dbe1a6e7bdc3.tar.bz2 lxc-16950ecb45ecfd7be5c4bb0b65d8dbe1a6e7bdc3.zip | |
change network_netdev function parameter
A mindless change to encapsulate a little more the function.
Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
| -rw-r--r-- | src/lxc/confile.c | 37 |
1 files changed, 25 insertions, 12 deletions
diff --git a/src/lxc/confile.c b/src/lxc/confile.c index 6dc76cf..39a8e2c 100644 --- a/src/lxc/confile.c +++ b/src/lxc/confile.c @@ -146,20 +146,21 @@ static int config_ip_prefix(struct in_addr *addr) return 0; } -static struct lxc_netdev *network_netdev(const char *key, char *value, - struct lxc_conf *lxc_conf) +static struct lxc_netdev *network_netdev(const char *key, const char *value, + struct lxc_list *network) { - struct lxc_list *network = &lxc_conf->network; struct lxc_netdev *netdev; if (lxc_list_empty(network)) { - ERROR("network is not created for '%s' option", value); + ERROR("network is not created for '%s' = '%s' option", + key, value); return NULL; } netdev = lxc_list_first_elem(network); if (!netdev) { - ERROR("no network defined for '%s' option", value); + ERROR("no network device defined for '%s' = '%s' option", + key, value); return NULL; } @@ -174,6 +175,10 @@ static int network_ifname(char **valuep, char *value) } *valuep = strdup(value); + if (!*valuep) { + ERROR("failed to dup string '%s'", value); + return -1; + } return 0; } @@ -183,7 +188,7 @@ static int config_network_flags(const char *key, char *value, { struct lxc_netdev *netdev; - netdev = network_netdev(key, value, lxc_conf); + netdev = network_netdev(key, value, &lxc_conf->network); if (!netdev) return -1; @@ -197,7 +202,7 @@ static int config_network_link(const char *key, char *value, { struct lxc_netdev *netdev; - netdev = network_netdev(key, value, lxc_conf); + netdev = network_netdev(key, value, &lxc_conf->network); if (!netdev) return -1; @@ -209,7 +214,7 @@ static int config_network_name(const char *key, char *value, { struct lxc_netdev *netdev; - netdev = network_netdev(key, value, lxc_conf); + netdev = network_netdev(key, value, &lxc_conf->network); if (!netdev) return -1; @@ -221,11 +226,15 @@ static int config_network_hwaddr(const char *key, char *value, { struct lxc_netdev *netdev; - netdev = network_netdev(key, value, lxc_conf); + netdev = network_netdev(key, value, &lxc_conf->network); if (!netdev) return -1; netdev->hwaddr = strdup(value); + if (!netdev->hwaddr) { + SYSERROR("failed to dup string '%s'", value); + return -1; + } return 0; } @@ -235,11 +244,15 @@ static int config_network_mtu(const char *key, char *value, { struct lxc_netdev *netdev; - netdev = network_netdev(key, value, lxc_conf); + netdev = network_netdev(key, value, &lxc_conf->network); if (!netdev) return -1; netdev->mtu = strdup(value); + if (!netdev->mtu) { + SYSERROR("failed to dup string '%s'", value); + return -1; + } return 0; } @@ -252,7 +265,7 @@ static int config_network_ipv4(const char *key, char *value, struct lxc_list *list; char *cursor, *slash, *addr = NULL, *bcast = NULL, *prefix = NULL; - netdev = network_netdev(key, value, lxc_conf); + netdev = network_netdev(key, value, &lxc_conf->network); if (!netdev) return -1; @@ -320,7 +333,7 @@ static int config_network_ipv6(const char *key, char *value, struct lxc_conf *lx char *slash; char *netmask; - netdev = network_netdev(key, value, lxc_conf); + netdev = network_netdev(key, value, &lxc_conf->network); if (!netdev) return -1; |