From: Zbigniew Jędrzejewski-Szmek Date: Fri, 27 Jun 2025 12:05:04 +0000 (+0200) Subject: shared/bus-unit-util: define helper for LogFilterPatterns= X-Git-Tag: v258-rc1~183^2~39 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=32adb97cf12db2cff38e30e2419b6b36400645e8;p=thirdparty%2Fsystemd.git shared/bus-unit-util: define helper for LogFilterPatterns= --- 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",