network: make DEFINE_NETDEV_CAST() assert on input and output

The macro used to return NULL if input was NULL or had the wrong type. Now
it asserts that input is nonnull and it has the expected type.

There are a few places where a missing or mismatched type was OK, but in a
majority of places, we would do both of the asserts. In various places we'd
only do one, but that was by ommission/mistake. So moving the asserts into the
macro allows us to save some lines.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2023-09-22 08:17:42 +02:00
parent 6c9935ba87
commit 117843fe95
23 changed files with 137 additions and 446 deletions
+3 -7
View File
@@ -21,10 +21,9 @@ DEFINE_CONFIG_PARSE_ENUM(config_parse_bare_udp_iftype, bare_udp_protocol, BareUD
"Failed to parse EtherType=");
static int netdev_bare_udp_fill_message_create(NetDev *netdev, Link *link, sd_netlink_message *m) {
assert(netdev);
assert(m);
BareUDP *u = ASSERT_PTR(BAREUDP(netdev));
BareUDP *u = BAREUDP(netdev);
int r;
r = sd_netlink_message_append_u16(m, IFLA_BAREUDP_ETHERTYPE, htobe16(u->iftype));
@@ -39,10 +38,9 @@ static int netdev_bare_udp_fill_message_create(NetDev *netdev, Link *link, sd_ne
}
static int netdev_bare_udp_verify(NetDev *netdev, const char *filename) {
assert(netdev);
assert(filename);
BareUDP *u = ASSERT_PTR(BAREUDP(netdev));
BareUDP *u = BAREUDP(netdev);
if (u->dest_port == 0)
return log_netdev_warning_errno(netdev, SYNTHETIC_ERRNO(EINVAL),
@@ -56,9 +54,7 @@ static int netdev_bare_udp_verify(NetDev *netdev, const char *filename) {
}
static void bare_udp_init(NetDev *netdev) {
assert(netdev);
BareUDP *u = ASSERT_PTR(BAREUDP(netdev));
BareUDP *u = BAREUDP(netdev);
u->iftype = _BARE_UDP_PROTOCOL_INVALID;
}