diff options
author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2024-10-04 18:08:35 +0200 |
---|---|---|
committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2024-10-28 09:23:07 +0100 |
commit | 23441a3d882930b854b827172343c4222a2c9935 (patch) | |
tree | 5751d9934838bfa61f31d5bf3611064afe8f660e /src/kernel-install | |
parent | sd-id128: mark functions as const, not pure (diff) | |
download | systemd-23441a3d882930b854b827172343c4222a2c9935.tar.xz systemd-23441a3d882930b854b827172343c4222a2c9935.zip |
sd-json,tree-wide: add sd_json_format_enabled() and use it everwhere
We often used a pattern like if (!FLAGS_SET(flags, SD_JSON_FORMAT_OFF)),
which is rather verbose and also contains a double negative, which we try
to avoid. Add a little helper to avoid an explicit bit check.
This change clarifies an aditional thing: in some cases we treated
SD_JSON_FORMAT_OFF as a flag (flags & SD_JSON_FORMAT_OFF), while in other cases
we treated it as an independent enum value (flags == SD_JSON_FORMAT_OFF).
In the first form, flags like SD_JSON_FORMAT_SSE do _not_ turn the json
output on, while in the second form they do. Let's use the first form
everywhere.
No functional change intended.
Initially I wasn't sure if this helper should be made public or just internal,
but it seems such a common pattern that if we expose the flags, we might just
as well expose it too, to make life easier for any consumers.
Diffstat (limited to 'src/kernel-install')
-rw-r--r-- | src/kernel-install/kernel-install.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/kernel-install/kernel-install.c b/src/kernel-install/kernel-install.c index f4f30df07d..f059f5dc76 100644 --- a/src/kernel-install/kernel-install.c +++ b/src/kernel-install/kernel-install.c @@ -1370,7 +1370,7 @@ static int verb_inspect(int argc, char *argv[], void *userdata) { if (r < 0) return table_log_add_error(r); - if (arg_json_format_flags & SD_JSON_FORMAT_OFF) { + if (!sd_json_format_enabled(arg_json_format_flags)) { r = table_add_many(t, TABLE_FIELD, "Plugin Arguments", TABLE_STRV, strv_skip(c->argv, 1)); |