From: Zbigniew Jędrzejewski-Szmek Date: Fri, 27 Sep 2024 18:18:16 +0000 (+0200) Subject: shared: adjust whitespace and formatting X-Git-Tag: v257-rc1~363^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F34572%2Fhead;p=thirdparty%2Fsystemd.git shared: adjust whitespace and formatting --- diff --git a/src/shared/bus-print-properties.c b/src/shared/bus-print-properties.c index 99b1cc7c709..7da8cb1b126 100644 --- a/src/shared/bus-print-properties.c +++ b/src/shared/bus-print-properties.c @@ -363,8 +363,10 @@ int bus_message_print_all_properties( if (!name_with_equal) return log_oom(); - if (!filter || strv_contains(filter, name) || + if (!filter || + strv_contains(filter, name) || (expected_value = strv_find_startswith(filter, name_with_equal))) { + r = sd_bus_message_peek_type(m, NULL, &contents); if (r < 0) return r; diff --git a/src/shared/bus-unit-util.c b/src/shared/bus-unit-util.c index dc92c5f609d..fc923314364 100644 --- a/src/shared/bus-unit-util.c +++ b/src/shared/bus-unit-util.c @@ -656,9 +656,9 @@ static int bus_append_cgroup_property(sd_bus_message *m, const char *field, cons if (r >= 0) { char *n; - /* When this is a percentage we'll convert this into a relative value in the range 0…UINT32_MAX - * and pass it in the MemoryLowScale property (and related ones). This way the physical memory - * size can be determined server-side. */ + /* When this is a percentage we'll convert this into a relative value in the range + * 0…UINT32_MAX and pass it in the MemoryLowScale property (and related ones). This + * way the physical memory size can be determined server-side. */ n = strjoina(field, "Scale"); r = sd_bus_message_append(m, "(sv)", n, "u", UINT32_SCALE_FROM_PERMYRIAD(r)); @@ -728,7 +728,10 @@ static int bus_append_cgroup_property(sd_bus_message *m, const char *field, cons return 1; } - if (cgroup_io_limit_type_from_string(field) >= 0 || STR_IN_SET(field, "BlockIOReadBandwidth", "BlockIOWriteBandwidth")) { + if (cgroup_io_limit_type_from_string(field) >= 0 || + STR_IN_SET(field, "BlockIOReadBandwidth", + "BlockIOWriteBandwidth")) { + if (isempty(eq)) r = sd_bus_message_append(m, "(sv)", field, "a(st)", 0); else { diff --git a/src/systemctl/systemctl-show.c b/src/systemctl/systemctl-show.c index 67a72bdc94a..bdd438bc2ca 100644 --- a/src/systemctl/systemctl-show.c +++ b/src/systemctl/systemctl-show.c @@ -2031,8 +2031,8 @@ typedef enum SystemctlShowMode{ static const char* const systemctl_show_mode_table[_SYSTEMCTL_SHOW_MODE_MAX] = { [SYSTEMCTL_SHOW_PROPERTIES] = "show", - [SYSTEMCTL_SHOW_STATUS] = "status", - [SYSTEMCTL_SHOW_HELP] = "help", + [SYSTEMCTL_SHOW_STATUS] = "status", + [SYSTEMCTL_SHOW_HELP] = "help", }; DEFINE_PRIVATE_STRING_TABLE_LOOKUP_FROM_STRING(systemctl_show_mode, SystemctlShowMode);