From 32adb97cf12db2cff38e30e2419b6b36400645e8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Fri, 27 Jun 2025 14:05:04 +0200 Subject: [PATCH] shared/bus-unit-util: define helper for LogFilterPatterns= --- src/shared/bus-unit-util.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/src/shared/bus-unit-util.c b/src/shared/bus-unit-util.c index ad9d1833417..74448a96fd9 100644 --- a/src/shared/bus-unit-util.c +++ b/src/shared/bus-unit-util.c @@ -1201,6 +1201,18 @@ static int bus_append_log_extra_fields(sd_bus_message *m, const char *field, con return 1; } +static int bus_append_log_filter_patterns(sd_bus_message *m, const char *field, const char *eq) { + int r; + + r = sd_bus_message_append(m, "(sv)", "LogFilterPatterns", "a(bs)", 1, + eq[0] != '~', + eq[0] != '~' ? eq : eq + 1); + if (r < 0) + return bus_log_create_error(r); + + return 1; +} + static int bus_append_cgroup_property(sd_bus_message *m, const char *field, const char *eq) { if (STR_IN_SET(field, "DevicePolicy", "Slice", @@ -1483,15 +1495,8 @@ static int bus_append_execute_property(sd_bus_message *m, const char *field, con if (streq(field, "LogExtraFields")) return bus_append_log_extra_fields(m, field, eq); - if (streq(field, "LogFilterPatterns")) { - r = sd_bus_message_append(m, "(sv)", "LogFilterPatterns", "a(bs)", 1, - eq[0] != '~', - eq[0] != '~' ? eq : eq + 1); - if (r < 0) - return bus_log_create_error(r); - - return 1; - } + if (streq(field, "LogFilterPatterns")) + return bus_append_log_filter_patterns(m, field, eq); if (STR_IN_SET(field, "StandardInput", "StandardOutput", -- 2.47.3