Skip to content

L
lxc
Unverified Commit 21fce08c by Christian Brauner
Options

confile: replace logging helpers

Signed-off-by: 's avatarChristian Brauner <christian.brauner@ubuntu.com>
parent 596a002c
Showing with 36 additions and 36 deletions
src/lxc/confile.c
...@@ -401,11 +401,11 @@ static int set_config_net_l2proxy(const char *key, const char *value, ...@@ -401,11 +401,11 @@ static int set_config_net_l2proxy(const char *key, const char *value,
return clr_config_net_l2proxy(key, lxc_conf, data); return clr_config_net_l2proxy(key, lxc_conf, data);
if (!netdev) if (!netdev)
return minus_one_set_errno(EINVAL); return ret_set_errno(-1, EINVAL);
ret = lxc_safe_uint(value, &val); ret = lxc_safe_uint(value, &val);
if (ret < 0) if (ret < 0)
return minus_one_set_errno(-ret); return ret_set_errno(-1, -ret);
switch (val) { switch (val) {
case 0: case 0:
...@@ -416,7 +416,7 @@ static int set_config_net_l2proxy(const char *key, const char *value, ...@@ -416,7 +416,7 @@ static int set_config_net_l2proxy(const char *key, const char *value,
return 0; return 0;
} }
return minus_one_set_errno(EINVAL); return ret_set_errno(-1, EINVAL);
} }
static int set_config_net_name(const char *key, const char *value, static int set_config_net_name(const char *key, const char *value,
...@@ -485,11 +485,11 @@ static int set_config_net_ipvlan_mode(const char *key, const char *value, ...@@ -485,11 +485,11 @@ static int set_config_net_ipvlan_mode(const char *key, const char *value,
return clr_config_net_ipvlan_mode(key, lxc_conf, data); return clr_config_net_ipvlan_mode(key, lxc_conf, data);
if (!netdev) if (!netdev)
return minus_one_set_errno(EINVAL); return ret_set_errno(-1, EINVAL);
if (netdev->type != LXC_NET_IPVLAN) { if (netdev->type != LXC_NET_IPVLAN) {
SYSERROR("Invalid ipvlan mode \"%s\", can only be used with ipvlan network", value); SYSERROR("Invalid ipvlan mode \"%s\", can only be used with ipvlan network", value);
return minus_one_set_errno(EINVAL); return ret_set_errno(-1, EINVAL);
} }
return lxc_ipvlan_mode_to_flag(&netdev->priv.ipvlan_attr.mode, value); return lxc_ipvlan_mode_to_flag(&netdev->priv.ipvlan_attr.mode, value);
...@@ -504,11 +504,11 @@ static int set_config_net_ipvlan_isolation(const char *key, const char *value, ...@@ -504,11 +504,11 @@ static int set_config_net_ipvlan_isolation(const char *key, const char *value,
return clr_config_net_ipvlan_isolation(key, lxc_conf, data); return clr_config_net_ipvlan_isolation(key, lxc_conf, data);
if (!netdev) if (!netdev)
return minus_one_set_errno(EINVAL); return ret_set_errno(-1, EINVAL);
if (netdev->type != LXC_NET_IPVLAN) { if (netdev->type != LXC_NET_IPVLAN) {
SYSERROR("Invalid ipvlan isolation \"%s\", can only be used with ipvlan network", value); SYSERROR("Invalid ipvlan isolation \"%s\", can only be used with ipvlan network", value);
return minus_one_set_errno(EINVAL); return ret_set_errno(-1, EINVAL);
} }
return lxc_ipvlan_isolation_to_flag(&netdev->priv.ipvlan_attr.isolation, value); return lxc_ipvlan_isolation_to_flag(&netdev->priv.ipvlan_attr.isolation, value);
...@@ -729,11 +729,11 @@ static int set_config_net_veth_ipv4_route(const char *key, const char *value, ...@@ -729,11 +729,11 @@ static int set_config_net_veth_ipv4_route(const char *key, const char *value,
return clr_config_net_veth_ipv4_route(key, lxc_conf, data); return clr_config_net_veth_ipv4_route(key, lxc_conf, data);
if (!netdev) if (!netdev)
return minus_one_set_errno(EINVAL); return ret_set_errno(-1, EINVAL);
if (netdev->type != LXC_NET_VETH) { if (netdev->type != LXC_NET_VETH) {
SYSERROR("Invalid ipv4 route \"%s\", can only be used with veth network", value); SYSERROR("Invalid ipv4 route \"%s\", can only be used with veth network", value);
return minus_one_set_errno(EINVAL); return ret_set_errno(-1, EINVAL);
} }
inetdev = malloc(sizeof(*inetdev)); inetdev = malloc(sizeof(*inetdev));
...@@ -754,22 +754,22 @@ static int set_config_net_veth_ipv4_route(const char *key, const char *value, ...@@ -754,22 +754,22 @@ static int set_config_net_veth_ipv4_route(const char *key, const char *value,
slash = strchr(valdup, '/'); slash = strchr(valdup, '/');
if (!slash) if (!slash)
return minus_one_set_errno(EINVAL); return ret_set_errno(-1, EINVAL);
*slash = '\0'; *slash = '\0';
slash++; slash++;
if (*slash == '\0') if (*slash == '\0')
return minus_one_set_errno(EINVAL); return ret_set_errno(-1, EINVAL);
netmask = slash; netmask = slash;
ret = lxc_safe_uint(netmask, &inetdev->prefix); ret = lxc_safe_uint(netmask, &inetdev->prefix);
if (ret < 0 || inetdev->prefix > 32) if (ret < 0 || inetdev->prefix > 32)
return minus_one_set_errno(EINVAL); return ret_set_errno(-1, EINVAL);
ret = inet_pton(AF_INET, valdup, &inetdev->addr); ret = inet_pton(AF_INET, valdup, &inetdev->addr);
if (!ret || ret < 0) if (!ret || ret < 0)
return minus_one_set_errno(EINVAL); return ret_set_errno(-1, EINVAL);
lxc_list_add_tail(&netdev->priv.veth_attr.ipv4_routes, list); lxc_list_add_tail(&netdev->priv.veth_attr.ipv4_routes, list);
move_ptr(inetdev); move_ptr(inetdev);
...@@ -900,11 +900,11 @@ static int set_config_net_veth_ipv6_route(const char *key, const char *value, ...@@ -900,11 +900,11 @@ static int set_config_net_veth_ipv6_route(const char *key, const char *value,
return clr_config_net_veth_ipv6_route(key, lxc_conf, data); return clr_config_net_veth_ipv6_route(key, lxc_conf, data);
if (!netdev) if (!netdev)
return minus_one_set_errno(EINVAL); return ret_set_errno(-1, EINVAL);
if (netdev->type != LXC_NET_VETH) { if (netdev->type != LXC_NET_VETH) {
SYSERROR("Invalid ipv6 route \"%s\", can only be used with veth network", value); SYSERROR("Invalid ipv6 route \"%s\", can only be used with veth network", value);
return minus_one_set_errno(EINVAL); return ret_set_errno(-1, EINVAL);
} }
inet6dev = malloc(sizeof(*inet6dev)); inet6dev = malloc(sizeof(*inet6dev));
...@@ -925,22 +925,22 @@ static int set_config_net_veth_ipv6_route(const char *key, const char *value, ...@@ -925,22 +925,22 @@ static int set_config_net_veth_ipv6_route(const char *key, const char *value,
slash = strchr(valdup, '/'); slash = strchr(valdup, '/');
if (!slash) if (!slash)
return minus_one_set_errno(EINVAL); return ret_set_errno(-1, EINVAL);
*slash = '\0'; *slash = '\0';
slash++; slash++;
if (*slash == '\0') if (*slash == '\0')
return minus_one_set_errno(EINVAL); return ret_set_errno(-1, EINVAL);
netmask = slash; netmask = slash;
ret = lxc_safe_uint(netmask, &inet6dev->prefix); ret = lxc_safe_uint(netmask, &inet6dev->prefix);
if (ret < 0 || inet6dev->prefix > 128) if (ret < 0 || inet6dev->prefix > 128)
return minus_one_set_errno(EINVAL); return ret_set_errno(-1, EINVAL);
ret = inet_pton(AF_INET6, valdup, &inet6dev->addr); ret = inet_pton(AF_INET6, valdup, &inet6dev->addr);
if (!ret || ret < 0) if (!ret || ret < 0)
return minus_one_set_errno(EINVAL); return ret_set_errno(-1, EINVAL);
lxc_list_add_tail(&netdev->priv.veth_attr.ipv6_routes, list); lxc_list_add_tail(&netdev->priv.veth_attr.ipv6_routes, list);
move_ptr(inet6dev); move_ptr(inet6dev);
...@@ -1004,7 +1004,7 @@ static int set_config_seccomp_allow_nesting(const char *key, const char *value, ...@@ -1004,7 +1004,7 @@ static int set_config_seccomp_allow_nesting(const char *key, const char *value,
return -1; return -1;
if (lxc_conf->seccomp.allow_nesting > 1) if (lxc_conf->seccomp.allow_nesting > 1)
return minus_one_set_errno(EINVAL); return ret_set_errno(-1, EINVAL);
return 0; return 0;
#else #else
...@@ -1019,7 +1019,7 @@ static int set_config_seccomp_notify_cookie(const char *key, const char *value, ...@@ -1019,7 +1019,7 @@ static int set_config_seccomp_notify_cookie(const char *key, const char *value,
#ifdef HAVE_SECCOMP_NOTIFY #ifdef HAVE_SECCOMP_NOTIFY
return set_config_string_item(&lxc_conf->seccomp.notifier.cookie, value); return set_config_string_item(&lxc_conf->seccomp.notifier.cookie, value);
#else #else
return minus_one_set_errno(ENOSYS); return ret_set_errno(-1, ENOSYS);
#endif #endif
} }
...@@ -1033,7 +1033,7 @@ static int set_config_seccomp_notify_proxy(const char *key, const char *value, ...@@ -1033,7 +1033,7 @@ static int set_config_seccomp_notify_proxy(const char *key, const char *value,
return clr_config_seccomp_notify_proxy(key, lxc_conf, NULL); return clr_config_seccomp_notify_proxy(key, lxc_conf, NULL);
if (strncmp(value, "unix:", 5) != 0) if (strncmp(value, "unix:", 5) != 0)
return minus_one_set_errno(EINVAL); return ret_set_errno(-1, EINVAL);
offset = value + 5; offset = value + 5;
if (lxc_unix_sockaddr(&lxc_conf->seccomp.notifier.proxy_addr, offset) < 0) if (lxc_unix_sockaddr(&lxc_conf->seccomp.notifier.proxy_addr, offset) < 0)
...@@ -1041,7 +1041,7 @@ static int set_config_seccomp_notify_proxy(const char *key, const char *value, ...@@ -1041,7 +1041,7 @@ static int set_config_seccomp_notify_proxy(const char *key, const char *value,
return 0; return 0;
#else #else
return minus_one_set_errno(ENOSYS); return ret_set_errno(-1, ENOSYS);
#endif #endif
} }
...@@ -3985,7 +3985,7 @@ static int get_config_seccomp_notify_cookie(const char *key, char *retv, int inl ...@@ -3985,7 +3985,7 @@ static int get_config_seccomp_notify_cookie(const char *key, char *retv, int inl
#ifdef HAVE_SECCOMP_NOTIFY #ifdef HAVE_SECCOMP_NOTIFY
return lxc_get_conf_str(retv, inlen, c->seccomp.notifier.cookie); return lxc_get_conf_str(retv, inlen, c->seccomp.notifier.cookie);
#else #else
return minus_one_set_errno(ENOSYS); return ret_set_errno(-1, ENOSYS);
#endif #endif
} }
...@@ -3998,7 +3998,7 @@ static int get_config_seccomp_notify_proxy(const char *key, char *retv, int inle ...@@ -3998,7 +3998,7 @@ static int get_config_seccomp_notify_proxy(const char *key, char *retv, int inle
? &c->seccomp.notifier.proxy_addr.sun_path[0] ? &c->seccomp.notifier.proxy_addr.sun_path[0]
: &c->seccomp.notifier.proxy_addr.sun_path[1]); : &c->seccomp.notifier.proxy_addr.sun_path[1]);
#else #else
return minus_one_set_errno(ENOSYS); return ret_set_errno(-1, ENOSYS);
#endif #endif
} }
...@@ -4611,7 +4611,7 @@ static inline int clr_config_seccomp_notify_cookie(const char *key, ...@@ -4611,7 +4611,7 @@ static inline int clr_config_seccomp_notify_cookie(const char *key,
c->seccomp.notifier.cookie = NULL; c->seccomp.notifier.cookie = NULL;
return 0; return 0;
#else #else
return minus_one_set_errno(ENOSYS); return ret_set_errno(-1, ENOSYS);
#endif #endif
} }
...@@ -4623,7 +4623,7 @@ static inline int clr_config_seccomp_notify_proxy(const char *key, ...@@ -4623,7 +4623,7 @@ static inline int clr_config_seccomp_notify_proxy(const char *key,
sizeof(c->seccomp.notifier.proxy_addr)); sizeof(c->seccomp.notifier.proxy_addr));
return 0; return 0;
#else #else
return minus_one_set_errno(ENOSYS); return ret_set_errno(-1, ENOSYS);
#endif #endif
} }
...@@ -5064,7 +5064,7 @@ static int clr_config_net_l2proxy(const char *key, struct lxc_conf *lxc_conf, ...@@ -5064,7 +5064,7 @@ static int clr_config_net_l2proxy(const char *key, struct lxc_conf *lxc_conf,
struct lxc_netdev *netdev = data; struct lxc_netdev *netdev = data;
if (!netdev) if (!netdev)
return minus_one_set_errno(EINVAL); return ret_set_errno(-1, EINVAL);
netdev->l2proxy = false; netdev->l2proxy = false;
...@@ -5093,7 +5093,7 @@ static int clr_config_net_ipvlan_mode(const char *key, ...@@ -5093,7 +5093,7 @@ static int clr_config_net_ipvlan_mode(const char *key,
struct lxc_netdev *netdev = data; struct lxc_netdev *netdev = data;
if (!netdev) if (!netdev)
return minus_one_set_errno(EINVAL); return ret_set_errno(-1, EINVAL);
if (netdev->type != LXC_NET_IPVLAN) if (netdev->type != LXC_NET_IPVLAN)
return 0; return 0;
...@@ -5109,7 +5109,7 @@ static int clr_config_net_ipvlan_isolation(const char *key, ...@@ -5109,7 +5109,7 @@ static int clr_config_net_ipvlan_isolation(const char *key,
struct lxc_netdev *netdev = data; struct lxc_netdev *netdev = data;
if (!netdev) if (!netdev)
return minus_one_set_errno(EINVAL); return ret_set_errno(-1, EINVAL);
if (netdev->type != LXC_NET_IPVLAN) if (netdev->type != LXC_NET_IPVLAN)
return 0; return 0;
...@@ -5125,7 +5125,7 @@ static int clr_config_net_veth_mode(const char *key, ...@@ -5125,7 +5125,7 @@ static int clr_config_net_veth_mode(const char *key,
struct lxc_netdev *netdev = data; struct lxc_netdev *netdev = data;
if (!netdev) if (!netdev)
return minus_one_set_errno(EINVAL); return ret_set_errno(-1, EINVAL);
if (netdev->type != LXC_NET_VETH) if (netdev->type != LXC_NET_VETH)
return 0; return 0;
...@@ -5493,7 +5493,7 @@ static int get_config_net_ipvlan_mode(const char *key, char *retv, int inlen, ...@@ -5493,7 +5493,7 @@ static int get_config_net_ipvlan_mode(const char *key, char *retv, int inlen,
memset(retv, 0, inlen); memset(retv, 0, inlen);
if (!netdev) if (!netdev)
return minus_one_set_errno(EINVAL); return ret_set_errno(-1, EINVAL);
if (netdev->type != LXC_NET_IPVLAN) if (netdev->type != LXC_NET_IPVLAN)
return 0; return 0;
...@@ -5532,7 +5532,7 @@ static int get_config_net_ipvlan_isolation(const char *key, char *retv, int inle ...@@ -5532,7 +5532,7 @@ static int get_config_net_ipvlan_isolation(const char *key, char *retv, int inle
memset(retv, 0, inlen); memset(retv, 0, inlen);
if (!netdev) if (!netdev)
return minus_one_set_errno(EINVAL); return ret_set_errno(-1, EINVAL);
if (netdev->type != LXC_NET_IPVLAN) if (netdev->type != LXC_NET_IPVLAN)
return 0; return 0;
...@@ -5571,7 +5571,7 @@ static int get_config_net_veth_mode(const char *key, char *retv, int inlen, ...@@ -5571,7 +5571,7 @@ static int get_config_net_veth_mode(const char *key, char *retv, int inlen,
memset(retv, 0, inlen); memset(retv, 0, inlen);
if (!netdev) if (!netdev)
return minus_one_set_errno(EINVAL); return ret_set_errno(-1, EINVAL);
if (netdev->type != LXC_NET_VETH) if (netdev->type != LXC_NET_VETH)
return 0; return 0;
...@@ -5800,7 +5800,7 @@ static int get_config_net_veth_ipv4_route(const char *key, char *retv, int inlen ...@@ -5800,7 +5800,7 @@ static int get_config_net_veth_ipv4_route(const char *key, char *retv, int inlen
memset(retv, 0, inlen); memset(retv, 0, inlen);
if (!netdev) if (!netdev)
return minus_one_set_errno(EINVAL); return ret_set_errno(-1, EINVAL);
if (netdev->type != LXC_NET_VETH) if (netdev->type != LXC_NET_VETH)
return 0; return 0;
...@@ -5891,7 +5891,7 @@ static int get_config_net_veth_ipv6_route(const char *key, char *retv, int inlen ...@@ -5891,7 +5891,7 @@ static int get_config_net_veth_ipv6_route(const char *key, char *retv, int inlen
memset(retv, 0, inlen); memset(retv, 0, inlen);
if (!netdev) if (!netdev)
return minus_one_set_errno(EINVAL); return ret_set_errno(-1, EINVAL);
if (netdev->type != LXC_NET_VETH) if (netdev->type != LXC_NET_VETH)
return 0; return 0;
......
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