From: Susant Sahani <ssahani@vmware.com>
Date: Sun, 17 Jan 2021 10:14:15 +0000 (+0100)
Subject: network: tc use TAKE_PTR
X-Git-Tag: v248-rc1~316
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5a3e1cb918eaf8b55f9671a775359f7b1644a447;p=thirdparty%2Fsystemd.git

network: tc use TAKE_PTR
---

diff --git a/src/network/tc/qfq.c b/src/network/tc/qfq.c
index 320f2c1c525..d2e7b875efc 100644
--- a/src/network/tc/qfq.c
+++ b/src/network/tc/qfq.c
@@ -85,7 +85,7 @@ int config_parse_quick_fair_queueing_weight(
 
         if (isempty(rvalue)) {
                 qfq->weight = 0;
-                tclass = NULL;
+                TAKE_PTR(tclass);
                 return 0;
         }
 
@@ -105,7 +105,7 @@ int config_parse_quick_fair_queueing_weight(
         }
 
         qfq->weight = v;
-        tclass = NULL;
+        TAKE_PTR(tclass);
 
         return 0;
 }
@@ -146,7 +146,7 @@ int config_parse_quick_fair_queueing_max_packet(
 
         if (isempty(rvalue)) {
                 qfq->max_packet = 0;
-                tclass = NULL;
+                TAKE_PTR(tclass);
                 return 0;
         }
 
@@ -166,7 +166,7 @@ int config_parse_quick_fair_queueing_max_packet(
         }
 
         qfq->max_packet = (uint32_t) v;
-        tclass = NULL;
+        TAKE_PTR(tclass);
 
         return 0;
 }
diff --git a/src/network/tc/sfb.c b/src/network/tc/sfb.c
index 674fdf6ac7d..a4ca4884b18 100644
--- a/src/network/tc/sfb.c
+++ b/src/network/tc/sfb.c
@@ -84,7 +84,7 @@ int config_parse_stochastic_fair_blue_u32(
         if (isempty(rvalue)) {
                 sfb->packet_limit = 0;
 
-                qdisc = NULL;
+                TAKE_PTR(qdisc);
                 return 0;
         }
 
@@ -96,7 +96,7 @@ int config_parse_stochastic_fair_blue_u32(
                 return 0;
         }
 
-        qdisc = NULL;
+        TAKE_PTR(qdisc);
 
         return 0;
 }
diff --git a/src/network/tc/sfq.c b/src/network/tc/sfq.c
index 387be83a996..f67ffc186df 100644
--- a/src/network/tc/sfq.c
+++ b/src/network/tc/sfq.c
@@ -67,7 +67,7 @@ int config_parse_stochastic_fairness_queueing_perturb_period(
         if (isempty(rvalue)) {
                 sfq->perturb_period = 0;
 
-                qdisc = NULL;
+                TAKE_PTR(qdisc);
                 return 0;
         }
 
@@ -79,7 +79,7 @@ int config_parse_stochastic_fairness_queueing_perturb_period(
                 return 0;
         }
 
-        qdisc = NULL;
+        TAKE_PTR(qdisc);
 
         return 0;
 }
diff --git a/src/network/tc/tbf.c b/src/network/tc/tbf.c
index 2d84c5a833b..50d14a53564 100644
--- a/src/network/tc/tbf.c
+++ b/src/network/tc/tbf.c
@@ -156,7 +156,7 @@ int config_parse_token_bucket_filter_size(
                 else
                         assert_not_reached("unknown lvalue");
 
-                qdisc = NULL;
+                TAKE_PTR(qdisc);
                 return 0;
         }
 
@@ -179,7 +179,7 @@ int config_parse_token_bucket_filter_size(
         else
                 assert_not_reached("unknown lvalue");
 
-        qdisc = NULL;
+        TAKE_PTR(qdisc);
 
         return 0;
 }
@@ -227,7 +227,7 @@ int config_parse_token_bucket_filter_rate(
         if (isempty(rvalue)) {
                 *p = 0;
 
-                qdisc = NULL;
+                TAKE_PTR(qdisc);
                 return 0;
         }
 
diff --git a/src/network/tc/tclass.c b/src/network/tc/tclass.c
index 4c03587211e..64bdfbb90b0 100644
--- a/src/network/tc/tclass.c
+++ b/src/network/tc/tclass.c
@@ -230,7 +230,7 @@ int config_parse_tclass_parent(
                 }
         }
 
-        tclass = NULL;
+        TAKE_PTR(tclass);
 
         return 0;
 }
@@ -267,7 +267,7 @@ int config_parse_tclass_classid(
 
         if (isempty(rvalue)) {
                 tclass->classid = TC_H_UNSPEC;
-                tclass = NULL;
+                TAKE_PTR(tclass);
                 return 0;
         }
 
@@ -279,7 +279,7 @@ int config_parse_tclass_classid(
                 return 0;
         }
 
-        tclass = NULL;
+        TAKE_PTR(tclass);
 
         return 0;
 }
diff --git a/src/network/tc/teql.c b/src/network/tc/teql.c
index 0da2fc357e2..633a7827b4b 100644
--- a/src/network/tc/teql.c
+++ b/src/network/tc/teql.c
@@ -68,7 +68,7 @@ int config_parse_trivial_link_equalizer_id(
         if (isempty(rvalue)) {
                 teql->id = 0;
 
-                qdisc = NULL;
+                TAKE_PTR(qdisc);
                 return 0;
         }
 
@@ -86,6 +86,6 @@ int config_parse_trivial_link_equalizer_id(
 
         teql->id = id;
 
-        qdisc = NULL;
+        TAKE_PTR(qdisc);
         return 0;
 }