network: tc - use TAKE_PTR (#18266)

* network: tc cake - use TAKE_PTR

* network: tc htb - use TAKE_PTR

* network: tc pie - use TAKE_PTR

* network: tc netem - use TAKE_PTR

* network: tc hhf - use TAKE_PTR

* network: tc gred - use TAKE_PTR

* network: tc fq codel - use TAKE_PTR

* network: tc fifo - use TAKE_PTR

* network: tc drr - use TAKE_PTR

* network: tc qdisc - use TAKE_PTR

diff --git a/src/network/tc/cake.c b/src/network/tc/cake.c
index 76fb718f9c41fd7ae209b9312a1887610269c0bc..70dd095e932732ac023fba6157b2c125a647f685 100644 (file)
--- a/src/network/tc/cake.c
+++ b/src/network/tc/cake.c
@@ -79,7 +79,7 @@ int config_parse_cake_bandwidth(
         if (isempty(rvalue)) {
                 c->bandwidth = 0;
 
-                qdisc = NULL;
+                TAKE_PTR(qdisc);
                 return 0;
         }
 
@@ -92,7 +92,7 @@ int config_parse_cake_bandwidth(
         }
 
         c->bandwidth = k/8;
-        qdisc = NULL;
+        TAKE_PTR(qdisc);
 
         return 0;
 }
@@ -133,7 +133,7 @@ int config_parse_cake_overhead(
 
         if (isempty(rvalue)) {
                 c->overhead = 0;
-                qdisc = NULL;
+                TAKE_PTR(qdisc);
                 return 0;
         }
 
@@ -152,7 +152,7 @@ int config_parse_cake_overhead(
         }
 
         c->overhead = v;
-        qdisc = NULL;
+        TAKE_PTR(qdisc);
         return 0;
 }
 

diff --git a/src/network/tc/drr.c b/src/network/tc/drr.c
index 86b7f433112b8c60d7cb8d107f858d79350b57f7..ab67b0ad3e163bcef5761cf781ad121a8306daf0 100644 (file)
--- a/src/network/tc/drr.c
+++ b/src/network/tc/drr.c
@@ -79,7 +79,7 @@ int config_parse_drr_size(
         if (isempty(rvalue)) {
                 drr->quantum = 0;
 
-                tclass = NULL;
+                TAKE_PTR(tclass);
                 return 0;
         }
 
@@ -98,7 +98,7 @@ int config_parse_drr_size(
 
         drr->quantum = (uint32_t) u;
 
-        tclass = NULL;
+        TAKE_PTR(tclass);
         return 0;
 }
 

diff --git a/src/network/tc/fifo.c b/src/network/tc/fifo.c
index 8b1fa6ee405a40dbdb12c76d6db7dbf62abbe00e..3aa957373148eeda68cbf52ca5cf5d8c10e75ee1 100644 (file)
--- a/src/network/tc/fifo.c
+++ b/src/network/tc/fifo.c
@@ -87,7 +87,7 @@ int config_parse_pfifo_size(
         if (isempty(rvalue)) {
                 fifo->limit = 0;
 
-                qdisc = NULL;
+                TAKE_PTR(qdisc);
                 return 0;
         }
 
@@ -99,7 +99,7 @@ int config_parse_pfifo_size(
                 return 0;
         }
 
-        qdisc = NULL;
+        TAKE_PTR(qdisc);
         return 0;
 }
 
@@ -140,7 +140,7 @@ int config_parse_bfifo_size(
         if (isempty(rvalue)) {
                 fifo->limit = 0;
 
-                qdisc = NULL;
+                TAKE_PTR(qdisc);
                 return 0;
         }
 
@@ -159,7 +159,7 @@ int config_parse_bfifo_size(
 
         fifo->limit = (uint32_t) u;
 
-        qdisc = NULL;
+        TAKE_PTR(qdisc);
         return 0;
 }
 

diff --git a/src/network/tc/fq-codel.c b/src/network/tc/fq-codel.c
index 958f65a28b3ed7fcdae0c1c03ae7b580872cc394..bcc734df90fc910a9e3ce2a3ebbe9264e7e1f732 100644 (file)
--- a/src/network/tc/fq-codel.c
+++ b/src/network/tc/fq-codel.c
@@ -138,7 +138,7 @@ int config_parse_fair_queueing_controlled_delay_u32(
         if (isempty(rvalue)) {
                 *p = 0;
 
-                qdisc = NULL;
+                TAKE_PTR(qdisc);
                 return 0;
         }
 
@@ -150,7 +150,7 @@ int config_parse_fair_queueing_controlled_delay_u32(
                 return 0;
         }
 
-        qdisc = NULL;
+        TAKE_PTR(qdisc);
 
         return 0;
 }
@@ -204,7 +204,7 @@ int config_parse_fair_queueing_controlled_delay_usec(
                 else
                         *p = 0;
 
-                qdisc = NULL;
+                TAKE_PTR(qdisc);
                 return 0;
         }
 
@@ -216,7 +216,7 @@ int config_parse_fair_queueing_controlled_delay_usec(
                 return 0;
         }
 
-        qdisc = NULL;
+        TAKE_PTR(qdisc);
 
         return 0;
 }
@@ -257,7 +257,7 @@ int config_parse_fair_queueing_controlled_delay_bool(
         if (isempty(rvalue)) {
                 fqcd->ecn = -1;
 
-                qdisc = NULL;
+                TAKE_PTR(qdisc);
                 return 0;
         }
 
@@ -270,7 +270,7 @@ int config_parse_fair_queueing_controlled_delay_bool(
         }
 
         fqcd->ecn = r;
-        qdisc = NULL;
+        TAKE_PTR(qdisc);
 
         return 0;
 }
@@ -323,7 +323,7 @@ int config_parse_fair_queueing_controlled_delay_size(
                 else
                         *p = 0;
 
-                qdisc = NULL;
+                TAKE_PTR(qdisc);
                 return 0;
         }
 
@@ -342,7 +342,7 @@ int config_parse_fair_queueing_controlled_delay_size(
         }
 
         *p = sz;
-        qdisc = NULL;
+        TAKE_PTR(qdisc);
 
         return 0;
 }

diff --git a/src/network/tc/gred.c b/src/network/tc/gred.c
index 46a9eadf8764de9eca0365c3d8d7ab0f36c623ef..04fcd59e48bcfa262e3008d55d3cfaef2a8518d3 100644 (file)
--- a/src/network/tc/gred.c
+++ b/src/network/tc/gred.c
@@ -111,7 +111,7 @@ int config_parse_generic_random_early_detection_u32(
         if (isempty(rvalue)) {
                 *p = 0;
 
-                qdisc = NULL;
+                TAKE_PTR(qdisc);
                 return 0;
         }
 
@@ -129,7 +129,7 @@ int config_parse_generic_random_early_detection_u32(
                            lvalue, rvalue);
 
         *p = v;
-        qdisc = NULL;
+        TAKE_PTR(qdisc);
 
         return 0;
 }
@@ -169,7 +169,7 @@ int config_parse_generic_random_early_detection_bool(
         if (isempty(rvalue)) {
                 gred->grio = -1;
 
-                qdisc = NULL;
+                TAKE_PTR(qdisc);
                 return 0;
         }
 
@@ -182,7 +182,7 @@ int config_parse_generic_random_early_detection_bool(
         }
 
         gred->grio = r;
-        qdisc = NULL;
+        TAKE_PTR(qdisc);
 
         return 0;
 }

diff --git a/src/network/tc/hhf.c b/src/network/tc/hhf.c
index 69c02f481033dbd7a2260cb3380c30f7b99bb3ad..68a4b4571021f5d53132332e8df244bffa5d8559 100644 (file)
--- a/src/network/tc/hhf.c
+++ b/src/network/tc/hhf.c
@@ -74,7 +74,7 @@ int config_parse_heavy_hitter_filter_packet_limit(
         if (isempty(rvalue)) {
                 hhf->packet_limit = 0;
 
-                qdisc = NULL;
+                TAKE_PTR(qdisc);
                 return 0;
         }
 
@@ -86,7 +86,7 @@ int config_parse_heavy_hitter_filter_packet_limit(
                 return 0;
         }
 
-        qdisc = NULL;
+        TAKE_PTR(qdisc);
 
         return 0;
 }

diff --git a/src/network/tc/htb.c b/src/network/tc/htb.c
index 0969587c40a718d047bce2536a58d7628a130809..17455248a7a66af31c23c5e6237ee43a7392c1f7 100644 (file)
--- a/src/network/tc/htb.c
+++ b/src/network/tc/htb.c
@@ -80,7 +80,7 @@ int config_parse_hierarchy_token_bucket_default_class(
         if (isempty(rvalue)) {
                 htb->default_class = 0;
 
-                qdisc = NULL;
+                TAKE_PTR(qdisc);
                 return 0;
         }
 
@@ -92,7 +92,7 @@ int config_parse_hierarchy_token_bucket_default_class(
                 return 0;
         }
 
-        qdisc = NULL;
+        TAKE_PTR(qdisc);
 
         return 0;
 }
@@ -133,7 +133,7 @@ int config_parse_hierarchy_token_bucket_u32(
         if (isempty(rvalue)) {
                 htb->rate_to_quantum = HTB_DEFAULT_RATE_TO_QUANTUM;
 
-                qdisc = NULL;
+                TAKE_PTR(qdisc);
                 return 0;
         }
 
@@ -145,7 +145,7 @@ int config_parse_hierarchy_token_bucket_u32(
                 return 0;
         }
 
-        qdisc = NULL;
+        TAKE_PTR(qdisc);
 
         return 0;
 }

diff --git a/src/network/tc/netem.c b/src/network/tc/netem.c
index 454e556d2e11f9edf8ca7b623b886cfcefcdd3f6..2d86d53125b86417aff8683f6e16a68217d858f3 100644 (file)
--- a/src/network/tc/netem.c
+++ b/src/network/tc/netem.c
@@ -94,7 +94,7 @@ int config_parse_network_emulator_delay(
                 else if (STR_IN_SET(lvalue, "DelayJitterSec", "NetworkEmulatorDelayJitterSec"))
                         ne->jitter = USEC_INFINITY;
 
-                qdisc = NULL;
+                TAKE_PTR(qdisc);
                 return 0;
         }
 
@@ -111,7 +111,7 @@ int config_parse_network_emulator_delay(
         else if (STR_IN_SET(lvalue, "DelayJitterSec", "NetworkEmulatorDelayJitterSec"))
                 ne->jitter = u;
 
-        qdisc = NULL;
+        TAKE_PTR(qdisc);
 
         return 0;
 }
@@ -156,7 +156,7 @@ int config_parse_network_emulator_rate(
                 else if (STR_IN_SET(lvalue, "DuplicateRate", "NetworkEmulatorDuplicateRate"))
                         ne->duplicate = 0;
 
-                qdisc = NULL;
+                TAKE_PTR(qdisc);
                 return 0;
         }
 
@@ -173,7 +173,7 @@ int config_parse_network_emulator_rate(
         else if (STR_IN_SET(lvalue, "DuplicateRate", "NetworkEmulatorDuplicateRate"))
                 ne->duplicate = rate;
 
-        qdisc = NULL;
+        TAKE_PTR(qdisc);
         return 0;
 }
 
@@ -212,8 +212,8 @@ int config_parse_network_emulator_packet_limit(
 
         if (isempty(rvalue)) {
                 ne->limit = 0;
-                qdisc = NULL;
 
+                TAKE_PTR(qdisc);
                 return 0;
         }
 
@@ -225,7 +225,7 @@ int config_parse_network_emulator_packet_limit(
                 return 0;
         }
 
-        qdisc = NULL;
+        TAKE_PTR(qdisc);
         return 0;
 }
 

diff --git a/src/network/tc/pie.c b/src/network/tc/pie.c
index 695a38171d00d1f0cee49c3b13473b157527d2fc..4fcfe625b40977cc2fd65c5ed2a012b5a00e486d 100644 (file)
--- a/src/network/tc/pie.c
+++ b/src/network/tc/pie.c
@@ -73,7 +73,7 @@ int config_parse_pie_packet_limit(
         if (isempty(rvalue)) {
                 pie->packet_limit = 0;
 
-                qdisc = NULL;
+                TAKE_PTR(qdisc);
                 return 0;
         }
 
@@ -85,7 +85,7 @@ int config_parse_pie_packet_limit(
                 return 0;
         }
 
-        qdisc = NULL;
+        TAKE_PTR(qdisc);
 
         return 0;
 }

diff --git a/src/network/tc/qdisc.c b/src/network/tc/qdisc.c
index 2add12816aefadac1b495d216290f32d9a9dfb54..1a84e8b0f5c57e23f18ec170d2423875eca6d187 100644 (file)
--- a/src/network/tc/qdisc.c
+++ b/src/network/tc/qdisc.c
@@ -324,7 +324,7 @@ int config_parse_qdisc_parent(
         } else
                 qdisc->tca_kind = mfree(qdisc->tca_kind);
 
-        qdisc = NULL;
+        TAKE_PTR(qdisc);
 
         return 0;
 }
@@ -362,7 +362,7 @@ int config_parse_qdisc_handle(
 
         if (isempty(rvalue)) {
                 qdisc->handle = TC_H_UNSPEC;
-                qdisc = NULL;
+                TAKE_PTR(qdisc);
                 return 0;
         }
 
@@ -375,7 +375,7 @@ int config_parse_qdisc_handle(
         }
 
         qdisc->handle = (uint32_t) n << 16;
-        qdisc = NULL;
+        TAKE_PTR(qdisc);
 
         return 0;
 }