From: Susant Sahani <ssahani@gmail.com>
Date: Fri, 15 Jan 2021 18:00:13 +0000 (+0100)
Subject: network: address label - use TAKE_PTR
X-Git-Tag: v248-rc1~329^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F18264%2Fhead;p=thirdparty%2Fsystemd.git

network: address label - use TAKE_PTR
---

diff --git a/src/network/networkd-address-label.c b/src/network/networkd-address-label.c
index f933a1da945..44d0b6c8473 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 4137b299452..551fa5928ff 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;
 }