SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

parse-util: add parse_tristate() and use it everywhere

Browse Source 
We parse tristates all the time, let's add an explicit parser for them.
This commit is contained in:
Lennart Poettering
2023-11-02 04:52:16 +09:00
committed by Yu Watanabe
parent 6a4d0efa00
commit b71a721fbc
11 changed files with 47 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/network/tc/cake.c
+1 -8
View File
@@ -354,13 +354,7 @@ int config_parse_cake_tristate(
else
assert_not_reached();
if (isempty(rvalue)) {
*dest = -1;
TAKE_PTR(qdisc);
return 0;
}
r = parse_boolean(rvalue);
r = parse_tristate(rvalue, dest);
if (r < 0) {
log_syntax(unit, LOG_WARNING, filename, line, r,
"Failed to parse '%s=', ignoring assignment: %s",
@@ -368,7 +362,6 @@ int config_parse_cake_tristate(
return 0;
}
*dest = r;
TAKE_PTR(qdisc);
return 0;
}
src/network/tc/codel.c
+2 -10
View File
@@ -223,14 +223,7 @@ int config_parse_controlled_delay_bool(
cd = CODEL(qdisc);
if (isempty(rvalue)) {
cd->ecn = -1;
qdisc = NULL;
return 0;
}
r = parse_boolean(rvalue);
r = parse_tristate(rvalue, &cd->ecn);
if (r < 0) {
log_syntax(unit, LOG_WARNING, filename, line, r,
"Failed to parse '%s=', ignoring assignment: %s",
@@ -238,8 +231,7 @@ int config_parse_controlled_delay_bool(
return 0;
}
cd->ecn = r;
qdisc = NULL;
TAKE_PTR(qdisc);
return 0;
}
src/network/tc/fq-codel.c
+1 -9
View File
@@ -251,14 +251,7 @@ int config_parse_fair_queueing_controlled_delay_bool(
fqcd = FQ_CODEL(qdisc);
if (isempty(rvalue)) {
fqcd->ecn = -1;
TAKE_PTR(qdisc);
return 0;
}
r = parse_boolean(rvalue);
r = parse_tristate(rvalue, &fqcd->ecn);
if (r < 0) {
log_syntax(unit, LOG_WARNING, filename, line, r,
"Failed to parse '%s=', ignoring assignment: %s",
@@ -266,7 +259,6 @@ int config_parse_fair_queueing_controlled_delay_bool(
return 0;
}
fqcd->ecn = r;
TAKE_PTR(qdisc);
return 0;
src/network/tc/fq.c
+2 -9
View File
@@ -267,14 +267,7 @@ int config_parse_fair_queueing_bool(
fq = FQ(qdisc);
if (isempty(rvalue)) {
fq->pacing = -1;
qdisc = NULL;
return 0;
}
r = parse_boolean(rvalue);
r = parse_tristate(rvalue, &fq->pacing);
if (r < 0) {
log_syntax(unit, LOG_WARNING, filename, line, r,
"Failed to parse '%s=', ignoring assignment: %s",
@@ -283,7 +276,7 @@ int config_parse_fair_queueing_bool(
}
fq->pacing = r;
qdisc = NULL;
TAKE_PTR(qdisc);
return 0;
}
src/network/tc/gred.c
+1 -9
View File
@@ -163,14 +163,7 @@ int config_parse_generic_random_early_detection_bool(
gred = GRED(qdisc);
if (isempty(rvalue)) {
gred->grio = -1;
TAKE_PTR(qdisc);
return 0;
}
r = parse_boolean(rvalue);
r = parse_tristate(rvalue, &gred->grio);
if (r < 0) {
log_syntax(unit, LOG_WARNING, filename, line, r,
"Failed to parse '%s=', ignoring assignment: %s",
@@ -178,7 +171,6 @@ int config_parse_generic_random_early_detection_bool(
return 0;
}
gred->grio = r;
TAKE_PTR(qdisc);
return 0;