Skip to content

L
lxc
Unverified Commit 070a05af by Christian Brauner
Options

coverity: #1425743

remove logically dead code Signed-off-by: 's avatarChristian Brauner <christian.brauner@ubuntu.com>
parent adcdf4e4
Showing with 75 additions and 240 deletions
src/lxc/confile.c
...@@ -382,15 +382,11 @@ static int set_config_net(const char *key, const char *value, ...@@ -382,15 +382,11 @@ static int set_config_net(const char *key, const char *value,
static int set_config_net_type(const char *key, const char *value, static int set_config_net_type(const char *key, const char *value,
struct lxc_conf *lxc_conf, void *data) struct lxc_conf *lxc_conf, void *data)
{ {
struct lxc_netdev *netdev; struct lxc_netdev *netdev = data;
if (lxc_config_value_empty(value)) if (lxc_config_value_empty(value))
return clr_config_net_type(key, lxc_conf, data); return clr_config_net_type(key, lxc_conf, data);
if (!data)
return -1;
else
netdev = data;
if (!netdev) if (!netdev)
return -1; return -1;
...@@ -419,15 +415,11 @@ static int set_config_net_type(const char *key, const char *value, ...@@ -419,15 +415,11 @@ static int set_config_net_type(const char *key, const char *value,
static int set_config_net_flags(const char *key, const char *value, static int set_config_net_flags(const char *key, const char *value,
struct lxc_conf *lxc_conf, void *data) struct lxc_conf *lxc_conf, void *data)
{ {
struct lxc_netdev *netdev; struct lxc_netdev *netdev = data;
if (lxc_config_value_empty(value)) if (lxc_config_value_empty(value))
return clr_config_net_flags(key, lxc_conf, data); return clr_config_net_flags(key, lxc_conf, data);
if (!data)
return -1;
else
netdev = data;
if (!netdev) if (!netdev)
return -1; return -1;
...@@ -483,16 +475,12 @@ static int create_matched_ifnames(const char *value, struct lxc_conf *lxc_conf, ...@@ -483,16 +475,12 @@ static int create_matched_ifnames(const char *value, struct lxc_conf *lxc_conf,
static int set_config_net_link(const char *key, const char *value, static int set_config_net_link(const char *key, const char *value,
struct lxc_conf *lxc_conf, void *data) struct lxc_conf *lxc_conf, void *data)
{ {
struct lxc_netdev *netdev; struct lxc_netdev *netdev = data;
int ret = 0; int ret = 0;
if (lxc_config_value_empty(value)) if (lxc_config_value_empty(value))
return clr_config_net_link(key, lxc_conf, data); return clr_config_net_link(key, lxc_conf, data);
if (!data)
return -1;
else
netdev = data;
if (!netdev) if (!netdev)
return -1; return -1;
...@@ -507,15 +495,11 @@ static int set_config_net_link(const char *key, const char *value, ...@@ -507,15 +495,11 @@ static int set_config_net_link(const char *key, const char *value,
static int set_config_net_name(const char *key, const char *value, static int set_config_net_name(const char *key, const char *value,
struct lxc_conf *lxc_conf, void *data) struct lxc_conf *lxc_conf, void *data)
{ {
struct lxc_netdev *netdev; struct lxc_netdev *netdev = data;
if (lxc_config_value_empty(value)) if (lxc_config_value_empty(value))
return clr_config_net_name(key, lxc_conf, data); return clr_config_net_name(key, lxc_conf, data);
if (!data)
return -1;
else
netdev = data;
if (!netdev) if (!netdev)
return -1; return -1;
...@@ -525,15 +509,11 @@ static int set_config_net_name(const char *key, const char *value, ...@@ -525,15 +509,11 @@ static int set_config_net_name(const char *key, const char *value,
static int set_config_net_veth_pair(const char *key, const char *value, static int set_config_net_veth_pair(const char *key, const char *value,
struct lxc_conf *lxc_conf, void *data) struct lxc_conf *lxc_conf, void *data)
{ {
struct lxc_netdev *netdev; struct lxc_netdev *netdev = data;
if (lxc_config_value_empty(value)) if (lxc_config_value_empty(value))
return clr_config_net_veth_pair(key, lxc_conf, data); return clr_config_net_veth_pair(key, lxc_conf, data);
if (!data)
return -1;
else
netdev = data;
if (!netdev) if (!netdev)
return -1; return -1;
...@@ -543,15 +523,11 @@ static int set_config_net_veth_pair(const char *key, const char *value, ...@@ -543,15 +523,11 @@ static int set_config_net_veth_pair(const char *key, const char *value,
static int set_config_net_macvlan_mode(const char *key, const char *value, static int set_config_net_macvlan_mode(const char *key, const char *value,
struct lxc_conf *lxc_conf, void *data) struct lxc_conf *lxc_conf, void *data)
{ {
struct lxc_netdev *netdev; struct lxc_netdev *netdev = data;
if (lxc_config_value_empty(value)) if (lxc_config_value_empty(value))
return clr_config_net_macvlan_mode(key, lxc_conf, data); return clr_config_net_macvlan_mode(key, lxc_conf, data);
if (!data)
return -1;
else
netdev = data;
if (!netdev) if (!netdev)
return -1; return -1;
...@@ -561,16 +537,12 @@ static int set_config_net_macvlan_mode(const char *key, const char *value, ...@@ -561,16 +537,12 @@ static int set_config_net_macvlan_mode(const char *key, const char *value,
static int set_config_net_hwaddr(const char *key, const char *value, static int set_config_net_hwaddr(const char *key, const char *value,
struct lxc_conf *lxc_conf, void *data) struct lxc_conf *lxc_conf, void *data)
{ {
struct lxc_netdev *netdev; struct lxc_netdev *netdev = data;
char *new_value; char *new_value;
if (lxc_config_value_empty(value)) if (lxc_config_value_empty(value))
return clr_config_net_hwaddr(key, lxc_conf, data); return clr_config_net_hwaddr(key, lxc_conf, data);
if (!data)
return -1;
else
netdev = data;
if (!netdev) if (!netdev)
return -1; return -1;
...@@ -594,15 +566,11 @@ static int set_config_net_vlan_id(const char *key, const char *value, ...@@ -594,15 +566,11 @@ static int set_config_net_vlan_id(const char *key, const char *value,
struct lxc_conf *lxc_conf, void *data) struct lxc_conf *lxc_conf, void *data)
{ {
int ret; int ret;
struct lxc_netdev *netdev; struct lxc_netdev *netdev = data;
if (lxc_config_value_empty(value)) if (lxc_config_value_empty(value))
return clr_config_net_vlan_id(key, lxc_conf, data); return clr_config_net_vlan_id(key, lxc_conf, data);
if (!data)
return -1;
else
netdev = data;
if (!netdev) if (!netdev)
return -1; return -1;
...@@ -616,15 +584,11 @@ static int set_config_net_vlan_id(const char *key, const char *value, ...@@ -616,15 +584,11 @@ static int set_config_net_vlan_id(const char *key, const char *value,
static int set_config_net_mtu(const char *key, const char *value, static int set_config_net_mtu(const char *key, const char *value,
struct lxc_conf *lxc_conf, void *data) struct lxc_conf *lxc_conf, void *data)
{ {
struct lxc_netdev *netdev; struct lxc_netdev *netdev = data;
if (lxc_config_value_empty(value)) if (lxc_config_value_empty(value))
return clr_config_net_mtu(key, lxc_conf, data); return clr_config_net_mtu(key, lxc_conf, data);
if (!data)
return -1;
else
netdev = data;
if (!netdev) if (!netdev)
return -1; return -1;
...@@ -635,7 +599,7 @@ static int set_config_net_ipv4_address(const char *key, const char *value, ...@@ -635,7 +599,7 @@ static int set_config_net_ipv4_address(const char *key, const char *value,
struct lxc_conf *lxc_conf, void *data) struct lxc_conf *lxc_conf, void *data)
{ {
int ret; int ret;
struct lxc_netdev *netdev; struct lxc_netdev *netdev = data;
struct lxc_inetdev *inetdev; struct lxc_inetdev *inetdev;
struct lxc_list *list; struct lxc_list *list;
char *cursor, *slash; char *cursor, *slash;
...@@ -644,10 +608,6 @@ static int set_config_net_ipv4_address(const char *key, const char *value, ...@@ -644,10 +608,6 @@ static int set_config_net_ipv4_address(const char *key, const char *value,
if (lxc_config_value_empty(value)) if (lxc_config_value_empty(value))
return clr_config_net_ipv4_address(key, lxc_conf, data); return clr_config_net_ipv4_address(key, lxc_conf, data);
if (!data)
return -1;
else
netdev = data;
if (!netdev) if (!netdev)
return -1; return -1;
...@@ -732,15 +692,11 @@ static int set_config_net_ipv4_address(const char *key, const char *value, ...@@ -732,15 +692,11 @@ static int set_config_net_ipv4_address(const char *key, const char *value,
static int set_config_net_ipv4_gateway(const char *key, const char *value, static int set_config_net_ipv4_gateway(const char *key, const char *value,
struct lxc_conf *lxc_conf, void *data) struct lxc_conf *lxc_conf, void *data)
{ {
struct lxc_netdev *netdev; struct lxc_netdev *netdev = data;
if (lxc_config_value_empty(value)) if (lxc_config_value_empty(value))
return clr_config_net_ipv4_gateway(key, lxc_conf, data); return clr_config_net_ipv4_gateway(key, lxc_conf, data);
if (!data)
return -1;
else
netdev = data;
if (!netdev) if (!netdev)
return -1; return -1;
...@@ -775,7 +731,7 @@ static int set_config_net_ipv6_address(const char *key, const char *value, ...@@ -775,7 +731,7 @@ static int set_config_net_ipv6_address(const char *key, const char *value,
struct lxc_conf *lxc_conf, void *data) struct lxc_conf *lxc_conf, void *data)
{ {
int ret; int ret;
struct lxc_netdev *netdev; struct lxc_netdev *netdev = data;
struct lxc_inet6dev *inet6dev; struct lxc_inet6dev *inet6dev;
struct lxc_list *list; struct lxc_list *list;
char *slash, *valdup, *netmask; char *slash, *valdup, *netmask;
...@@ -783,10 +739,6 @@ static int set_config_net_ipv6_address(const char *key, const char *value, ...@@ -783,10 +739,6 @@ static int set_config_net_ipv6_address(const char *key, const char *value,
if (lxc_config_value_empty(value)) if (lxc_config_value_empty(value))
return clr_config_net_ipv6_address(key, lxc_conf, data); return clr_config_net_ipv6_address(key, lxc_conf, data);
if (!data)
return -1;
else
netdev = data;
if (!netdev) if (!netdev)
return -1; return -1;
...@@ -839,15 +791,11 @@ static int set_config_net_ipv6_address(const char *key, const char *value, ...@@ -839,15 +791,11 @@ static int set_config_net_ipv6_address(const char *key, const char *value,
static int set_config_net_ipv6_gateway(const char *key, const char *value, static int set_config_net_ipv6_gateway(const char *key, const char *value,
struct lxc_conf *lxc_conf, void *data) struct lxc_conf *lxc_conf, void *data)
{ {
struct lxc_netdev *netdev; struct lxc_netdev *netdev = data;
if (lxc_config_value_empty(value)) if (lxc_config_value_empty(value))
return clr_config_net_ipv6_gateway(key, lxc_conf, data); return clr_config_net_ipv6_gateway(key, lxc_conf, data);
if (!data)
return -1;
else
netdev = data;
if (!netdev) if (!netdev)
return -1; return -1;
...@@ -881,15 +829,11 @@ static int set_config_net_ipv6_gateway(const char *key, const char *value, ...@@ -881,15 +829,11 @@ static int set_config_net_ipv6_gateway(const char *key, const char *value,
static int set_config_net_script_up(const char *key, const char *value, static int set_config_net_script_up(const char *key, const char *value,
struct lxc_conf *lxc_conf, void *data) struct lxc_conf *lxc_conf, void *data)
{ {
struct lxc_netdev *netdev; struct lxc_netdev *netdev = data;
if (lxc_config_value_empty(value)) if (lxc_config_value_empty(value))
return clr_config_net_script_up(key, lxc_conf, data); return clr_config_net_script_up(key, lxc_conf, data);
if (!data)
return -1;
else
netdev = data;
if (!netdev) if (!netdev)
return -1; return -1;
...@@ -899,15 +843,11 @@ static int set_config_net_script_up(const char *key, const char *value, ...@@ -899,15 +843,11 @@ static int set_config_net_script_up(const char *key, const char *value,
static int set_config_net_script_down(const char *key, const char *value, static int set_config_net_script_down(const char *key, const char *value,
struct lxc_conf *lxc_conf, void *data) struct lxc_conf *lxc_conf, void *data)
{ {
struct lxc_netdev *netdev; struct lxc_netdev *netdev = data;
if (lxc_config_value_empty(value)) if (lxc_config_value_empty(value))
return clr_config_net_script_down(key, lxc_conf, data); return clr_config_net_script_down(key, lxc_conf, data);
if (!data)
return -1;
else
netdev = data;
if (!netdev) if (!netdev)
return -1; return -1;
...@@ -3924,12 +3864,8 @@ static int clr_config_net_nic(const char *key, struct lxc_conf *lxc_conf, ...@@ -3924,12 +3864,8 @@ static int clr_config_net_nic(const char *key, struct lxc_conf *lxc_conf,
static int clr_config_net_type(const char *key, struct lxc_conf *lxc_conf, static int clr_config_net_type(const char *key, struct lxc_conf *lxc_conf,
void *data) void *data)
{ {
struct lxc_netdev *netdev; struct lxc_netdev *netdev = data;
if (!data)
return -1;
else
netdev = data;
if (!netdev) if (!netdev)
return -1; return -1;
...@@ -3941,12 +3877,8 @@ static int clr_config_net_type(const char *key, struct lxc_conf *lxc_conf, ...@@ -3941,12 +3877,8 @@ static int clr_config_net_type(const char *key, struct lxc_conf *lxc_conf,
static int clr_config_net_name(const char *key, struct lxc_conf *lxc_conf, static int clr_config_net_name(const char *key, struct lxc_conf *lxc_conf,
void *data) void *data)
{ {
struct lxc_netdev *netdev; struct lxc_netdev *netdev = data;
if (!data)
return -1;
else
netdev = data;
if (!netdev) if (!netdev)
return -1; return -1;
...@@ -3958,12 +3890,8 @@ static int clr_config_net_name(const char *key, struct lxc_conf *lxc_conf, ...@@ -3958,12 +3890,8 @@ static int clr_config_net_name(const char *key, struct lxc_conf *lxc_conf,
static int clr_config_net_flags(const char *key, struct lxc_conf *lxc_conf, static int clr_config_net_flags(const char *key, struct lxc_conf *lxc_conf,
void *data) void *data)
{ {
struct lxc_netdev *netdev; struct lxc_netdev *netdev = data;
if (!data)
return -1;
else
netdev = data;
if (!netdev) if (!netdev)
return -1; return -1;
...@@ -3975,12 +3903,8 @@ static int clr_config_net_flags(const char *key, struct lxc_conf *lxc_conf, ...@@ -3975,12 +3903,8 @@ static int clr_config_net_flags(const char *key, struct lxc_conf *lxc_conf,
static int clr_config_net_link(const char *key, struct lxc_conf *lxc_conf, static int clr_config_net_link(const char *key, struct lxc_conf *lxc_conf,
void *data) void *data)
{ {
struct lxc_netdev *netdev; struct lxc_netdev *netdev = data;
if (!data)
return -1;
else
netdev = data;
if (!netdev) if (!netdev)
return -1; return -1;
...@@ -3992,12 +3916,8 @@ static int clr_config_net_link(const char *key, struct lxc_conf *lxc_conf, ...@@ -3992,12 +3916,8 @@ static int clr_config_net_link(const char *key, struct lxc_conf *lxc_conf,
static int clr_config_net_macvlan_mode(const char *key, static int clr_config_net_macvlan_mode(const char *key,
struct lxc_conf *lxc_conf, void *data) struct lxc_conf *lxc_conf, void *data)
{ {
struct lxc_netdev *netdev; struct lxc_netdev *netdev = data;
if (!data)
return -1;
else
netdev = data;
if (!netdev) if (!netdev)
return -1; return -1;
...@@ -4012,12 +3932,8 @@ static int clr_config_net_macvlan_mode(const char *key, ...@@ -4012,12 +3932,8 @@ static int clr_config_net_macvlan_mode(const char *key,
static int clr_config_net_veth_pair(const char *key, struct lxc_conf *lxc_conf, static int clr_config_net_veth_pair(const char *key, struct lxc_conf *lxc_conf,
void *data) void *data)
{ {
struct lxc_netdev *netdev; struct lxc_netdev *netdev = data;
if (!data)
return -1;
else
netdev = data;
if (!netdev) if (!netdev)
return -1; return -1;
...@@ -4029,12 +3945,8 @@ static int clr_config_net_veth_pair(const char *key, struct lxc_conf *lxc_conf, ...@@ -4029,12 +3945,8 @@ static int clr_config_net_veth_pair(const char *key, struct lxc_conf *lxc_conf,
static int clr_config_net_script_up(const char *key, struct lxc_conf *lxc_conf, static int clr_config_net_script_up(const char *key, struct lxc_conf *lxc_conf,
void *data) void *data)
{ {
struct lxc_netdev *netdev; struct lxc_netdev *netdev = data;
if (!data)
return -1;
else
netdev = data;
if (!netdev) if (!netdev)
return -1; return -1;
...@@ -4047,12 +3959,8 @@ static int clr_config_net_script_up(const char *key, struct lxc_conf *lxc_conf, ...@@ -4047,12 +3959,8 @@ static int clr_config_net_script_up(const char *key, struct lxc_conf *lxc_conf,
static int clr_config_net_script_down(const char *key, static int clr_config_net_script_down(const char *key,
struct lxc_conf *lxc_conf, void *data) struct lxc_conf *lxc_conf, void *data)
{ {
struct lxc_netdev *netdev; struct lxc_netdev *netdev = data;
if (!data)
return -1;
else
netdev = data;
if (!netdev) if (!netdev)
return -1; return -1;
...@@ -4065,12 +3973,8 @@ static int clr_config_net_script_down(const char *key, ...@@ -4065,12 +3973,8 @@ static int clr_config_net_script_down(const char *key,
static int clr_config_net_hwaddr(const char *key, struct lxc_conf *lxc_conf, static int clr_config_net_hwaddr(const char *key, struct lxc_conf *lxc_conf,
void *data) void *data)
{ {
struct lxc_netdev *netdev; struct lxc_netdev *netdev = data;
if (!data)
return -1;
else
netdev = data;
if (!netdev) if (!netdev)
return -1; return -1;
...@@ -4083,12 +3987,8 @@ static int clr_config_net_hwaddr(const char *key, struct lxc_conf *lxc_conf, ...@@ -4083,12 +3987,8 @@ static int clr_config_net_hwaddr(const char *key, struct lxc_conf *lxc_conf,
static int clr_config_net_mtu(const char *key, struct lxc_conf *lxc_conf, static int clr_config_net_mtu(const char *key, struct lxc_conf *lxc_conf,
void *data) void *data)
{ {
struct lxc_netdev *netdev; struct lxc_netdev *netdev = data;
if (!data)
return -1;
else
netdev = data;
if (!netdev) if (!netdev)
return -1; return -1;
...@@ -4101,12 +4001,8 @@ static int clr_config_net_mtu(const char *key, struct lxc_conf *lxc_conf, ...@@ -4101,12 +4001,8 @@ static int clr_config_net_mtu(const char *key, struct lxc_conf *lxc_conf,
static int clr_config_net_vlan_id(const char *key, struct lxc_conf *lxc_conf, static int clr_config_net_vlan_id(const char *key, struct lxc_conf *lxc_conf,
void *data) void *data)
{ {
struct lxc_netdev *netdev; struct lxc_netdev *netdev = data;
if (!data)
return -1;
else
netdev = data;
if (!netdev) if (!netdev)
return -1; return -1;
...@@ -4118,12 +4014,8 @@ static int clr_config_net_vlan_id(const char *key, struct lxc_conf *lxc_conf, ...@@ -4118,12 +4014,8 @@ static int clr_config_net_vlan_id(const char *key, struct lxc_conf *lxc_conf,
static int clr_config_net_ipv4_gateway(const char *key, static int clr_config_net_ipv4_gateway(const char *key,
struct lxc_conf *lxc_conf, void *data) struct lxc_conf *lxc_conf, void *data)
{ {
struct lxc_netdev *netdev; struct lxc_netdev *netdev = data;
if (!data)
return -1;
else
netdev = data;
if (!netdev) if (!netdev)
return -1; return -1;
...@@ -4136,13 +4028,9 @@ static int clr_config_net_ipv4_gateway(const char *key, ...@@ -4136,13 +4028,9 @@ static int clr_config_net_ipv4_gateway(const char *key,
static int clr_config_net_ipv4_address(const char *key, static int clr_config_net_ipv4_address(const char *key,
struct lxc_conf *lxc_conf, void *data) struct lxc_conf *lxc_conf, void *data)
{ {
struct lxc_netdev *netdev; struct lxc_netdev *netdev = data;
struct lxc_list *cur, *next; struct lxc_list *cur, *next;
if (!data)
return -1;
else
netdev = data;
if (!netdev) if (!netdev)
return -1; return -1;
...@@ -4158,12 +4046,8 @@ static int clr_config_net_ipv4_address(const char *key, ...@@ -4158,12 +4046,8 @@ static int clr_config_net_ipv4_address(const char *key,
static int clr_config_net_ipv6_gateway(const char *key, static int clr_config_net_ipv6_gateway(const char *key,
struct lxc_conf *lxc_conf, void *data) struct lxc_conf *lxc_conf, void *data)
{ {
struct lxc_netdev *netdev; struct lxc_netdev *netdev = data;
if (!data)
return -1;
else
netdev = data;
if (!netdev) if (!netdev)
return -1; return -1;
...@@ -4176,13 +4060,9 @@ static int clr_config_net_ipv6_gateway(const char *key, ...@@ -4176,13 +4060,9 @@ static int clr_config_net_ipv6_gateway(const char *key,
static int clr_config_net_ipv6_address(const char *key, static int clr_config_net_ipv6_address(const char *key,
struct lxc_conf *lxc_conf, void *data) struct lxc_conf *lxc_conf, void *data)
{ {
struct lxc_netdev *netdev; struct lxc_netdev *netdev = data;
struct lxc_list *cur, *next; struct lxc_list *cur, *next;
if (!data)
return -1;
else
netdev = data;
if (!netdev) if (!netdev)
return -1; return -1;
...@@ -4227,18 +4107,15 @@ static int get_config_net_nic(const char *key, char *retv, int inlen, ...@@ -4227,18 +4107,15 @@ static int get_config_net_nic(const char *key, char *retv, int inlen,
static int get_config_net_type(const char *key, char *retv, int inlen, static int get_config_net_type(const char *key, char *retv, int inlen,
struct lxc_conf *c, void *data) struct lxc_conf *c, void *data)
{ {
int len, fulllen = 0; int len;
struct lxc_netdev *netdev; int fulllen = 0;
struct lxc_netdev *netdev = data;
if (!retv) if (!retv)
inlen = 0; inlen = 0;
else else
memset(retv, 0, inlen); memset(retv, 0, inlen);
if (!data)
return -1;
else
netdev = data;
if (!netdev) if (!netdev)
return -1; return -1;
...@@ -4250,18 +4127,15 @@ static int get_config_net_type(const char *key, char *retv, int inlen, ...@@ -4250,18 +4127,15 @@ static int get_config_net_type(const char *key, char *retv, int inlen,
static int get_config_net_flags(const char *key, char *retv, int inlen, static int get_config_net_flags(const char *key, char *retv, int inlen,
struct lxc_conf *c, void *data) struct lxc_conf *c, void *data)
{ {
int len, fulllen = 0; int len;
struct lxc_netdev *netdev; int fulllen = 0;
struct lxc_netdev *netdev = data;
if (!retv) if (!retv)
inlen = 0; inlen = 0;
else else
memset(retv, 0, inlen); memset(retv, 0, inlen);
if (!data)
return -1;
else
netdev = data;
if (!netdev) if (!netdev)
return -1; return -1;
...@@ -4274,18 +4148,15 @@ static int get_config_net_flags(const char *key, char *retv, int inlen, ...@@ -4274,18 +4148,15 @@ static int get_config_net_flags(const char *key, char *retv, int inlen,
static int get_config_net_link(const char *key, char *retv, int inlen, static int get_config_net_link(const char *key, char *retv, int inlen,
struct lxc_conf *c, void *data) struct lxc_conf *c, void *data)
{ {
int len, fulllen = 0; int len;
struct lxc_netdev *netdev; int fulllen = 0;
struct lxc_netdev *netdev = data;
if (!retv) if (!retv)
inlen = 0; inlen = 0;
else else
memset(retv, 0, inlen); memset(retv, 0, inlen);
if (!data)
return -1;
else
netdev = data;
if (!netdev) if (!netdev)
return -1; return -1;
...@@ -4298,18 +4169,15 @@ static int get_config_net_link(const char *key, char *retv, int inlen, ...@@ -4298,18 +4169,15 @@ static int get_config_net_link(const char *key, char *retv, int inlen,
static int get_config_net_name(const char *key, char *retv, int inlen, static int get_config_net_name(const char *key, char *retv, int inlen,
struct lxc_conf *c, void *data) struct lxc_conf *c, void *data)
{ {
int len, fulllen = 0; int len;
struct lxc_netdev *netdev; int fulllen = 0;
struct lxc_netdev *netdev = data;
if (!retv) if (!retv)
inlen = 0; inlen = 0;
else else
memset(retv, 0, inlen); memset(retv, 0, inlen);
if (!data)
return -1;
else
netdev = data;
if (!netdev) if (!netdev)
return -1; return -1;
...@@ -4322,19 +4190,16 @@ static int get_config_net_name(const char *key, char *retv, int inlen, ...@@ -4322,19 +4190,16 @@ static int get_config_net_name(const char *key, char *retv, int inlen,
static int get_config_net_macvlan_mode(const char *key, char *retv, int inlen, static int get_config_net_macvlan_mode(const char *key, char *retv, int inlen,
struct lxc_conf *c, void *data) struct lxc_conf *c, void *data)
{ {
int len;
int fulllen = 0;
const char *mode; const char *mode;
int len, fulllen = 0; struct lxc_netdev *netdev = data;
struct lxc_netdev *netdev;
if (!retv) if (!retv)
inlen = 0; inlen = 0;
else else
memset(retv, 0, inlen); memset(retv, 0, inlen);
if (!data)
return -1;
else
netdev = data;
if (!netdev) if (!netdev)
return -1; return -1;
...@@ -4367,18 +4232,15 @@ static int get_config_net_macvlan_mode(const char *key, char *retv, int inlen, ...@@ -4367,18 +4232,15 @@ static int get_config_net_macvlan_mode(const char *key, char *retv, int inlen,
static int get_config_net_veth_pair(const char *key, char *retv, int inlen, static int get_config_net_veth_pair(const char *key, char *retv, int inlen,
struct lxc_conf *c, void *data) struct lxc_conf *c, void *data)
{ {
int len, fulllen = 0; int len;
struct lxc_netdev *netdev; int fulllen = 0;
struct lxc_netdev *netdev = data;
if (!retv) if (!retv)
inlen = 0; inlen = 0;
else else
memset(retv, 0, inlen); memset(retv, 0, inlen);
if (!data)
return -1;
else
netdev = data;
if (!netdev) if (!netdev)
return -1; return -1;
...@@ -4396,18 +4258,15 @@ static int get_config_net_veth_pair(const char *key, char *retv, int inlen, ...@@ -4396,18 +4258,15 @@ static int get_config_net_veth_pair(const char *key, char *retv, int inlen,
static int get_config_net_script_up(const char *key, char *retv, int inlen, static int get_config_net_script_up(const char *key, char *retv, int inlen,
struct lxc_conf *c, void *data) struct lxc_conf *c, void *data)
{ {
int len, fulllen = 0; int len;
struct lxc_netdev *netdev; int fulllen = 0;
struct lxc_netdev *netdev = data;
if (!retv) if (!retv)
inlen = 0; inlen = 0;
else else
memset(retv, 0, inlen); memset(retv, 0, inlen);
if (!data)
return -1;
else
netdev = data;
if (!netdev) if (!netdev)
return -1; return -1;
...@@ -4420,18 +4279,15 @@ static int get_config_net_script_up(const char *key, char *retv, int inlen, ...@@ -4420,18 +4279,15 @@ static int get_config_net_script_up(const char *key, char *retv, int inlen,
static int get_config_net_script_down(const char *key, char *retv, int inlen, static int get_config_net_script_down(const char *key, char *retv, int inlen,
struct lxc_conf *c, void *data) struct lxc_conf *c, void *data)
{ {
int len, fulllen = 0; int len;
struct lxc_netdev *netdev; int fulllen = 0;
struct lxc_netdev *netdev = data;
if (!retv) if (!retv)
inlen = 0; inlen = 0;
else else
memset(retv, 0, inlen); memset(retv, 0, inlen);
if (!data)
return -1;
else
netdev = data;
if (!netdev) if (!netdev)
return -1; return -1;
...@@ -4444,18 +4300,15 @@ static int get_config_net_script_down(const char *key, char *retv, int inlen, ...@@ -4444,18 +4300,15 @@ static int get_config_net_script_down(const char *key, char *retv, int inlen,
static int get_config_net_hwaddr(const char *key, char *retv, int inlen, static int get_config_net_hwaddr(const char *key, char *retv, int inlen,
struct lxc_conf *c, void *data) struct lxc_conf *c, void *data)
{ {
int len, fulllen = 0; int len;
struct lxc_netdev *netdev; int fulllen = 0;
struct lxc_netdev *netdev = data;
if (!retv) if (!retv)
inlen = 0; inlen = 0;
else else
memset(retv, 0, inlen); memset(retv, 0, inlen);
if (!data)
return -1;
else
netdev = data;
if (!netdev) if (!netdev)
return -1; return -1;
...@@ -4468,18 +4321,15 @@ static int get_config_net_hwaddr(const char *key, char *retv, int inlen, ...@@ -4468,18 +4321,15 @@ static int get_config_net_hwaddr(const char *key, char *retv, int inlen,
static int get_config_net_mtu(const char *key, char *retv, int inlen, static int get_config_net_mtu(const char *key, char *retv, int inlen,
struct lxc_conf *c, void *data) struct lxc_conf *c, void *data)
{ {
int len, fulllen = 0; int len;
struct lxc_netdev *netdev; int fulllen = 0;
struct lxc_netdev *netdev = data;
if (!retv) if (!retv)
inlen = 0; inlen = 0;
else else
memset(retv, 0, inlen); memset(retv, 0, inlen);
if (!data)
return -1;
else
netdev = data;
if (!netdev) if (!netdev)
return -1; return -1;
...@@ -4492,18 +4342,15 @@ static int get_config_net_mtu(const char *key, char *retv, int inlen, ...@@ -4492,18 +4342,15 @@ static int get_config_net_mtu(const char *key, char *retv, int inlen,
static int get_config_net_vlan_id(const char *key, char *retv, int inlen, static int get_config_net_vlan_id(const char *key, char *retv, int inlen,
struct lxc_conf *c, void *data) struct lxc_conf *c, void *data)
{ {
int len, fulllen = 0; int len;
struct lxc_netdev *netdev; int fulllen = 0;
struct lxc_netdev *netdev = data;
if (!retv) if (!retv)
inlen = 0; inlen = 0;
else else
memset(retv, 0, inlen); memset(retv, 0, inlen);
if (!data)
return -1;
else
netdev = data;
if (!netdev) if (!netdev)
return -1; return -1;
...@@ -4518,19 +4365,16 @@ static int get_config_net_vlan_id(const char *key, char *retv, int inlen, ...@@ -4518,19 +4365,16 @@ static int get_config_net_vlan_id(const char *key, char *retv, int inlen,
static int get_config_net_ipv4_gateway(const char *key, char *retv, int inlen, static int get_config_net_ipv4_gateway(const char *key, char *retv, int inlen,
struct lxc_conf *c, void *data) struct lxc_conf *c, void *data)
{ {
int len, fulllen = 0; int len;
char buf[INET_ADDRSTRLEN]; char buf[INET_ADDRSTRLEN];
struct lxc_netdev *netdev; int fulllen = 0;
struct lxc_netdev *netdev = data;
if (!retv) if (!retv)
inlen = 0; inlen = 0;
else else
memset(retv, 0, inlen); memset(retv, 0, inlen);
if (!data)
return -1;
else
netdev = data;
if (!netdev) if (!netdev)
return -1; return -1;
...@@ -4547,21 +4391,18 @@ static int get_config_net_ipv4_gateway(const char *key, char *retv, int inlen, ...@@ -4547,21 +4391,18 @@ static int get_config_net_ipv4_gateway(const char *key, char *retv, int inlen,
static int get_config_net_ipv4_address(const char *key, char *retv, int inlen, static int get_config_net_ipv4_address(const char *key, char *retv, int inlen,
struct lxc_conf *c, void *data) struct lxc_conf *c, void *data)
{ {
int len, fulllen = 0; int len;
size_t listlen; size_t listlen;
char buf[INET_ADDRSTRLEN]; char buf[INET_ADDRSTRLEN];
struct lxc_netdev *netdev;
struct lxc_list *it; struct lxc_list *it;
int fulllen = 0;
struct lxc_netdev *netdev = data;
if (!retv) if (!retv)
inlen = 0; inlen = 0;
else else
memset(retv, 0, inlen); memset(retv, 0, inlen);
if (!data)
return -1;
else
netdev = data;
if (!netdev) if (!netdev)
return -1; return -1;
...@@ -4579,19 +4420,16 @@ static int get_config_net_ipv4_address(const char *key, char *retv, int inlen, ...@@ -4579,19 +4420,16 @@ static int get_config_net_ipv4_address(const char *key, char *retv, int inlen,
static int get_config_net_ipv6_gateway(const char *key, char *retv, int inlen, static int get_config_net_ipv6_gateway(const char *key, char *retv, int inlen,
struct lxc_conf *c, void *data) struct lxc_conf *c, void *data)
{ {
int len, fulllen = 0; int len;
char buf[INET6_ADDRSTRLEN]; char buf[INET6_ADDRSTRLEN];
struct lxc_netdev *netdev; int fulllen = 0;
struct lxc_netdev *netdev = data;
if (!retv) if (!retv)
inlen = 0; inlen = 0;
else else
memset(retv, 0, inlen); memset(retv, 0, inlen);
if (!data)
return -1;
else
netdev = data;
if (!netdev) if (!netdev)
return -1; return -1;
...@@ -4608,21 +4446,18 @@ static int get_config_net_ipv6_gateway(const char *key, char *retv, int inlen, ...@@ -4608,21 +4446,18 @@ static int get_config_net_ipv6_gateway(const char *key, char *retv, int inlen,
static int get_config_net_ipv6_address(const char *key, char *retv, int inlen, static int get_config_net_ipv6_address(const char *key, char *retv, int inlen,
struct lxc_conf *c, void *data) struct lxc_conf *c, void *data)
{ {
int len, fulllen = 0; int len;
size_t listlen; size_t listlen;
char buf[INET6_ADDRSTRLEN]; char buf[INET6_ADDRSTRLEN];
struct lxc_netdev *netdev;
struct lxc_list *it; struct lxc_list *it;
int fulllen = 0;
struct lxc_netdev *netdev = data;
if (!retv) if (!retv)
inlen = 0; inlen = 0;
else else
memset(retv, 0, inlen); memset(retv, 0, inlen);
if (!data)
return -1;
else
netdev = data;
if (!netdev) if (!netdev)
return -1; return -1;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment