SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tree-wide: use ASSERT_PTR more

Browse Source
This commit is contained in:
David Tardon
2022-09-13 08:13:27 +02:00
parent 6d64cb0625
commit 995340074e
220 changed files with 1071 additions and 2323 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/network/generator/network-generator.c
+1 -2
View File
@@ -1004,10 +1004,9 @@ static int parse_cmdline_ifname_policy(Context *context, const char *key, const
}
int parse_cmdline_item(const char *key, const char *value, void *data) {
Context *context = data;
Context *context = ASSERT_PTR(data);
assert(key);
assert(data);
if (streq(key, "ip"))
return parse_cmdline_ip(context, key, value);
src/network/netdev/fou-tunnel.c
+2 -4
View File
@@ -157,7 +157,7 @@ int config_parse_ip_protocol(
void *data,
void *userdata) {
uint8_t *ret = data;
uint8_t *ret = ASSERT_PTR(data);
unsigned protocol;
/* linux/fou.h defines the netlink field as one byte, so we need to reject protocols numbers that
* don't fit in one byte. */
@@ -167,7 +167,6 @@ int config_parse_ip_protocol(
assert(section);
assert(lvalue);
assert(rvalue);
assert(data);
r = parse_ip_protocol(rvalue);
if (r >= 0)
@@ -204,14 +203,13 @@ int config_parse_fou_tunnel_address(
void *data,
void *userdata) {
union in_addr_union *addr = data;
union in_addr_union *addr = ASSERT_PTR(data);
FouTunnel *t = userdata;
int r, *f;
assert(filename);
assert(lvalue);
assert(rvalue);
assert(data);
if (streq(lvalue, "Local"))
f = &t->local_family;
src/network/netdev/ipoib.c
+1 -2
View File
@@ -119,13 +119,12 @@ int config_parse_ipoib_pkey(
void *data,
void *userdata) {
uint16_t u, *pkey = data;
uint16_t u, *pkey = ASSERT_PTR(data);
int r;
assert(filename);
assert(lvalue);
assert(rvalue);
assert(data);
if (isempty(rvalue)) {
*pkey = 0; /* 0 means unset. */
src/network/netdev/l2tp-tunnel.c
+3 -6
View File
@@ -481,15 +481,13 @@ int config_parse_l2tp_tunnel_local_address(
_cleanup_free_ char *addr_or_type = NULL, *ifname = NULL;
L2tpLocalAddressType type;
L2tpTunnel *t = userdata;
const char *p = rvalue;
L2tpTunnel *t = ASSERT_PTR(userdata);
const char *p = ASSERT_PTR(rvalue);
union in_addr_union a;
int r, f;
assert(filename);
assert(lvalue);
assert(rvalue);
assert(t);
if (isempty(rvalue)) {
t->local_ifname = mfree(t->local_ifname);
@@ -575,14 +573,13 @@ int config_parse_l2tp_tunnel_remote_address(
void *data,
void *userdata) {
L2tpTunnel *t = userdata;
L2tpTunnel *t = ASSERT_PTR(userdata);
union in_addr_union a;
int r, f;
assert(filename);
assert(lvalue);
assert(rvalue);
assert(t);
if (isempty(rvalue)) {
t->remote = IN_ADDR_NULL;
src/network/netdev/macvlan.c
+1 -2
View File
@@ -84,7 +84,7 @@ int config_parse_macvlan_broadcast_queue_size(
void *data,
void *userdata) {
MacVlan *m = userdata;
MacVlan *m = ASSERT_PTR(userdata);
uint32_t v;
int r;
@@ -93,7 +93,6 @@ int config_parse_macvlan_broadcast_queue_size(
assert(lvalue);
assert(rvalue);
assert(data);
assert(userdata);
if (isempty(rvalue)) {
m->bc_queue_length = UINT32_MAX;
src/network/netdev/netdev.c
+2 -4
View File
@@ -902,11 +902,10 @@ int config_parse_netdev_kind(
void *data,
void *userdata) {
NetDevKind k, *kind = data;
NetDevKind k, *kind = ASSERT_PTR(data);
assert(filename);
assert(rvalue);
assert(data);
k = netdev_kind_from_string(rvalue);
if (k < 0) {
@@ -938,10 +937,9 @@ int config_parse_netdev_hw_addr(
void *data,
void *userdata) {
struct hw_addr_data *hw_addr = data;
struct hw_addr_data *hw_addr = ASSERT_PTR(data);
assert(rvalue);
assert(data);
if (streq(rvalue, "none")) {
*hw_addr = HW_ADDR_NONE;
src/network/netdev/tunnel.c
+2 -4
View File
@@ -778,13 +778,12 @@ int config_parse_tunnel_local_address(
union in_addr_union buffer = IN_ADDR_NULL;
NetDevLocalAddressType type;
Tunnel *t = userdata;
Tunnel *t = ASSERT_PTR(userdata);
int r, f;
assert(filename);
assert(lvalue);
assert(rvalue);
assert(userdata);
if (isempty(rvalue) || streq(rvalue, "any"))
return unset_local(t);
@@ -846,13 +845,12 @@ int config_parse_tunnel_remote_address(
void *userdata) {
union in_addr_union buffer;
Tunnel *t = userdata;
Tunnel *t = ASSERT_PTR(userdata);
int r, f;
assert(filename);
assert(lvalue);
assert(rvalue);
assert(userdata);
if (isempty(rvalue) || streq(rvalue, "any"))
return unset_remote(t);
src/network/netdev/vlan.c
+1 -2
View File
@@ -129,13 +129,12 @@ int config_parse_vlan_qos_maps(
void *data,
void *userdata) {
Set **s = data;
Set **s = ASSERT_PTR(data);
int r;
assert(filename);
assert(lvalue);
assert(rvalue);
assert(data);
if (isempty(rvalue)) {
*s = set_free(*s);
src/network/netdev/vxlan.c
+1 -2
View File
@@ -207,7 +207,7 @@ int config_parse_vxlan_address(
void *data,
void *userdata) {
VxLan *v = userdata;
VxLan *v = ASSERT_PTR(userdata);
union in_addr_union *addr = data, buffer;
int *family, f, r;
@@ -215,7 +215,6 @@ int config_parse_vxlan_address(
assert(lvalue);
assert(rvalue);
assert(data);
assert(userdata);
if (streq(lvalue, "Local"))
family = &v->local_family;
src/network/netdev/wireguard.c
+7 -14
View File
@@ -296,10 +296,9 @@ static int wireguard_set_interface(NetDev *netdev) {
}
static int on_resolve_retry(sd_event_source *s, usec_t usec, void *userdata) {
WireguardPeer *peer = userdata;
WireguardPeer *peer = ASSERT_PTR(userdata);
NetDev *netdev;
assert(peer);
assert(peer->wireguard);
netdev = NETDEV(peer->wireguard);
@@ -332,11 +331,10 @@ static int wireguard_peer_resolve_handler(
const struct addrinfo *ai,
void *userdata) {
WireguardPeer *peer = userdata;
WireguardPeer *peer = ASSERT_PTR(userdata);
NetDev *netdev;
int r;
assert(peer);
assert(peer->wireguard);
netdev = NETDEV(peer->wireguard);
@@ -462,11 +460,10 @@ int config_parse_wireguard_listen_port(
void *data,
void *userdata) {
uint16_t *s = data;
uint16_t *s = ASSERT_PTR(data);
int r;
assert(rvalue);
assert(data);
if (isempty(rvalue) || streq(rvalue, "auto")) {
*s = 0;
@@ -887,15 +884,13 @@ int config_parse_wireguard_route_table(
void *data,
void *userdata) {
NetDev *netdev = userdata;
uint32_t *table = data;
NetDev *netdev = ASSERT_PTR(userdata);
uint32_t *table = ASSERT_PTR(data);
int r;
assert(filename);
assert(lvalue);
assert(rvalue);
assert(data);
assert(userdata);
if (isempty(rvalue) || parse_boolean(rvalue) == 0) {
*table = 0; /* Disabled. */
@@ -926,14 +921,13 @@ int config_parse_wireguard_peer_route_table(
void *userdata) {
_cleanup_(wireguard_peer_free_or_set_invalidp) WireguardPeer *peer = NULL;
NetDev *netdev = userdata;
NetDev *netdev = ASSERT_PTR(userdata);
Wireguard *w;
int r;
assert(filename);
assert(lvalue);
assert(rvalue);
assert(netdev);
assert(netdev->manager);
w = WIREGUARD(netdev);
@@ -981,13 +975,12 @@ int config_parse_wireguard_route_priority(
void *data,
void *userdata) {
uint32_t *priority = data;
uint32_t *priority = ASSERT_PTR(data);
int r;
assert(filename);
assert(lvalue);
assert(rvalue);
assert(data);
if (isempty(rvalue)) {
*priority = 0;
src/network/netdev/wlan.c
+2 -4
View File
@@ -179,13 +179,12 @@ int config_parse_wiphy(
void *data,
void *userdata) {
WLan *w = userdata;
WLan *w = ASSERT_PTR(userdata);
int r;
assert(filename);
assert(lvalue);
assert(rvalue);
assert(userdata);
if (isempty(rvalue)) {
w->wiphy_name = mfree(w->wiphy_name);
@@ -219,12 +218,11 @@ int config_parse_wlan_iftype(
void *data,
void *userdata) {
enum nl80211_iftype t, *iftype = data;
enum nl80211_iftype t, *iftype = ASSERT_PTR(data);
assert(filename);
assert(lvalue);
assert(rvalue);
assert(data);
if (isempty(rvalue)) {
*iftype = NL80211_IFTYPE_UNSPECIFIED;
src/network/networkd-address-generation.c
+1 -2
View File
@@ -328,14 +328,13 @@ int config_parse_address_generation_type(
sd_id128_t secret_key = SD_ID128_NULL;
union in_addr_union buffer = {};
AddressGenerationType type;
Set **tokens = data;
Set **tokens = ASSERT_PTR(data);
const char *addr;
int r;
assert(filename);
assert(lvalue);
assert(rvalue);
assert(data);
if (isempty(rvalue)) {
*tokens = set_free(*tokens);
src/network/networkd-can.c
+4 -8
View File
@@ -149,14 +149,13 @@ int config_parse_can_bitrate(
void *data,
void *userdata) {
uint32_t *br = data;
uint32_t *br = ASSERT_PTR(data);
uint64_t sz;
int r;
assert(filename);
assert(lvalue);
assert(rvalue);
assert(data);
r = parse_size(rvalue, 1000, &sz);
if (r < 0) {
@@ -189,13 +188,12 @@ int config_parse_can_time_quanta(
void *data,
void *userdata) {
nsec_t val, *tq = data;
nsec_t val, *tq = ASSERT_PTR(data);
int r;
assert(filename);
assert(lvalue);
assert(rvalue);
assert(data);
r = parse_nsec(rvalue, &val);
if (r < 0) {
@@ -227,13 +225,12 @@ int config_parse_can_restart_usec(
void *data,
void *userdata) {
usec_t usec, *restart_usec = data;
usec_t usec, *restart_usec = ASSERT_PTR(data);
int r;
assert(filename);
assert(lvalue);
assert(rvalue);
assert(data);
r = parse_sec(rvalue, &usec);
if (r < 0) {
@@ -265,14 +262,13 @@ int config_parse_can_control_mode(
void *data,
void *userdata) {
Network *network = userdata;
Network *network = ASSERT_PTR(userdata);
uint32_t mask = ltype;
int r;
assert(filename);
assert(lvalue);
assert(rvalue);
assert(userdata);
assert(mask != 0);
if (isempty(rvalue)) {
src/network/networkd-dhcp-common.c
+13 -30
View File
@@ -131,14 +131,13 @@ const DUID *link_get_duid(Link *link, int family) {
}
static int get_product_uuid_handler(sd_bus_message *m, void *userdata, sd_bus_error *ret_error) {
Manager *manager = userdata;
Manager *manager = ASSERT_PTR(userdata);
const sd_bus_error *e;
const void *a;
size_t sz;
int r;
assert(m);
assert(manager);
/* To avoid calling GetProductUUID() bus method so frequently, set the flag below
* even if the method fails. */
@@ -521,7 +520,7 @@ int config_parse_dhcp_or_ra_route_table(
void *data,
void *userdata) {
Network *network = userdata;
Network *network = ASSERT_PTR(userdata);
uint32_t rt;
int r;
@@ -529,7 +528,6 @@ int config_parse_dhcp_or_ra_route_table(
assert(lvalue);
assert(IN_SET(ltype, AF_INET, AF_INET6));
assert(rvalue);
assert(userdata);
r = safe_atou32(rvalue, &rt);
if (r < 0) {
@@ -566,14 +564,13 @@ int config_parse_iaid(
void *data,
void *userdata) {
Network *network = userdata;
Network *network = ASSERT_PTR(userdata);
uint32_t iaid;
int r;
assert(filename);
assert(lvalue);
assert(rvalue);
assert(network);
assert(IN_SET(ltype, AF_INET, AF_INET6));
r = safe_atou32(rvalue, &iaid);
@@ -614,10 +611,9 @@ int config_parse_dhcp_user_or_vendor_class(
void *data,
void *userdata) {
char ***l = data;
char ***l = ASSERT_PTR(data);
int r;
assert(l);
assert(lvalue);
assert(rvalue);
assert(IN_SET(ltype, AF_INET, AF_INET6));
@@ -681,7 +677,7 @@ int config_parse_dhcp_send_option(
_unused_ _cleanup_(sd_dhcp6_option_unrefp) sd_dhcp6_option *old6 = NULL;
uint32_t uint32_data, enterprise_identifier = 0;
_cleanup_free_ char *word = NULL, *q = NULL;
OrderedHashmap **options = data;
OrderedHashmap **options = ASSERT_PTR(data);
uint16_t u16, uint16_data;
union in_addr_union addr;
DHCPOptionDataType type;
@@ -694,7 +690,6 @@ int config_parse_dhcp_send_option(
assert(filename);
assert(lvalue);
assert(rvalue);
assert(data);
if (isempty(rvalue)) {
*options = ordered_hashmap_free(*options);
@@ -1005,16 +1000,14 @@ int config_parse_duid_type(
void *userdata) {
_cleanup_free_ char *type_string = NULL;
const char *p = rvalue;
const char *p = ASSERT_PTR(rvalue);
bool force = ltype;
DUID *duid = data;
DUID *duid = ASSERT_PTR(data);
DUIDType type;
int r;
assert(filename);
assert(lvalue);
assert(rvalue);
assert(duid);
if (!force && duid->set)
return 0;
@@ -1077,11 +1070,9 @@ int config_parse_manager_duid_type(
void *data,
void *userdata) {
Manager *manager = userdata;
Manager *manager = ASSERT_PTR(userdata);
int r;
assert(manager);
/* For backward compatibility. Setting both DHCPv4 and DHCPv6 DUID if they are not specified explicitly. */
r = config_parse_duid_type(unit, filename, line, section, section_line, lvalue, false, rvalue, &manager->dhcp_duid, manager);
@@ -1103,11 +1094,9 @@ int config_parse_network_duid_type(
void *data,
void *userdata) {
Network *network = userdata;
Network *network = ASSERT_PTR(userdata);
int r;
assert(network);
r = config_parse_duid_type(unit, filename, line, section, section_line, lvalue, true, rvalue, &network->dhcp_duid, network);
if (r < 0)
return r;
@@ -1131,12 +1120,11 @@ int config_parse_duid_rawdata(
uint8_t raw_data[MAX_DUID_LEN];
unsigned count = 0;
bool force = ltype;
DUID *duid = data;
DUID *duid = ASSERT_PTR(data);
assert(filename);
assert(lvalue);
assert(rvalue);
assert(duid);
if (!force && duid->set)
return 0;
@@ -1202,11 +1190,9 @@ int config_parse_manager_duid_rawdata(
void *data,
void *userdata) {
Manager *manager = userdata;
Manager *manager = ASSERT_PTR(userdata);
int r;
assert(manager);
/* For backward compatibility. Setting both DHCPv4 and DHCPv6 DUID if they are not specified explicitly. */
r = config_parse_duid_rawdata(unit, filename, line, section, section_line, lvalue, false, rvalue, &manager->dhcp_duid, manager);
@@ -1228,11 +1214,9 @@ int config_parse_network_duid_rawdata(
void *data,
void *userdata) {
Network *network = userdata;
Network *network = ASSERT_PTR(userdata);
int r;
assert(network);
r = config_parse_duid_rawdata(unit, filename, line, section, section_line, lvalue, true, rvalue, &network->dhcp_duid, network);
if (r < 0)
return r;
@@ -1253,7 +1237,7 @@ int config_parse_uplink(
void *data,
void *userdata) {
Network *network = userdata;
Network *network = ASSERT_PTR(userdata);
bool accept_none = true;
int *index, r;
char **name;
@@ -1262,7 +1246,6 @@ int config_parse_uplink(
assert(section);
assert(lvalue);
assert(rvalue);
assert(userdata);
if (streq(section, "DHCPServer")) {
index = &network->dhcp_server_uplink_index;
src/network/networkd-dhcp-prefix-delegation.c
+1 -2
View File
@@ -1261,14 +1261,13 @@ int config_parse_dhcp_pd_subnet_id(
void *data,
void *userdata) {
int64_t *p = data;
int64_t *p = ASSERT_PTR(data);
uint64_t t;
int r;
assert(filename);
assert(lvalue);
assert(rvalue);
assert(data);
if (isempty(rvalue) || streq(rvalue, "auto")) {
*p = -1;
src/network/networkd-dhcp-server-bus.c
+2 -5
View File
@@ -17,13 +17,12 @@ static int property_get_leases(
sd_bus_message *reply,
void *userdata,
sd_bus_error *error) {
Link *l = userdata;
Link *l = ASSERT_PTR(userdata);
sd_dhcp_server *s;
DHCPLease *lease;
int r;
assert(reply);
assert(l);
s = l->dhcp_server;
if (!s)
@@ -96,9 +95,7 @@ static int dhcp_server_emit_changed(Link *link, const char *property, ...) {
}
void dhcp_server_callback(sd_dhcp_server *s, uint64_t event, void *data) {
Link *l = data;
assert(l);
Link *l = ASSERT_PTR(data);
if (event & SD_DHCP_SERVER_EVENT_LEASE_CHANGED)
(void) dhcp_server_emit_changed(l, "Leases", NULL);
src/network/networkd-dhcp-server-static-lease.c
+2 -4
View File
@@ -114,14 +114,13 @@ int config_parse_dhcp_static_lease_address(
void *userdata) {
_cleanup_(dhcp_static_lease_free_or_set_invalidp) DHCPStaticLease *lease = NULL;
Network *network = userdata;
Network *network = ASSERT_PTR(userdata);
union in_addr_union addr;
int r;
assert(filename);
assert(lvalue);
assert(rvalue);
assert(network);
r = lease_new_static(network, filename, section_line, &lease);
if (r < 0)
@@ -164,7 +163,7 @@ int config_parse_dhcp_static_lease_hwaddr(
void *userdata) {
_cleanup_(dhcp_static_lease_free_or_set_invalidp) DHCPStaticLease *lease = NULL;
Network *network = userdata;
Network *network = ASSERT_PTR(userdata);
struct ether_addr hwaddr;
uint8_t *c;
int r;
@@ -172,7 +171,6 @@ int config_parse_dhcp_static_lease_hwaddr(
assert(filename);
assert(lvalue);
assert(rvalue);
assert(network);
r = lease_new_static(network, filename, section_line, &lease);
if (r < 0)
src/network/networkd-dhcp-server.c
+1 -2
View File
@@ -640,9 +640,8 @@ int config_parse_dhcp_server_emit(
void *data,
void *userdata) {
NetworkDHCPServerEmitAddress *emit = data;
NetworkDHCPServerEmitAddress *emit = ASSERT_PTR(data);
assert(emit);
assert(rvalue);
if (isempty(rvalue)) {
src/network/networkd-dhcp4.c
+4 -8
View File
@@ -1063,10 +1063,9 @@ static int dhcp_server_is_filtered(Link *link, sd_dhcp_client *client) {
}
static int dhcp4_handler(sd_dhcp_client *client, int event, void *userdata) {
Link *link = userdata;
Link *link = ASSERT_PTR(userdata);
int r;
assert(link);
assert(link->network);
assert(link->manager);
@@ -1630,11 +1629,10 @@ int config_parse_dhcp_max_attempts(
void *data,
void *userdata) {
Network *network = data;
Network *network = ASSERT_PTR(data);
uint64_t a;
int r;
assert(network);
assert(lvalue);
assert(rvalue);
@@ -1678,12 +1676,11 @@ int config_parse_dhcp_ip_service_type(
void *data,
void *userdata) {
int *tos = data;
int *tos = ASSERT_PTR(data);
assert(filename);
assert(lvalue);
assert(rvalue);
assert(data);
if (isempty(rvalue))
*tos = -1; /* use sd_dhcp_client's default (currently, CS6). */
@@ -1749,12 +1746,11 @@ int config_parse_dhcp_label(
void *data,
void *userdata) {
char **label = data;
char **label = ASSERT_PTR(data);
assert(filename);
assert(lvalue);
assert(rvalue);
assert(data);
if (isempty(rvalue)) {
*label = mfree(*label);
src/network/networkd-dhcp6.c
+2 -4
View File
@@ -367,10 +367,9 @@ static int dhcp6_lease_lost(Link *link) {
}
static void dhcp6_handler(sd_dhcp6_client *client, int event, void *userdata) {
Link *link = userdata;
Link *link = ASSERT_PTR(userdata);
int r;
assert(link);
assert(link->network);
if (IN_SET(link->state, LINK_STATE_FAILED, LINK_STATE_LINGER))
@@ -821,7 +820,7 @@ int config_parse_dhcp6_pd_prefix_hint(
void *data,
void *userdata) {
Network *network = userdata;
Network *network = ASSERT_PTR(userdata);
union in_addr_union u;
unsigned char prefixlen;
int r;
@@ -829,7 +828,6 @@ int config_parse_dhcp6_pd_prefix_hint(
assert(filename);
assert(lvalue);
assert(rvalue);
assert(userdata);
r = in_addr_prefix_from_string(rvalue, AF_INET6, &u, &prefixlen);
if (r < 0) {
src/network/networkd-ipv4acd.c
+2 -4
View File
@@ -116,12 +116,11 @@ static int dhcp4_address_on_conflict(Link *link, Address *address) {
}
static void on_acd(sd_ipv4acd *acd, int event, void *userdata) {
Address *address = userdata;
Address *address = ASSERT_PTR(userdata);
Link *link;
int r;
assert(acd);
assert(address);
assert(address->acd == acd);
assert(address->link);
assert(address->family == AF_INET);
@@ -170,10 +169,9 @@ static void on_acd(sd_ipv4acd *acd, int event, void *userdata) {
}
static int ipv4acd_check_mac(sd_ipv4acd *acd, const struct ether_addr *mac, void *userdata) {
Manager *m = userdata;
Manager *m = ASSERT_PTR(userdata);
struct hw_addr_data hw_addr;
assert(m);
assert(mac);
hw_addr = (struct hw_addr_data) {
src/network/networkd-ipv4ll.c
+3 -6
View File
@@ -124,10 +124,9 @@ static int ipv4ll_address_claimed(sd_ipv4ll *ll, Link *link) {
}
static void ipv4ll_handler(sd_ipv4ll *ll, int event, void *userdata) {
Link *link = userdata;
Link *link = ASSERT_PTR(userdata);
int r;
assert(link);
assert(link->network);
if (IN_SET(link->state, LINK_STATE_FAILED, LINK_STATE_LINGER))
@@ -169,10 +168,9 @@ static void ipv4ll_handler(sd_ipv4ll *ll, int event, void *userdata) {
}
static int ipv4ll_check_mac(sd_ipv4ll *ll, const struct ether_addr *mac, void *userdata) {
Manager *m = userdata;
Manager *m = ASSERT_PTR(userdata);
struct hw_addr_data hw_addr;
assert(m);
assert(mac);
hw_addr = (struct hw_addr_data) {
@@ -250,13 +248,12 @@ int config_parse_ipv4ll(
void *data,
void *userdata) {
AddressFamily *link_local = data;
AddressFamily *link_local = ASSERT_PTR(data);
int r;
assert(filename);
assert(lvalue);
assert(rvalue);
assert(data);
/* Note that this is mostly like
* config_parse_address_family(), except that it
src/network/networkd-ipv6-proxy-ndp.c
+1 -2
View File
@@ -141,13 +141,12 @@ int config_parse_ipv6_proxy_ndp_address(
void *userdata) {
_cleanup_free_ struct in6_addr *address = NULL;
Network *network = userdata;
Network *network = ASSERT_PTR(userdata);
union in_addr_union buffer;
int r;
assert(filename);
assert(rvalue);
assert(network);
if (isempty(rvalue)) {
network->ipv6_proxy_ndp_addresses = set_free_free(network->ipv6_proxy_ndp_addresses);
src/network/networkd-link-bus.c
+18 -38
View File
@@ -36,14 +36,13 @@ static int property_get_bit_rates(
void *userdata,
sd_bus_error *error) {
Link *link = userdata;
Link *link = ASSERT_PTR(userdata);
Manager *manager;
double interval_sec;
uint64_t tx, rx;
assert(bus);
assert(reply);
assert(userdata);
manager = link->manager;
@@ -79,11 +78,10 @@ static int verify_managed_link(Link *l, sd_bus_error *error) {
int bus_link_method_set_ntp_servers(sd_bus_message *message, void *userdata, sd_bus_error *error) {
_cleanup_strv_free_ char **ntp = NULL;
Link *l = userdata;
Link *l = ASSERT_PTR(userdata);
int r;
assert(message);
assert(l);
r = verify_managed_link(l, error);
if (r < 0)
@@ -122,12 +120,11 @@ int bus_link_method_set_ntp_servers(sd_bus_message *message, void *userdata, sd_
static int bus_link_method_set_dns_servers_internal(sd_bus_message *message, void *userdata, sd_bus_error *error, bool extended) {
struct in_addr_full **dns;
Link *l = userdata;
Link *l = ASSERT_PTR(userdata);
size_t n;
int r;
assert(message);
assert(l);
r = verify_managed_link(l, error);
if (r < 0)
@@ -180,11 +177,10 @@ int bus_link_method_set_dns_servers_ex(sd_bus_message *message, void *userdata,
int bus_link_method_set_domains(sd_bus_message *message, void *userdata, sd_bus_error *error) {
_cleanup_ordered_set_free_ OrderedSet *search_domains = NULL, *route_domains = NULL;
Link *l = userdata;
Link *l = ASSERT_PTR(userdata);
int r;
assert(message);
assert(l);
r = verify_managed_link(l, error);
if (r < 0)
@@ -259,11 +255,10 @@ int bus_link_method_set_domains(sd_bus_message *message, void *userdata, sd_bus_
}
int bus_link_method_set_default_route(sd_bus_message *message, void *userdata, sd_bus_error *error) {
Link *l = userdata;
Link *l = ASSERT_PTR(userdata);
int r, b;
assert(message);
assert(l);
r = verify_managed_link(l, error);
if (r < 0)
@@ -295,13 +290,12 @@ int bus_link_method_set_default_route(sd_bus_message *message, void *userdata, s
}
int bus_link_method_set_llmnr(sd_bus_message *message, void *userdata, sd_bus_error *error) {
Link *l = userdata;
Link *l = ASSERT_PTR(userdata);
ResolveSupport mode;
const char *llmnr;
int r;
assert(message);
assert(l);
r = verify_managed_link(l, error);
if (r < 0)
@@ -341,13 +335,12 @@ int bus_link_method_set_llmnr(sd_bus_message *message, void *userdata, sd_bus_er
}
int bus_link_method_set_mdns(sd_bus_message *message, void *userdata, sd_bus_error *error) {
Link *l = userdata;
Link *l = ASSERT_PTR(userdata);
ResolveSupport mode;
const char *mdns;
int r;
assert(message);
assert(l);
r = verify_managed_link(l, error);
if (r < 0)
@@ -387,13 +380,12 @@ int bus_link_method_set_mdns(sd_bus_message *message, void *userdata, sd_bus_err
}
int bus_link_method_set_dns_over_tls(sd_bus_message *message, void *userdata, sd_bus_error *error) {
Link *l = userdata;
Link *l = ASSERT_PTR(userdata);
const char *dns_over_tls;
DnsOverTlsMode mode;
int r;
assert(message);
assert(l);
r = verify_managed_link(l, error);
if (r < 0)
@@ -433,13 +425,12 @@ int bus_link_method_set_dns_over_tls(sd_bus_message *message, void *userdata, sd
}
int bus_link_method_set_dnssec(sd_bus_message *message, void *userdata, sd_bus_error *error) {
Link *l = userdata;
Link *l = ASSERT_PTR(userdata);
const char *dnssec;
DnssecMode mode;
int r;
assert(message);
assert(l);
r = verify_managed_link(l, error);
if (r < 0)
@@ -481,11 +472,10 @@ int bus_link_method_set_dnssec(sd_bus_message *message, void *userdata, sd_bus_e
int bus_link_method_set_dnssec_negative_trust_anchors(sd_bus_message *message, void *userdata, sd_bus_error *error) {
_cleanup_set_free_free_ Set *ns = NULL;
_cleanup_strv_free_ char **ntas = NULL;
Link *l = userdata;
Link *l = ASSERT_PTR(userdata);
int r;
assert(message);
assert(l);
r = verify_managed_link(l, error);
if (r < 0)
@@ -534,11 +524,10 @@ int bus_link_method_set_dnssec_negative_trust_anchors(sd_bus_message *message, v
}
int bus_link_method_revert_ntp(sd_bus_message *message, void *userdata, sd_bus_error *error) {
Link *l = userdata;
Link *l = ASSERT_PTR(userdata);
int r;
assert(message);
assert(l);
r = verify_managed_link(l, error);
if (r < 0)
@@ -564,11 +553,10 @@ int bus_link_method_revert_ntp(sd_bus_message *message, void *userdata, sd_bus_e
}
int bus_link_method_revert_dns(sd_bus_message *message, void *userdata, sd_bus_error *error) {
Link *l = userdata;
Link *l = ASSERT_PTR(userdata);
int r;
assert(message);
assert(l);
r = verify_managed_link(l, error);
if (r < 0)
@@ -594,11 +582,9 @@ int bus_link_method_revert_dns(sd_bus_message *message, void *userdata, sd_bus_e
}
int bus_link_method_force_renew(sd_bus_message *message, void *userdata, sd_bus_error *error) {
Link *l = userdata;
Link *l = ASSERT_PTR(userdata);
int r;
assert(l);
if (!l->network)
return sd_bus_error_setf(error, BUS_ERROR_UNMANAGED_INTERFACE,
"Interface %s is not managed by systemd-networkd",
@@ -623,11 +609,9 @@ int bus_link_method_force_renew(sd_bus_message *message, void *userdata, sd_bus_
}
int bus_link_method_renew(sd_bus_message *message, void *userdata, sd_bus_error *error) {
Link *l = userdata;
Link *l = ASSERT_PTR(userdata);
int r;
assert(l);
if (!l->network)
return sd_bus_error_setf(error, BUS_ERROR_UNMANAGED_INTERFACE,
"Interface %s is not managed by systemd-networkd",
@@ -652,11 +636,10 @@ int bus_link_method_renew(sd_bus_message *message, void *userdata, sd_bus_error
}
int bus_link_method_reconfigure(sd_bus_message *message, void *userdata, sd_bus_error *error) {
Link *l = userdata;
Link *l = ASSERT_PTR(userdata);
int r;
assert(message);
assert(l);
r = bus_verify_polkit_async(message, CAP_NET_ADMIN,
"org.freedesktop.network1.reconfigure",
@@ -684,11 +667,10 @@ int bus_link_method_describe(sd_bus_message *message, void *userdata, sd_bus_err
_cleanup_(sd_bus_message_unrefp) sd_bus_message *reply = NULL;
_cleanup_(json_variant_unrefp) JsonVariant *v = NULL;
_cleanup_free_ char *text = NULL;
Link *link = userdata;
Link *link = ASSERT_PTR(userdata);
int r;
assert(message);
assert(link);
r = link_build_json(link, &v);
if (r < 0)
@@ -825,13 +807,12 @@ char *link_bus_path(Link *link) {
int link_node_enumerator(sd_bus *bus, const char *path, void *userdata, char ***nodes, sd_bus_error *error) {
_cleanup_strv_free_ char **l = NULL;
Manager *m = userdata;
Manager *m = ASSERT_PTR(userdata);
unsigned c = 0;
Link *link;
assert(bus);
assert(path);
assert(m);
assert(nodes);
l = new0(char*, hashmap_size(m->links_by_index) + 1);
@@ -856,14 +837,13 @@ int link_node_enumerator(sd_bus *bus, const char *path, void *userdata, char ***
int link_object_find(sd_bus *bus, const char *path, const char *interface, void *userdata, void **found, sd_bus_error *error) {
_cleanup_free_ char *identifier = NULL;
Manager *m = userdata;
Manager *m = ASSERT_PTR(userdata);
Link *link;
int ifindex, r;
assert(bus);
assert(path);
assert(interface);
assert(m);
assert(found);
r = sd_bus_path_decode(path, "/org/freedesktop/network1/link", &identifier);
src/network/networkd-link.c
+1 -3
View File
@@ -1589,11 +1589,9 @@ static int link_carrier_lost_impl(Link *link) {
}
static int link_carrier_lost_handler(sd_event_source *s, uint64_t usec, void *userdata) {
Link *link = userdata;
Link *link = ASSERT_PTR(userdata);
int r;
assert(link);
r = link_carrier_lost_impl(link);
if (r < 0) {
log_link_warning_errno(link, r, "Failed to process carrier lost event: %m");
src/network/networkd-lldp-rx.c
+1 -3
View File
@@ -49,11 +49,9 @@ static bool link_lldp_rx_enabled(Link *link) {
}
static void lldp_rx_handler(sd_lldp_rx *lldp_rx, sd_lldp_rx_event_t event, sd_lldp_neighbor *n, void *userdata) {
Link *link = userdata;
Link *link = ASSERT_PTR(userdata);
int r;
assert(link);
(void) link_lldp_save(link);
if (link->lldp_tx && event == SD_LLDP_RX_EVENT_ADDED) {
src/network/networkd-lldp-tx.c
+1 -2
View File
@@ -106,14 +106,13 @@ int config_parse_lldp_multicast_mode(
void *data,
void *userdata) {
sd_lldp_multicast_mode_t m, *mode = data;
sd_lldp_multicast_mode_t m, *mode = ASSERT_PTR(data);
int r;
assert(filename);
assert(section);
assert(lvalue);
assert(rvalue);
assert(mode);
if (isempty(rvalue)) {
*mode = _SD_LLDP_MULTICAST_MODE_INVALID;
src/network/networkd-manager-bus.c
+1 -2
View File
@@ -234,11 +234,10 @@ static int bus_method_describe(sd_bus_message *message, void *userdata, sd_bus_e
_cleanup_(sd_bus_message_unrefp) sd_bus_message *reply = NULL;
_cleanup_(json_variant_unrefp) JsonVariant *v = NULL;
_cleanup_free_ char *text = NULL;
Manager *manager = userdata;
Manager *manager = ASSERT_PTR(userdata);
int r;
assert(message);
assert(manager);
r = manager_build_json(manager, &v);
if (r < 0)
src/network/networkd-manager.c
+5 -11
View File
@@ -82,11 +82,10 @@ static int manager_reset_all(Manager *m) {
}
static int match_prepare_for_sleep(sd_bus_message *message, void *userdata, sd_bus_error *ret_error) {
Manager *m = userdata;
Manager *m = ASSERT_PTR(userdata);
int b, r;
assert(message);
assert(m);
r = sd_bus_message_read(message, "b", &b);
if (r < 0) {
@@ -105,10 +104,9 @@ static int match_prepare_for_sleep(sd_bus_message *message, void *userdata, sd_b
}
static int on_connected(sd_bus_message *message, void *userdata, sd_bus_error *ret_error) {
Manager *m = userdata;
Manager *m = ASSERT_PTR(userdata);
assert(message);
assert(m);
/* Did we get a timezone or transient hostname from DHCP while D-Bus wasn't up yet? */
if (m->dynamic_hostname)
@@ -446,12 +444,10 @@ static int manager_connect_rtnl(Manager *m, int fd) {
}
static int manager_dirty_handler(sd_event_source *s, void *userdata) {
Manager *m = userdata;
Manager *m = ASSERT_PTR(userdata);
Link *link;
int r;
assert(m);
if (m->dirty) {
r = manager_save(m);
if (r < 0)
@@ -468,9 +464,8 @@ static int manager_dirty_handler(sd_event_source *s, void *userdata) {
}
static int signal_terminate_callback(sd_event_source *s, const struct signalfd_siginfo *si, void *userdata) {
Manager *m = userdata;
Manager *m = ASSERT_PTR(userdata);
assert(m);
m->restarting = false;
log_debug("Terminate operation initiated.");
@@ -479,9 +474,8 @@ static int signal_terminate_callback(sd_event_source *s, const struct signalfd_s
}
static int signal_restart_callback(sd_event_source *s, const struct signalfd_siginfo *si, void *userdata) {
Manager *m = userdata;
Manager *m = ASSERT_PTR(userdata);
assert(m);
m->restarting = true;
log_debug("Restart operation initiated.");
src/network/networkd-ndisc.c
+1 -3
View File
@@ -1009,11 +1009,9 @@ static int ndisc_router_handler(Link *link, sd_ndisc_router *rt) {
}
static void ndisc_handler(sd_ndisc *nd, sd_ndisc_event_t event, sd_ndisc_router *rt, void *userdata) {
Link *link = userdata;
Link *link = ASSERT_PTR(userdata);
int r;
assert(link);
if (IN_SET(link->state, LINK_STATE_FAILED, LINK_STATE_LINGER))
return;
src/network/networkd-neighbor.c
+2 -4
View File
@@ -607,14 +607,13 @@ int config_parse_neighbor_address(
void *userdata) {
_cleanup_(neighbor_free_or_set_invalidp) Neighbor *n = NULL;
Network *network = userdata;
Network *network = ASSERT_PTR(userdata);
int r;
assert(filename);
assert(section);
assert(lvalue);
assert(rvalue);
assert(userdata);
r = neighbor_new_static(network, filename, section_line, &n);
if (r < 0)
@@ -651,14 +650,13 @@ int config_parse_neighbor_lladdr(
void *userdata) {
_cleanup_(neighbor_free_or_set_invalidp) Neighbor *n = NULL;
Network *network = userdata;
Network *network = ASSERT_PTR(userdata);
int r;
assert(filename);
assert(section);
assert(lvalue);
assert(rvalue);
assert(userdata);
r = neighbor_new_static(network, filename, section_line, &n);
if (r < 0)
src/network/networkd-network-bus.c
+2 -4
View File
@@ -84,13 +84,12 @@ static char *network_bus_path(Network *network) {
int network_node_enumerator(sd_bus *bus, const char *path, void *userdata, char ***nodes, sd_bus_error *error) {
_cleanup_strv_free_ char **l = NULL;
Manager *m = userdata;
Manager *m = ASSERT_PTR(userdata);
Network *network;
int r;
assert(bus);
assert(path);
assert(m);
assert(nodes);
ORDERED_HASHMAP_FOREACH(network, m->networks) {
@@ -111,7 +110,7 @@ int network_node_enumerator(sd_bus *bus, const char *path, void *userdata, char
}
int network_object_find(sd_bus *bus, const char *path, const char *interface, void *userdata, void **found, sd_bus_error *error) {
Manager *m = userdata;
Manager *m = ASSERT_PTR(userdata);
Network *network;
_cleanup_free_ char *name = NULL;
int r;
@@ -119,7 +118,6 @@ int network_object_find(sd_bus *bus, const char *path, const char *interface, vo
assert(bus);
assert(path);
assert(interface);
assert(m);
assert(found);
r = sd_bus_path_decode(path, "/org/freedesktop/network1/network", &name);
src/network/networkd-network.c
+9 -18
View File
@@ -850,13 +850,12 @@ int config_parse_stacked_netdev(
_cleanup_free_ char *name = NULL;
NetDevKind kind = ltype;
Hashmap **h = data;
Hashmap **h = ASSERT_PTR(data);
int r;
assert(filename);
assert(lvalue);
assert(rvalue);
assert(data);
assert(IN_SET(kind,
NETDEV_KIND_IPOIB,
NETDEV_KIND_IPVLAN,
@@ -906,13 +905,12 @@ int config_parse_domains(
void *data,
void *userdata) {
Network *n = userdata;
Network *n = ASSERT_PTR(userdata);
int r;
assert(filename);
assert(lvalue);
assert(rvalue);
assert(n);
if (isempty(rvalue)) {
n->search_domains = ordered_set_free(n->search_domains);
@@ -984,13 +982,12 @@ int config_parse_timezone(
void *data,
void *userdata) {
char **tz = data;
char **tz = ASSERT_PTR(data);
int r;
assert(filename);
assert(lvalue);
assert(rvalue);
assert(data);
if (isempty(rvalue)) {
*tz = mfree(*tz);
@@ -1019,13 +1016,12 @@ int config_parse_dns(
void *data,
void *userdata) {
Network *n = userdata;
Network *n = ASSERT_PTR(userdata);
int r;
assert(filename);
assert(lvalue);
assert(rvalue);
assert(n);
if (isempty(rvalue)) {
for (unsigned i = 0; i < n->n_dns; i++)
@@ -1082,13 +1078,12 @@ int config_parse_dnssec_negative_trust_anchors(
void *data,
void *userdata) {
Set **nta = data;
Set **nta = ASSERT_PTR(data);
int r;
assert(filename);
assert(lvalue);
assert(rvalue);
assert(nta);
if (isempty(rvalue)) {
*nta = set_free_free(*nta);
@@ -1134,13 +1129,12 @@ int config_parse_ntp(
void *data,
void *userdata) {
char ***l = data;
char ***l = ASSERT_PTR(data);
int r;
assert(filename);
assert(lvalue);
assert(rvalue);
assert(l);
if (isempty(rvalue)) {
*l = strv_free(*l);
@@ -1193,7 +1187,7 @@ int config_parse_required_for_online(
void *data,
void *userdata) {
Network *network = userdata;
Network *network = ASSERT_PTR(userdata);
LinkOperationalStateRange range;
bool required = true;
int r;
@@ -1201,7 +1195,6 @@ int config_parse_required_for_online(
assert(filename);
assert(lvalue);
assert(rvalue);
assert(network);
if (isempty(rvalue)) {
network->required_for_online = -1;
@@ -1241,14 +1234,13 @@ int config_parse_link_group(
void *data,
void *userdata) {
Network *network = userdata;
Network *network = ASSERT_PTR(userdata);
int r;
int32_t group;
assert(filename);
assert(lvalue);
assert(rvalue);
assert(network);
if (isempty(rvalue)) {
network->group = -1;
@@ -1284,14 +1276,13 @@ int config_parse_ignore_carrier_loss(
void *data,
void *userdata) {
Network *network = userdata;
Network *network = ASSERT_PTR(userdata);
usec_t usec;
int r;
assert(filename);
assert(lvalue);
assert(rvalue);
assert(network);
if (isempty(rvalue)) {
network->ignore_carrier_loss_set = false;
src/network/networkd-radv.c
+9 -18
View File
@@ -795,7 +795,7 @@ int config_parse_prefix(
void *userdata) {
_cleanup_(prefix_free_or_set_invalidp) Prefix *p = NULL;
Network *network = userdata;
Network *network = ASSERT_PTR(userdata);
union in_addr_union a;
int r;
@@ -803,7 +803,6 @@ int config_parse_prefix(
assert(section);
assert(lvalue);
assert(rvalue);
assert(userdata);
r = prefix_new_static(network, filename, section_line, &p);
if (r < 0)
@@ -836,14 +835,13 @@ int config_parse_prefix_boolean(
void *userdata) {
_cleanup_(prefix_free_or_set_invalidp) Prefix *p = NULL;
Network *network = userdata;
Network *network = ASSERT_PTR(userdata);
int r;
assert(filename);
assert(section);
assert(lvalue);
assert(rvalue);
assert(userdata);
r = prefix_new_static(network, filename, section_line, &p);
if (r < 0)
@@ -882,7 +880,7 @@ int config_parse_prefix_lifetime(
void *userdata) {
_cleanup_(prefix_free_or_set_invalidp) Prefix *p = NULL;
Network *network = userdata;
Network *network = ASSERT_PTR(userdata);
usec_t usec;
int r;
@@ -890,7 +888,6 @@ int config_parse_prefix_lifetime(
assert(section);
assert(lvalue);
assert(rvalue);
assert(userdata);
r = prefix_new_static(network, filename, section_line, &p);
if (r < 0)
@@ -933,14 +930,13 @@ int config_parse_prefix_metric(
void *userdata) {
_cleanup_(prefix_free_or_set_invalidp) Prefix *p = NULL;
Network *network = userdata;
Network *network = ASSERT_PTR(userdata);
int r;
assert(filename);
assert(section);
assert(lvalue);
assert(rvalue);
assert(userdata);
r = prefix_new_static(network, filename, section_line, &p);
if (r < 0)
@@ -971,14 +967,13 @@ int config_parse_prefix_token(
void *userdata) {
_cleanup_(prefix_free_or_set_invalidp) Prefix *p = NULL;
Network *network = userdata;
Network *network = ASSERT_PTR(userdata);
int r;
assert(filename);
assert(section);
assert(lvalue);
assert(rvalue);
assert(userdata);
r = prefix_new_static(network, filename, section_line, &p);
if (r < 0)
@@ -1006,7 +1001,7 @@ int config_parse_route_prefix(
void *userdata) {
_cleanup_(route_prefix_free_or_set_invalidp) RoutePrefix *p = NULL;
Network *network = userdata;
Network *network = ASSERT_PTR(userdata);
union in_addr_union a;
int r;
@@ -1014,7 +1009,6 @@ int config_parse_route_prefix(
assert(section);
assert(lvalue);
assert(rvalue);
assert(userdata);
r = route_prefix_new_static(network, filename, section_line, &p);
if (r < 0)
@@ -1047,7 +1041,7 @@ int config_parse_route_prefix_lifetime(
void *userdata) {
_cleanup_(route_prefix_free_or_set_invalidp) RoutePrefix *p = NULL;
Network *network = userdata;
Network *network = ASSERT_PTR(userdata);
usec_t usec;
int r;
@@ -1055,7 +1049,6 @@ int config_parse_route_prefix_lifetime(
assert(section);
assert(lvalue);
assert(rvalue);
assert(userdata);
r = route_prefix_new_static(network, filename, section_line, &p);
if (r < 0)
@@ -1228,13 +1221,12 @@ int config_parse_router_prefix_delegation(
void *data,
void *userdata) {
RADVPrefixDelegation val, *ra = data;
RADVPrefixDelegation val, *ra = ASSERT_PTR(data);
int r;
assert(filename);
assert(lvalue);
assert(rvalue);
assert(data);
if (streq(lvalue, "IPv6SendRA")) {
r = parse_boolean(rvalue);
@@ -1274,14 +1266,13 @@ int config_parse_router_lifetime(
void *data,
void *userdata) {
usec_t usec, *lifetime = data;
usec_t usec, *lifetime = ASSERT_PTR(data);
int r;
assert(filename);
assert(section);
assert(lvalue);
assert(rvalue);
assert(data);
if (isempty(rvalue)) {
*lifetime = RADV_DEFAULT_ROUTER_LIFETIME_USEC;
src/network/networkd-route-util.c
+1 -2
View File
@@ -449,13 +449,12 @@ int config_parse_route_table_names(
void *data,
void *userdata) {
Manager *m = userdata;
Manager *m = ASSERT_PTR(userdata);
int r;
assert(filename);
assert(lvalue);
assert(rvalue);
assert(userdata);
if (isempty(rvalue)) {
m->route_table_names_by_number = hashmap_free(m->route_table_names_by_number);
src/network/networkd-route.c
+1 -2
View File
@@ -1016,11 +1016,10 @@ void link_foreignize_routes(Link *link) {
}
static int route_expire_handler(sd_event_source *s, uint64_t usec, void *userdata) {
Route *route = userdata;
Route *route = ASSERT_PTR(userdata);
Link *link;
int r;
assert(route);
assert(route->manager || (route->link && route->link->manager));
link = route->link; /* This may be NULL. */
src/network/networkd-speed-meter.c
+1 -2
View File
@@ -43,13 +43,12 @@ static int process_message(Manager *manager, sd_netlink_message *message) {
static int speed_meter_handler(sd_event_source *s, uint64_t usec, void *userdata) {
_cleanup_(sd_netlink_message_unrefp) sd_netlink_message *req = NULL, *reply = NULL;
Manager *manager = userdata;
Manager *manager = ASSERT_PTR(userdata);
usec_t usec_now;
Link *link;
int r;
assert(s);
assert(userdata);
r = sd_event_now(sd_event_source_get_event(s), CLOCK_MONOTONIC, &usec_now);
if (r < 0)
src/network/networkd-sysctl.c
+1 -2
View File
@@ -327,12 +327,11 @@ int config_parse_ipv6_privacy_extensions(
void *data,
void *userdata) {
IPv6PrivacyExtensions s, *ipv6_privacy_extensions = data;
IPv6PrivacyExtensions s, *ipv6_privacy_extensions = ASSERT_PTR(data);
assert(filename);
assert(lvalue);
assert(rvalue);
assert(ipv6_privacy_extensions);
s = ipv6_privacy_extensions_from_string(rvalue);
if (s < 0) {
src/network/networkd-util.c
+1 -2
View File
@@ -213,13 +213,12 @@ int config_parse_mud_url(
void *userdata) {
_cleanup_free_ char *unescaped = NULL;
char **url = data;
char **url = ASSERT_PTR(data);
ssize_t l;
assert(filename);
assert(lvalue);
assert(rvalue);
assert(url);
if (isempty(rvalue)) {
*url = mfree(*url);
src/network/tc/cake.c
+8 -16
View File
@@ -139,14 +139,13 @@ int config_parse_cake_bandwidth(
_cleanup_(qdisc_free_or_set_invalidp) QDisc *qdisc = NULL;
CommonApplicationsKeptEnhanced *c;
Network *network = data;
Network *network = ASSERT_PTR(data);
uint64_t k;
int r;
assert(filename);
assert(lvalue);
assert(rvalue);
assert(data);
r = qdisc_new_static(QDISC_KIND_CAKE, network, filename, section_line, &qdisc);
if (r == -ENOMEM)
@@ -194,14 +193,13 @@ int config_parse_cake_overhead(
_cleanup_(qdisc_free_or_set_invalidp) QDisc *qdisc = NULL;
CommonApplicationsKeptEnhanced *c;
Network *network = data;
Network *network = ASSERT_PTR(data);
int32_t v;
int r;
assert(filename);
assert(lvalue);
assert(rvalue);
assert(data);
r = qdisc_new_static(QDISC_KIND_CAKE, network, filename, section_line, &qdisc);
if (r == -ENOMEM)
@@ -254,14 +252,13 @@ int config_parse_cake_mpu(
_cleanup_(qdisc_free_or_set_invalidp) QDisc *qdisc = NULL;
CommonApplicationsKeptEnhanced *c;
Network *network = data;
Network *network = ASSERT_PTR(data);
uint32_t v;
int r;
assert(filename);
assert(lvalue);
assert(rvalue);
assert(data);
r = qdisc_new_static(QDISC_KIND_CAKE, network, filename, section_line, &qdisc);
if (r == -ENOMEM)
@@ -313,13 +310,12 @@ int config_parse_cake_tristate(
_cleanup_(qdisc_free_or_set_invalidp) QDisc *qdisc = NULL;
CommonApplicationsKeptEnhanced *c;
Network *network = data;
Network *network = ASSERT_PTR(data);
int *dest, r;
assert(filename);
assert(lvalue);
assert(rvalue);
assert(data);
r = qdisc_new_static(QDISC_KIND_CAKE, network, filename, section_line, &qdisc);
if (r == -ENOMEM)
@@ -386,14 +382,13 @@ int config_parse_cake_compensation_mode(
_cleanup_(qdisc_free_or_set_invalidp) QDisc *qdisc = NULL;
CommonApplicationsKeptEnhanced *c;
Network *network = data;
Network *network = ASSERT_PTR(data);
CakeCompensationMode mode;
int r;
assert(filename);
assert(lvalue);
assert(rvalue);
assert(data);
r = qdisc_new_static(QDISC_KIND_CAKE, network, filename, section_line, &qdisc);
if (r == -ENOMEM)
@@ -452,14 +447,13 @@ int config_parse_cake_flow_isolation_mode(
_cleanup_(qdisc_free_or_set_invalidp) QDisc *qdisc = NULL;
CommonApplicationsKeptEnhanced *c;
Network *network = data;
Network *network = ASSERT_PTR(data);
CakeFlowIsolationMode mode;
int r;
assert(filename);
assert(lvalue);
assert(rvalue);
assert(data);
r = qdisc_new_static(QDISC_KIND_CAKE, network, filename, section_line, &qdisc);
if (r == -ENOMEM)
@@ -516,13 +510,12 @@ int config_parse_cake_priority_queueing_preset(
_cleanup_(qdisc_free_or_set_invalidp) QDisc *qdisc = NULL;
CommonApplicationsKeptEnhanced *c;
CakePriorityQueueingPreset preset;
Network *network = data;
Network *network = ASSERT_PTR(data);
int r;
assert(filename);
assert(lvalue);
assert(rvalue);
assert(data);
r = qdisc_new_static(QDISC_KIND_CAKE, network, filename, section_line, &qdisc);
if (r == -ENOMEM)
@@ -568,14 +561,13 @@ int config_parse_cake_fwmark(
_cleanup_(qdisc_free_or_set_invalidp) QDisc *qdisc = NULL;
CommonApplicationsKeptEnhanced *c;
Network *network = data;
Network *network = ASSERT_PTR(data);
uint32_t fwmark;
int r;
assert(filename);
assert(lvalue);
assert(rvalue);
assert(data);
r = qdisc_new_static(QDISC_KIND_CAKE, network, filename, section_line, &qdisc);
if (r == -ENOMEM)
src/network/tc/codel.c
+3 -6
View File
@@ -88,13 +88,12 @@ int config_parse_controlled_delay_u32(
_cleanup_(qdisc_free_or_set_invalidp) QDisc *qdisc = NULL;
ControlledDelay *cd;
Network *network = data;
Network *network = ASSERT_PTR(data);
int r;
assert(filename);
assert(lvalue);
assert(rvalue);
assert(data);
r = qdisc_new_static(QDISC_KIND_CODEL, network, filename, section_line, &qdisc);
if (r == -ENOMEM)
@@ -141,14 +140,13 @@ int config_parse_controlled_delay_usec(
_cleanup_(qdisc_free_or_set_invalidp) QDisc *qdisc = NULL;
ControlledDelay *cd;
Network *network = data;
Network *network = ASSERT_PTR(data);
usec_t *p;
int r;
assert(filename);
assert(lvalue);
assert(rvalue);
assert(data);
r = qdisc_new_static(QDISC_KIND_CODEL, network, filename, section_line, &qdisc);
if (r == -ENOMEM)
@@ -207,13 +205,12 @@ int config_parse_controlled_delay_bool(
_cleanup_(qdisc_free_or_set_invalidp) QDisc *qdisc = NULL;
ControlledDelay *cd;
Network *network = data;
Network *network = ASSERT_PTR(data);
int r;
assert(filename);
assert(lvalue);
assert(rvalue);
assert(data);
r = qdisc_new_static(QDISC_KIND_CODEL, network, filename, section_line, &qdisc);
if (r == -ENOMEM)
src/network/tc/drr.c
+1 -2
View File
@@ -56,14 +56,13 @@ int config_parse_drr_size(
_cleanup_(tclass_free_or_set_invalidp) TClass *tclass = NULL;
DeficitRoundRobinSchedulerClass *drr;
Network *network = data;
Network *network = ASSERT_PTR(data);
uint64_t u;
int r;
assert(filename);
assert(lvalue);
assert(rvalue);
assert(data);
r = tclass_new_static(TCLASS_KIND_DRR, network, filename, section_line, &tclass);
if (r == -ENOMEM)
src/network/tc/ets.c
+3 -6
View File
@@ -90,14 +90,13 @@ int config_parse_ets_u8(
_cleanup_(qdisc_free_or_set_invalidp) QDisc *qdisc = NULL;
EnhancedTransmissionSelection *ets;
Network *network = data;
Network *network = ASSERT_PTR(data);
uint8_t v, *p;
int r;
assert(filename);
assert(lvalue);
assert(rvalue);
assert(data);
r = qdisc_new_static(QDISC_KIND_ETS, network, filename, section_line, &qdisc);
if (r == -ENOMEM)
@@ -157,13 +156,12 @@ int config_parse_ets_quanta(
_cleanup_(qdisc_free_or_set_invalidp) QDisc *qdisc = NULL;
EnhancedTransmissionSelection *ets;
Network *network = data;
Network *network = ASSERT_PTR(data);
int r;
assert(filename);
assert(lvalue);
assert(rvalue);
assert(data);
r = qdisc_new_static(QDISC_KIND_ETS, network, filename, section_line, &qdisc);
if (r == -ENOMEM)
@@ -241,13 +239,12 @@ int config_parse_ets_prio(
_cleanup_(qdisc_free_or_set_invalidp) QDisc *qdisc = NULL;
EnhancedTransmissionSelection *ets;
Network *network = data;
Network *network = ASSERT_PTR(data);
int r;
assert(filename);
assert(lvalue);
assert(rvalue);
assert(data);
r = qdisc_new_static(QDISC_KIND_ETS, network, filename, section_line, &qdisc);
if (r == -ENOMEM)
src/network/tc/fifo.c
+2 -4
View File
@@ -53,14 +53,13 @@ int config_parse_pfifo_size(
void *userdata) {
_cleanup_(qdisc_free_or_set_invalidp) QDisc *qdisc = NULL;
Network *network = data;
Network *network = ASSERT_PTR(data);
FirstInFirstOut *fifo;
int r;
assert(filename);
assert(lvalue);
assert(rvalue);
assert(data);
r = qdisc_new_static(ltype, network, filename, section_line, &qdisc);
if (r == -ENOMEM)
@@ -114,7 +113,7 @@ int config_parse_bfifo_size(
void *userdata) {
_cleanup_(qdisc_free_or_set_invalidp) QDisc *qdisc = NULL;
Network *network = data;
Network *network = ASSERT_PTR(data);
FirstInFirstOut *fifo;
uint64_t u;
int r;
@@ -122,7 +121,6 @@ int config_parse_bfifo_size(
assert(filename);
assert(lvalue);
assert(rvalue);
assert(data);
r = qdisc_new_static(QDISC_KIND_BFIFO, network, filename, section_line, &qdisc);
if (r == -ENOMEM)
src/network/tc/fq-codel.c
+4 -8
View File
@@ -108,14 +108,13 @@ int config_parse_fair_queueing_controlled_delay_u32(
_cleanup_(qdisc_free_or_set_invalidp) QDisc *qdisc = NULL;
FairQueueingControlledDelay *fqcd;
Network *network = data;
Network *network = ASSERT_PTR(data);
uint32_t *p;
int r;
assert(filename);
assert(lvalue);
assert(rvalue);
assert(data);
r = qdisc_new_static(QDISC_KIND_FQ_CODEL, network, filename, section_line, &qdisc);
if (r == -ENOMEM)
@@ -169,14 +168,13 @@ int config_parse_fair_queueing_controlled_delay_usec(
_cleanup_(qdisc_free_or_set_invalidp) QDisc *qdisc = NULL;
FairQueueingControlledDelay *fqcd;
Network *network = data;
Network *network = ASSERT_PTR(data);
usec_t *p;
int r;
assert(filename);
assert(lvalue);
assert(rvalue);
assert(data);
r = qdisc_new_static(QDISC_KIND_FQ_CODEL, network, filename, section_line, &qdisc);
if (r == -ENOMEM)
@@ -235,13 +233,12 @@ int config_parse_fair_queueing_controlled_delay_bool(
_cleanup_(qdisc_free_or_set_invalidp) QDisc *qdisc = NULL;
FairQueueingControlledDelay *fqcd;
Network *network = data;
Network *network = ASSERT_PTR(data);
int r;
assert(filename);
assert(lvalue);
assert(rvalue);
assert(data);
r = qdisc_new_static(QDISC_KIND_FQ_CODEL, network, filename, section_line, &qdisc);
if (r == -ENOMEM)
@@ -289,7 +286,7 @@ int config_parse_fair_queueing_controlled_delay_size(
_cleanup_(qdisc_free_or_set_invalidp) QDisc *qdisc = NULL;
FairQueueingControlledDelay *fqcd;
Network *network = data;
Network *network = ASSERT_PTR(data);
uint64_t sz;
uint32_t *p;
int r;
@@ -297,7 +294,6 @@ int config_parse_fair_queueing_controlled_delay_size(
assert(filename);
assert(lvalue);
assert(rvalue);
assert(data);
r = qdisc_new_static(QDISC_KIND_FQ_CODEL, network, filename, section_line, &qdisc);
if (r == -ENOMEM)
src/network/tc/fq-pie.c
+1 -2
View File
@@ -51,14 +51,13 @@ int config_parse_fq_pie_packet_limit(
_cleanup_(qdisc_free_or_set_invalidp) QDisc *qdisc = NULL;
FlowQueuePIE *fq_pie;
Network *network = data;
Network *network = ASSERT_PTR(data);
uint32_t val;
int r;
assert(filename);
assert(lvalue);
assert(rvalue);
assert(data);
r = qdisc_new_static(QDISC_KIND_FQ_PIE, network, filename, section_line, &qdisc);
if (r == -ENOMEM)
src/network/tc/fq.c
+5 -10
View File
@@ -116,14 +116,13 @@ int config_parse_fair_queueing_u32(
_cleanup_(qdisc_free_or_set_invalidp) QDisc *qdisc = NULL;
FairQueueing *fq;
Network *network = data;
Network *network = ASSERT_PTR(data);
uint32_t *p;
int r;
assert(filename);
assert(lvalue);
assert(rvalue);
assert(data);
r = qdisc_new_static(QDISC_KIND_FQ, network, filename, section_line, &qdisc);
if (r == -ENOMEM)
@@ -181,7 +180,7 @@ int config_parse_fair_queueing_size(
_cleanup_(qdisc_free_or_set_invalidp) QDisc *qdisc = NULL;
FairQueueing *fq;
Network *network = data;
Network *network = ASSERT_PTR(data);
uint64_t sz;
uint32_t *p;
int r;
@@ -189,7 +188,6 @@ int config_parse_fair_queueing_size(
assert(filename);
assert(lvalue);
assert(rvalue);
assert(data);
r = qdisc_new_static(QDISC_KIND_FQ, network, filename, section_line, &qdisc);
if (r == -ENOMEM)
@@ -250,13 +248,12 @@ int config_parse_fair_queueing_bool(
_cleanup_(qdisc_free_or_set_invalidp) QDisc *qdisc = NULL;
FairQueueing *fq;
Network *network = data;
Network *network = ASSERT_PTR(data);
int r;
assert(filename);
assert(lvalue);
assert(rvalue);
assert(data);
r = qdisc_new_static(QDISC_KIND_FQ, network, filename, section_line, &qdisc);
if (r == -ENOMEM)
@@ -304,14 +301,13 @@ int config_parse_fair_queueing_usec(
_cleanup_(qdisc_free_or_set_invalidp) QDisc *qdisc = NULL;
FairQueueing *fq;
Network *network = data;
Network *network = ASSERT_PTR(data);
usec_t sec;
int r;
assert(filename);
assert(lvalue);
assert(rvalue);
assert(data);
r = qdisc_new_static(QDISC_KIND_FQ, network, filename, section_line, &qdisc);
if (r == -ENOMEM)
@@ -365,14 +361,13 @@ int config_parse_fair_queueing_max_rate(
_cleanup_(qdisc_free_or_set_invalidp) QDisc *qdisc = NULL;
FairQueueing *fq;
Network *network = data;
Network *network = ASSERT_PTR(data);
uint64_t sz;
int r;
assert(filename);
assert(lvalue);
assert(rvalue);
assert(data);
r = qdisc_new_static(QDISC_KIND_FQ, network, filename, section_line, &qdisc);
if (r == -ENOMEM)
src/network/tc/gred.c
+2 -4
View File
@@ -79,7 +79,7 @@ int config_parse_generic_random_early_detection_u32(
_cleanup_(qdisc_free_or_set_invalidp) QDisc *qdisc = NULL;
GenericRandomEarlyDetection *gred;
Network *network = data;
Network *network = ASSERT_PTR(data);
uint32_t *p;
uint32_t v;
int r;
@@ -87,7 +87,6 @@ int config_parse_generic_random_early_detection_u32(
assert(filename);
assert(lvalue);
assert(rvalue);
assert(data);
r = qdisc_new_static(QDISC_KIND_GRED, network, filename, section_line, &qdisc);
if (r == -ENOMEM)
@@ -146,13 +145,12 @@ int config_parse_generic_random_early_detection_bool(
_cleanup_(qdisc_free_or_set_invalidp) QDisc *qdisc = NULL;
GenericRandomEarlyDetection *gred;
Network *network = data;
Network *network = ASSERT_PTR(data);
int r;
assert(filename);
assert(lvalue);
assert(rvalue);
assert(data);
r = qdisc_new_static(QDISC_KIND_GRED, network, filename, section_line, &qdisc);
if (r == -ENOMEM)
src/network/tc/hhf.c
+1 -2
View File
@@ -52,13 +52,12 @@ int config_parse_heavy_hitter_filter_packet_limit(
_cleanup_(qdisc_free_or_set_invalidp) QDisc *qdisc = NULL;
HeavyHitterFilter *hhf;
Network *network = data;
Network *network = ASSERT_PTR(data);
int r;
assert(filename);
assert(lvalue);
assert(rvalue);
assert(data);
r = qdisc_new_static(QDISC_KIND_HHF, network, filename, section_line, &qdisc);
if (r == -ENOMEM)
src/network/tc/htb.c
+5 -10
View File
@@ -59,13 +59,12 @@ int config_parse_hierarchy_token_bucket_default_class(
_cleanup_(qdisc_free_or_set_invalidp) QDisc *qdisc = NULL;
HierarchyTokenBucket *htb;
Network *network = data;
Network *network = ASSERT_PTR(data);
int r;
assert(filename);
assert(lvalue);
assert(rvalue);
assert(data);
r = qdisc_new_static(QDISC_KIND_HTB, network, filename, section_line, &qdisc);
if (r == -ENOMEM)
@@ -112,13 +111,12 @@ int config_parse_hierarchy_token_bucket_u32(
_cleanup_(qdisc_free_or_set_invalidp) QDisc *qdisc = NULL;
HierarchyTokenBucket *htb;
Network *network = data;
Network *network = ASSERT_PTR(data);
int r;
assert(filename);
assert(lvalue);
assert(rvalue);
assert(data);
r = qdisc_new_static(QDISC_KIND_HTB, network, filename, section_line, &qdisc);
if (r == -ENOMEM)
@@ -255,14 +253,13 @@ int config_parse_hierarchy_token_bucket_class_u32(
_cleanup_(tclass_free_or_set_invalidp) TClass *tclass = NULL;
HierarchyTokenBucketClass *htb;
Network *network = data;
Network *network = ASSERT_PTR(data);
uint32_t v;
int r;
assert(filename);
assert(lvalue);
assert(rvalue);
assert(data);
r = tclass_new_static(TCLASS_KIND_HTB, network, filename, section_line, &tclass);
if (r == -ENOMEM)
@@ -309,14 +306,13 @@ int config_parse_hierarchy_token_bucket_class_size(
_cleanup_(tclass_free_or_set_invalidp) TClass *tclass = NULL;
HierarchyTokenBucketClass *htb;
Network *network = data;
Network *network = ASSERT_PTR(data);
uint64_t v;
int r;
assert(filename);
assert(lvalue);
assert(rvalue);
assert(data);
r = tclass_new_static(TCLASS_KIND_HTB, network, filename, section_line, &tclass);
if (r == -ENOMEM)
@@ -393,14 +389,13 @@ int config_parse_hierarchy_token_bucket_class_rate(
_cleanup_(tclass_free_or_set_invalidp) TClass *tclass = NULL;
HierarchyTokenBucketClass *htb;
Network *network = data;
Network *network = ASSERT_PTR(data);
uint64_t *v;
int r;
assert(filename);
assert(lvalue);
assert(rvalue);
assert(data);
r = tclass_new_static(TCLASS_KIND_HTB, network, filename, section_line, &tclass);
if (r == -ENOMEM)
src/network/tc/netem.c
+3 -6
View File
@@ -61,7 +61,7 @@ int config_parse_network_emulator_delay(
void *userdata) {
_cleanup_(qdisc_free_or_set_invalidp) QDisc *qdisc = NULL;
Network *network = data;
Network *network = ASSERT_PTR(data);
NetworkEmulator *ne;
usec_t u;
int r;
@@ -69,7 +69,6 @@ int config_parse_network_emulator_delay(
assert(filename);
assert(lvalue);
assert(rvalue);
assert(data);
r = qdisc_new_static(QDISC_KIND_NETEM, network, filename, section_line, &qdisc);
if (r == -ENOMEM)
@@ -123,7 +122,7 @@ int config_parse_network_emulator_rate(
void *userdata) {
_cleanup_(qdisc_free_or_set_invalidp) QDisc *qdisc = NULL;
Network *network = data;
Network *network = ASSERT_PTR(data);
NetworkEmulator *ne;
uint32_t rate;
int r;
@@ -131,7 +130,6 @@ int config_parse_network_emulator_rate(
assert(filename);
assert(lvalue);
assert(rvalue);
assert(data);
r = qdisc_new_static(QDISC_KIND_NETEM, network, filename, section_line, &qdisc);
if (r == -ENOMEM)
@@ -184,14 +182,13 @@ int config_parse_network_emulator_packet_limit(
void *userdata) {
_cleanup_(qdisc_free_or_set_invalidp) QDisc *qdisc = NULL;
Network *network = data;
Network *network = ASSERT_PTR(data);
NetworkEmulator *ne;
int r;
assert(filename);
assert(lvalue);
assert(rvalue);
assert(data);
r = qdisc_new_static(QDISC_KIND_NETEM, network, filename, section_line, &qdisc);
if (r == -ENOMEM)
src/network/tc/pie.c
+1 -2
View File
@@ -51,13 +51,12 @@ int config_parse_pie_packet_limit(
_cleanup_(qdisc_free_or_set_invalidp) QDisc *qdisc = NULL;
ProportionalIntegralControllerEnhanced *pie;
Network *network = data;
Network *network = ASSERT_PTR(data);
int r;
assert(filename);
assert(lvalue);
assert(rvalue);
assert(data);
r = qdisc_new_static(QDISC_KIND_PIE, network, filename, section_line, &qdisc);
if (r == -ENOMEM)
src/network/tc/qdisc.c
+2 -4
View File
@@ -590,13 +590,12 @@ int config_parse_qdisc_parent(
void *userdata) {
_cleanup_(qdisc_free_or_set_invalidp) QDisc *qdisc = NULL;
Network *network = data;
Network *network = ASSERT_PTR(data);
int r;
assert(filename);
assert(lvalue);
assert(rvalue);
assert(data);
r = qdisc_new_static(ltype, network, filename, section_line, &qdisc);
if (r == -ENOMEM)
@@ -650,14 +649,13 @@ int config_parse_qdisc_handle(
void *userdata) {
_cleanup_(qdisc_free_or_set_invalidp) QDisc *qdisc = NULL;
Network *network = data;
Network *network = ASSERT_PTR(data);
uint16_t n;
int r;
assert(filename);
assert(lvalue);
assert(rvalue);
assert(data);
r = qdisc_new_static(ltype, network, filename, section_line, &qdisc);
if (r == -ENOMEM)
src/network/tc/qfq.c
+2 -4
View File
@@ -64,14 +64,13 @@ int config_parse_quick_fair_queueing_weight(
_cleanup_(tclass_free_or_set_invalidp) TClass *tclass = NULL;
QuickFairQueueingClass *qfq;
Network *network = data;
Network *network = ASSERT_PTR(data);
uint32_t v;
int r;
assert(filename);
assert(lvalue);
assert(rvalue);
assert(data);
r = tclass_new_static(TCLASS_KIND_QFQ, network, filename, section_line, &tclass);
if (r == -ENOMEM)
@@ -125,14 +124,13 @@ int config_parse_quick_fair_queueing_max_packet(
_cleanup_(tclass_free_or_set_invalidp) TClass *tclass = NULL;
QuickFairQueueingClass *qfq;
Network *network = data;
Network *network = ASSERT_PTR(data);
uint64_t v;
int r;
assert(filename);
assert(lvalue);
assert(rvalue);
assert(data);
r = tclass_new_static(TCLASS_KIND_QFQ, network, filename, section_line, &tclass);
if (r == -ENOMEM)
src/network/tc/sfb.c
+1 -2
View File
@@ -62,13 +62,12 @@ int config_parse_stochastic_fair_blue_u32(
_cleanup_(qdisc_free_or_set_invalidp) QDisc *qdisc = NULL;
StochasticFairBlue *sfb;
Network *network = data;
Network *network = ASSERT_PTR(data);
int r;
assert(filename);
assert(lvalue);
assert(rvalue);
assert(data);
r = qdisc_new_static(QDISC_KIND_SFB, network, filename, section_line, &qdisc);
if (r == -ENOMEM)
src/network/tc/sfq.c
+1 -2
View File
@@ -46,13 +46,12 @@ int config_parse_stochastic_fairness_queueing_perturb_period(
_cleanup_(qdisc_free_or_set_invalidp) QDisc *qdisc = NULL;
StochasticFairnessQueueing *sfq;
Network *network = data;
Network *network = ASSERT_PTR(data);
int r;
assert(filename);
assert(lvalue);
assert(rvalue);
assert(data);
r = qdisc_new_static(QDISC_KIND_SFQ, network, filename, section_line, &qdisc);
if (r == -ENOMEM)
src/network/tc/tbf.c
+3 -6
View File
@@ -123,7 +123,7 @@ int config_parse_token_bucket_filter_size(
void *userdata) {
_cleanup_(qdisc_free_or_set_invalidp) QDisc *qdisc = NULL;
Network *network = data;
Network *network = ASSERT_PTR(data);
TokenBucketFilter *tbf;
uint64_t k;
int r;
@@ -131,7 +131,6 @@ int config_parse_token_bucket_filter_size(
assert(filename);
assert(lvalue);
assert(rvalue);
assert(data);
r = qdisc_new_static(QDISC_KIND_TBF, network, filename, section_line, &qdisc);
if (r == -ENOMEM)
@@ -197,7 +196,7 @@ int config_parse_token_bucket_filter_rate(
void *userdata) {
_cleanup_(qdisc_free_or_set_invalidp) QDisc *qdisc = NULL;
Network *network = data;
Network *network = ASSERT_PTR(data);
TokenBucketFilter *tbf;
uint64_t k, *p;
int r;
@@ -205,7 +204,6 @@ int config_parse_token_bucket_filter_rate(
assert(filename);
assert(lvalue);
assert(rvalue);
assert(data);
r = qdisc_new_static(QDISC_KIND_TBF, network, filename, section_line, &qdisc);
if (r == -ENOMEM)
@@ -259,7 +257,7 @@ int config_parse_token_bucket_filter_latency(
void *userdata) {
_cleanup_(qdisc_free_or_set_invalidp) QDisc *qdisc = NULL;
Network *network = data;
Network *network = ASSERT_PTR(data);
TokenBucketFilter *tbf;
usec_t u;
int r;
@@ -267,7 +265,6 @@ int config_parse_token_bucket_filter_latency(
assert(filename);
assert(lvalue);
assert(rvalue);
assert(data);
r = qdisc_new_static(QDISC_KIND_TBF, network, filename, section_line, &qdisc);
if (r == -ENOMEM)
src/network/tc/tclass.c
+2 -4
View File
@@ -523,13 +523,12 @@ int config_parse_tclass_parent(
void *userdata) {
_cleanup_(tclass_free_or_set_invalidp) TClass *tclass = NULL;
Network *network = data;
Network *network = ASSERT_PTR(data);
int r;
assert(filename);
assert(lvalue);
assert(rvalue);
assert(data);
r = tclass_new_static(ltype, network, filename, section_line, &tclass);
if (r == -ENOMEM)
@@ -570,13 +569,12 @@ int config_parse_tclass_classid(
void *userdata) {
_cleanup_(tclass_free_or_set_invalidp) TClass *tclass = NULL;
Network *network = data;
Network *network = ASSERT_PTR(data);
int r;
assert(filename);
assert(lvalue);
assert(rvalue);
assert(data);
r = tclass_new_static(ltype, network, filename, section_line, &tclass);
if (r == -ENOMEM)
src/network/tc/teql.c
+1 -2
View File
@@ -52,14 +52,13 @@ int config_parse_trivial_link_equalizer_id(
_cleanup_(qdisc_free_or_set_invalidp) QDisc *qdisc = NULL;
TrivialLinkEqualizer *teql;
Network *network = data;
Network *network = ASSERT_PTR(data);
unsigned id;
int r;
assert(filename);
assert(lvalue);
assert(rvalue);
assert(data);
r = qdisc_new_static(QDISC_KIND_TEQL, network, filename, section_line, &qdisc);
if (r == -ENOMEM)
src/network/wait-online/manager.c
+2 -5
View File
@@ -176,14 +176,13 @@ bool manager_configured(Manager *m) {
}
static int manager_process_link(sd_netlink *rtnl, sd_netlink_message *mm, void *userdata) {
Manager *m = userdata;
Manager *m = ASSERT_PTR(userdata);
uint16_t type;
Link *l;
const char *ifname;
int ifindex, r;
assert(rtnl);
assert(m);
assert(mm);
r = sd_netlink_message_get_type(mm, &type);
@@ -302,12 +301,10 @@ static int manager_rtnl_listen(Manager *m) {
}
static int on_network_event(sd_event_source *s, int fd, uint32_t revents, void *userdata) {
Manager *m = userdata;
Manager *m = ASSERT_PTR(userdata);
Link *l;
int r;
assert(m);
sd_network_monitor_flush(m->network_monitor);
HASHMAP_FOREACH(l, m->links_by_index) {