From fb7a534f7f5696232f1a7e48caa330347cb96714 Mon Sep 17 00:00:00 2001 From: Susant Sahani Date: Fri, 15 Jan 2021 18:55:17 +0100 Subject: [PATCH 1/3] network: nexthop - use TAKE_PTR --- src/network/networkd-nexthop.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/network/networkd-nexthop.c b/src/network/networkd-nexthop.c index 13f532763d..46e1e42b30 100644 --- a/src/network/networkd-nexthop.c +++ b/src/network/networkd-nexthop.c @@ -183,8 +183,7 @@ static int nexthop_add_internal(Link *link, Set **nexthops, NextHop *in, NextHop if (ret) *ret = nexthop; - nexthop = NULL; - + TAKE_PTR(nexthop); return 0; } From eccc11a47aa14b1d5a132260a4435b9c9f31a6d4 Mon Sep 17 00:00:00 2001 From: Susant Sahani Date: Fri, 15 Jan 2021 18:57:11 +0100 Subject: [PATCH 2/3] network: mdb - use TAKE_PTR --- src/network/networkd-mdb.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/network/networkd-mdb.c b/src/network/networkd-mdb.c index 7007a8202d..33ad9e969d 100644 --- a/src/network/networkd-mdb.c +++ b/src/network/networkd-mdb.c @@ -326,8 +326,7 @@ int config_parse_mdb_vlan_id( if (r < 0) return r; - mdb_entry = NULL; - + TAKE_PTR(mdb_entry); return 0; } @@ -364,7 +363,6 @@ int config_parse_mdb_group_address( return 0; } - mdb_entry = NULL; - + TAKE_PTR(mdb_entry); return 0; } From dea161d9a1d512c88fdfb92fe70c2f1b989a92ba Mon Sep 17 00:00:00 2001 From: Susant Sahani Date: Fri, 15 Jan 2021 19:00:13 +0100 Subject: [PATCH 3/3] network: address label - use TAKE_PTR --- src/network/networkd-address-label.c | 5 ++--- src/network/networkd-address.c | 13 ++++++------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/network/networkd-address-label.c b/src/network/networkd-address-label.c index f933a1da94..44d0b6c847 100644 --- a/src/network/networkd-address-label.c +++ b/src/network/networkd-address-label.c @@ -192,8 +192,7 @@ int config_parse_address_label_prefix(const char *unit, return 0; } - n = NULL; - + TAKE_PTR(n); return 0; } @@ -236,7 +235,7 @@ int config_parse_address_label( } n->label = k; - n = NULL; + TAKE_PTR(n); return 0; } diff --git a/src/network/networkd-address.c b/src/network/networkd-address.c index 4137b29945..551fa5928f 100644 --- a/src/network/networkd-address.c +++ b/src/network/networkd-address.c @@ -1455,7 +1455,7 @@ int config_parse_broadcast( } n->family = AF_INET; - n = NULL; + TAKE_PTR(n); return 0; } @@ -1538,8 +1538,7 @@ int config_parse_address( else n->in_addr_peer = buffer; - n = NULL; - + TAKE_PTR(n); return 0; } @@ -1584,7 +1583,7 @@ int config_parse_label( if (r < 0) return log_oom(); - n = NULL; + TAKE_PTR(n); return 0; } @@ -1680,7 +1679,7 @@ int config_parse_address_flags( SET_FLAG(n->flags, ltype, r); - n = NULL; + TAKE_PTR(n); return 0; } @@ -1731,7 +1730,7 @@ int config_parse_address_scope( } n->scope_set = true; - n = NULL; + TAKE_PTR(n); return 0; } @@ -1786,7 +1785,7 @@ int config_parse_duplicate_address_detection( } n->duplicate_address_detection = a; - n = NULL; + TAKE_PTR(n); return 0; }