summaryrefslogtreecommitdiff
path: root/src/shared/condition.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2020-05-14 18:40:16 +0200
committerLennart Poettering <lennart@poettering.net>2020-05-15 15:50:09 +0200
commitdce719f6c1eedcb378289fc90120bc252556aa61 (patch)
treec64cb34a8612699cfa63ef2acd42b5eb8ea8b1eb /src/shared/condition.c
parent7f19247b5e583e508a4eca7d5455cd590cc8e71e (diff)
downloadsystemd-dce719f6c1eedcb378289fc90120bc252556aa61.tar.gz
condition: introduce generic function type for condition_to_string()-like functions
Let's add a typedef for a function type we use at multiple places.
Diffstat (limited to 'src/shared/condition.c')
-rw-r--r--src/shared/condition.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/src/shared/condition.c b/src/shared/condition.c
index 2dbc14938a..fef37057db 100644
--- a/src/shared/condition.c
+++ b/src/shared/condition.c
@@ -779,7 +779,12 @@ int condition_test(Condition *c) {
return b;
}
-bool condition_test_list(Condition *first, const char *(*to_string)(ConditionType t), condition_test_logger_t logger, void *userdata) {
+bool condition_test_list(
+ Condition *first,
+ condition_to_string_t to_string,
+ condition_test_logger_t logger,
+ void *userdata) {
+
Condition *c;
int triggered = -1;
@@ -828,9 +833,10 @@ bool condition_test_list(Condition *first, const char *(*to_string)(ConditionTyp
return triggered != 0;
}
-void condition_dump(Condition *c, FILE *f, const char *prefix, const char *(*to_string)(ConditionType t)) {
+void condition_dump(Condition *c, FILE *f, const char *prefix, condition_to_string_t to_string) {
assert(c);
assert(f);
+ assert(to_string);
prefix = strempty(prefix);
@@ -844,7 +850,7 @@ void condition_dump(Condition *c, FILE *f, const char *prefix, const char *(*to_
condition_result_to_string(c->result));
}
-void condition_dump_list(Condition *first, FILE *f, const char *prefix, const char *(*to_string)(ConditionType t)) {
+void condition_dump_list(Condition *first, FILE *f, const char *prefix, condition_to_string_t to_string) {
Condition *c;
LIST_FOREACH(conditions, c, first)