summaryrefslogtreecommitdiffstats
path: root/src/shared/vlan-util.c
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2022-08-09 14:35:15 +0200
committerDavid Tardon <dtardon@redhat.com>2022-09-13 08:13:27 +0200
commit995340074e554b4bf4a0fdb0cb7436692c5a4ffd (patch)
treeca3ee001db3e608ee80478f42fea9c3b409f1b7b /src/shared/vlan-util.c
parentMerge pull request #23087 from yuwata/udev-watch (diff)
downloadsystemd-995340074e554b4bf4a0fdb0cb7436692c5a4ffd.tar.xz
systemd-995340074e554b4bf4a0fdb0cb7436692c5a4ffd.zip
tree-wide: use ASSERT_PTR more
Diffstat (limited to 'src/shared/vlan-util.c')
-rw-r--r--src/shared/vlan-util.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/shared/vlan-util.c b/src/shared/vlan-util.c
index cb43d50220..17f2d3990b 100644
--- a/src/shared/vlan-util.c
+++ b/src/shared/vlan-util.c
@@ -49,11 +49,10 @@ int config_parse_default_port_vlanid(
const char *rvalue,
void *data,
void *userdata) {
- uint16_t *id = data;
+ uint16_t *id = ASSERT_PTR(data);
assert(lvalue);
assert(rvalue);
- assert(data);
if (streq(rvalue, "none")) {
*id = 0;
@@ -76,13 +75,12 @@ int config_parse_vlanid(
void *data,
void *userdata) {
- uint16_t *id = data;
+ uint16_t *id = ASSERT_PTR(data);
int r;
assert(filename);
assert(lvalue);
assert(rvalue);
- assert(data);
r = parse_vlanid(rvalue, id);
if (r == -ERANGE) {