Skip to content

Commit 0132453

Browse files
ssahanissahani
authored
network: tc - use TAKE_PTR (systemd#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
1 parent 2b5a140 commit 0132453

File tree

10 files changed

+39
-39
lines changed

10 files changed

+39
-39
lines changed

‎src/network/tc/cake.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ int config_parse_cake_bandwidth(
7979
if (isempty(rvalue)) {
8080
c->bandwidth = 0;
8181

82-
qdisc = NULL;
82+
TAKE_PTR(qdisc);
8383
return 0;
8484
}
8585

@@ -92,7 +92,7 @@ int config_parse_cake_bandwidth(
9292
}
9393

9494
c->bandwidth = k/8;
95-
qdisc = NULL;
95+
TAKE_PTR(qdisc);
9696

9797
return 0;
9898
}
@@ -133,7 +133,7 @@ int config_parse_cake_overhead(
133133

134134
if (isempty(rvalue)) {
135135
c->overhead = 0;
136-
qdisc = NULL;
136+
TAKE_PTR(qdisc);
137137
return 0;
138138
}
139139

@@ -152,7 +152,7 @@ int config_parse_cake_overhead(
152152
}
153153

154154
c->overhead = v;
155-
qdisc = NULL;
155+
TAKE_PTR(qdisc);
156156
return 0;
157157
}
158158

‎src/network/tc/drr.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ int config_parse_drr_size(
7979
if (isempty(rvalue)) {
8080
drr->quantum = 0;
8181

82-
tclass = NULL;
82+
TAKE_PTR(tclass);
8383
return 0;
8484
}
8585

@@ -98,7 +98,7 @@ int config_parse_drr_size(
9898

9999
drr->quantum = (uint32_t) u;
100100

101-
tclass = NULL;
101+
TAKE_PTR(tclass);
102102
return 0;
103103
}
104104

‎src/network/tc/fifo.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ int config_parse_pfifo_size(
8787
if (isempty(rvalue)) {
8888
fifo->limit = 0;
8989

90-
qdisc = NULL;
90+
TAKE_PTR(qdisc);
9191
return 0;
9292
}
9393

@@ -99,7 +99,7 @@ int config_parse_pfifo_size(
9999
return 0;
100100
}
101101

102-
qdisc = NULL;
102+
TAKE_PTR(qdisc);
103103
return 0;
104104
}
105105

@@ -140,7 +140,7 @@ int config_parse_bfifo_size(
140140
if (isempty(rvalue)) {
141141
fifo->limit = 0;
142142

143-
qdisc = NULL;
143+
TAKE_PTR(qdisc);
144144
return 0;
145145
}
146146

@@ -159,7 +159,7 @@ int config_parse_bfifo_size(
159159

160160
fifo->limit = (uint32_t) u;
161161

162-
qdisc = NULL;
162+
TAKE_PTR(qdisc);
163163
return 0;
164164
}
165165

‎src/network/tc/fq-codel.c‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ int config_parse_fair_queueing_controlled_delay_u32(
138138
if (isempty(rvalue)) {
139139
*p = 0;
140140

141-
qdisc = NULL;
141+
TAKE_PTR(qdisc);
142142
return 0;
143143
}
144144

@@ -150,7 +150,7 @@ int config_parse_fair_queueing_controlled_delay_u32(
150150
return 0;
151151
}
152152

153-
qdisc = NULL;
153+
TAKE_PTR(qdisc);
154154

155155
return 0;
156156
}
@@ -204,7 +204,7 @@ int config_parse_fair_queueing_controlled_delay_usec(
204204
else
205205
*p = 0;
206206

207-
qdisc = NULL;
207+
TAKE_PTR(qdisc);
208208
return 0;
209209
}
210210

@@ -216,7 +216,7 @@ int config_parse_fair_queueing_controlled_delay_usec(
216216
return 0;
217217
}
218218

219-
qdisc = NULL;
219+
TAKE_PTR(qdisc);
220220

221221
return 0;
222222
}
@@ -257,7 +257,7 @@ int config_parse_fair_queueing_controlled_delay_bool(
257257
if (isempty(rvalue)) {
258258
fqcd->ecn = -1;
259259

260-
qdisc = NULL;
260+
TAKE_PTR(qdisc);
261261
return 0;
262262
}
263263

@@ -270,7 +270,7 @@ int config_parse_fair_queueing_controlled_delay_bool(
270270
}
271271

272272
fqcd->ecn = r;
273-
qdisc = NULL;
273+
TAKE_PTR(qdisc);
274274

275275
return 0;
276276
}
@@ -323,7 +323,7 @@ int config_parse_fair_queueing_controlled_delay_size(
323323
else
324324
*p = 0;
325325

326-
qdisc = NULL;
326+
TAKE_PTR(qdisc);
327327
return 0;
328328
}
329329

@@ -342,7 +342,7 @@ int config_parse_fair_queueing_controlled_delay_size(
342342
}
343343

344344
*p = sz;
345-
qdisc = NULL;
345+
TAKE_PTR(qdisc);
346346

347347
return 0;
348348
}

‎src/network/tc/gred.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ int config_parse_generic_random_early_detection_u32(
111111
if (isempty(rvalue)) {
112112
*p = 0;
113113

114-
qdisc = NULL;
114+
TAKE_PTR(qdisc);
115115
return 0;
116116
}
117117

@@ -129,7 +129,7 @@ int config_parse_generic_random_early_detection_u32(
129129
lvalue, rvalue);
130130

131131
*p = v;
132-
qdisc = NULL;
132+
TAKE_PTR(qdisc);
133133

134134
return 0;
135135
}
@@ -169,7 +169,7 @@ int config_parse_generic_random_early_detection_bool(
169169
if (isempty(rvalue)) {
170170
gred->grio = -1;
171171

172-
qdisc = NULL;
172+
TAKE_PTR(qdisc);
173173
return 0;
174174
}
175175

@@ -182,7 +182,7 @@ int config_parse_generic_random_early_detection_bool(
182182
}
183183

184184
gred->grio = r;
185-
qdisc = NULL;
185+
TAKE_PTR(qdisc);
186186

187187
return 0;
188188
}

‎src/network/tc/hhf.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ int config_parse_heavy_hitter_filter_packet_limit(
7474
if (isempty(rvalue)) {
7575
hhf->packet_limit = 0;
7676

77-
qdisc = NULL;
77+
TAKE_PTR(qdisc);
7878
return 0;
7979
}
8080

@@ -86,7 +86,7 @@ int config_parse_heavy_hitter_filter_packet_limit(
8686
return 0;
8787
}
8888

89-
qdisc = NULL;
89+
TAKE_PTR(qdisc);
9090

9191
return 0;
9292
}

‎src/network/tc/htb.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ int config_parse_hierarchy_token_bucket_default_class(
8080
if (isempty(rvalue)) {
8181
htb->default_class = 0;
8282

83-
qdisc = NULL;
83+
TAKE_PTR(qdisc);
8484
return 0;
8585
}
8686

@@ -92,7 +92,7 @@ int config_parse_hierarchy_token_bucket_default_class(
9292
return 0;
9393
}
9494

95-
qdisc = NULL;
95+
TAKE_PTR(qdisc);
9696

9797
return 0;
9898
}
@@ -133,7 +133,7 @@ int config_parse_hierarchy_token_bucket_u32(
133133
if (isempty(rvalue)) {
134134
htb->rate_to_quantum = HTB_DEFAULT_RATE_TO_QUANTUM;
135135

136-
qdisc = NULL;
136+
TAKE_PTR(qdisc);
137137
return 0;
138138
}
139139

@@ -145,7 +145,7 @@ int config_parse_hierarchy_token_bucket_u32(
145145
return 0;
146146
}
147147

148-
qdisc = NULL;
148+
TAKE_PTR(qdisc);
149149

150150
return 0;
151151
}

‎src/network/tc/netem.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ int config_parse_network_emulator_delay(
9494
else if (STR_IN_SET(lvalue, "DelayJitterSec", "NetworkEmulatorDelayJitterSec"))
9595
ne->jitter = USEC_INFINITY;
9696

97-
qdisc = NULL;
97+
TAKE_PTR(qdisc);
9898
return 0;
9999
}
100100

@@ -111,7 +111,7 @@ int config_parse_network_emulator_delay(
111111
else if (STR_IN_SET(lvalue, "DelayJitterSec", "NetworkEmulatorDelayJitterSec"))
112112
ne->jitter = u;
113113

114-
qdisc = NULL;
114+
TAKE_PTR(qdisc);
115115

116116
return 0;
117117
}
@@ -156,7 +156,7 @@ int config_parse_network_emulator_rate(
156156
else if (STR_IN_SET(lvalue, "DuplicateRate", "NetworkEmulatorDuplicateRate"))
157157
ne->duplicate = 0;
158158

159-
qdisc = NULL;
159+
TAKE_PTR(qdisc);
160160
return 0;
161161
}
162162

@@ -173,7 +173,7 @@ int config_parse_network_emulator_rate(
173173
else if (STR_IN_SET(lvalue, "DuplicateRate", "NetworkEmulatorDuplicateRate"))
174174
ne->duplicate = rate;
175175

176-
qdisc = NULL;
176+
TAKE_PTR(qdisc);
177177
return 0;
178178
}
179179

@@ -212,8 +212,8 @@ int config_parse_network_emulator_packet_limit(
212212

213213
if (isempty(rvalue)) {
214214
ne->limit = 0;
215-
qdisc = NULL;
216215

216+
TAKE_PTR(qdisc);
217217
return 0;
218218
}
219219

@@ -225,7 +225,7 @@ int config_parse_network_emulator_packet_limit(
225225
return 0;
226226
}
227227

228-
qdisc = NULL;
228+
TAKE_PTR(qdisc);
229229
return 0;
230230
}
231231

‎src/network/tc/pie.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ int config_parse_pie_packet_limit(
7373
if (isempty(rvalue)) {
7474
pie->packet_limit = 0;
7575

76-
qdisc = NULL;
76+
TAKE_PTR(qdisc);
7777
return 0;
7878
}
7979

@@ -85,7 +85,7 @@ int config_parse_pie_packet_limit(
8585
return 0;
8686
}
8787

88-
qdisc = NULL;
88+
TAKE_PTR(qdisc);
8989

9090
return 0;
9191
}

‎src/network/tc/qdisc.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ int config_parse_qdisc_parent(
324324
} else
325325
qdisc->tca_kind = mfree(qdisc->tca_kind);
326326

327-
qdisc = NULL;
327+
TAKE_PTR(qdisc);
328328

329329
return 0;
330330
}
@@ -362,7 +362,7 @@ int config_parse_qdisc_handle(
362362

363363
if (isempty(rvalue)) {
364364
qdisc->handle = TC_H_UNSPEC;
365-
qdisc = NULL;
365+
TAKE_PTR(qdisc);
366366
return 0;
367367
}
368368

@@ -375,7 +375,7 @@ int config_parse_qdisc_handle(
375375
}
376376

377377
qdisc->handle = (uint32_t) n << 16;
378-
qdisc = NULL;
378+
TAKE_PTR(qdisc);
379379

380380
return 0;
381381
}

0 commit comments

Comments
 (0)