From: Zbigniew Jędrzejewski-Szmek <zbyszek@amutable.com>
Date: Thu, 23 Apr 2026 18:04:35 +0000 (+0200)
Subject: shared/options: add whitespace to OPTION_COMMON definitions
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a6e694025a26be24676c7c883e478d2461e00f04;p=thirdparty%2Fsystemd.git

shared/options: add whitespace to OPTION_COMMON definitions

Initially I thought that there'd be just a handful, but the list
has grown over time and all bunched up together they are hard to
read.
---

diff --git a/src/shared/options.h b/src/shared/options.h
index 10878c74620..3d08390b33e 100644
--- a/src/shared/options.h
+++ b/src/shared/options.h
@@ -59,52 +59,71 @@ typedef struct Option {
 #define OPTION_POSITIONAL OPTION_FULL(OPTION_POSITIONAL_ENTRY, /* sc= */ 0, "(positional)", /* mv= */ NULL, /* h= */ NULL)
 #define OPTION_HELP_VERBATIM(lc, h) OPTION_FULL(OPTION_HELP_ENTRY_VERBATIM, /* sc= */ 0, lc, /* mv= */ NULL, h)
 
-#define OPTION_COMMON_HELP \
+#define OPTION_COMMON_HELP                                              \
         OPTION('h', "help", NULL, "Show this help")
-#define OPTION_COMMON_VERSION \
+
+#define OPTION_COMMON_VERSION                                           \
         OPTION_LONG("version", NULL, "Show package version")
-#define OPTION_COMMON_NO_PAGER \
+
+#define OPTION_COMMON_NO_PAGER                                          \
         OPTION_LONG("no-pager", NULL, "Do not start a pager")
-#define OPTION_COMMON_NO_LEGEND \
+
+#define OPTION_COMMON_NO_LEGEND                                         \
         OPTION_LONG("no-legend", NULL, "Do not show headers and footers")
-#define OPTION_COMMON_LOG_LEVEL \
-        OPTION_LONG("log-level", "LEVEL", \
+
+#define OPTION_COMMON_LOG_LEVEL                                         \
+        OPTION_LONG("log-level", "LEVEL",                               \
                     "Set log level (debug, info, notice, warning, err, crit, alert, emerg)")
-#define OPTION_COMMON_LOG_TARGET \
-        OPTION_LONG("log-target", "TARGET", \
+
+#define OPTION_COMMON_LOG_TARGET                                        \
+        OPTION_LONG("log-target", "TARGET",                             \
                     "Set log target (console, journal, journal-or-kmsg, kmsg, null)")
-#define OPTION_COMMON_LOG_COLOR \
+
+#define OPTION_COMMON_LOG_COLOR                                         \
         OPTION_LONG("log-color", "BOOL", "Highlight important messages")
-#define OPTION_COMMON_LOG_LOCATION \
+
+#define OPTION_COMMON_LOG_LOCATION                                      \
         OPTION_LONG("log-location", "BOOL", "Include code location in messages")
-#define OPTION_COMMON_LOG_TIME \
+
+#define OPTION_COMMON_LOG_TIME                                          \
         OPTION_LONG("log-time", "BOOL", "Prefix messages with current time")
-#define OPTION_COMMON_CAT_CONFIG \
+
+#define OPTION_COMMON_CAT_CONFIG                                        \
         OPTION_LONG("cat-config", NULL, "Show configuration files")
-#define OPTION_COMMON_TLDR \
+
+#define OPTION_COMMON_TLDR                                              \
         OPTION_LONG("tldr", NULL, "Show non-comment parts of configuration")
-#define OPTION_COMMON_NO_ASK_PASSWORD \
+
+#define OPTION_COMMON_NO_ASK_PASSWORD                                   \
         OPTION_LONG("no-ask-password", NULL, "Do not prompt for password")
-#define OPTION_COMMON_HOST \
+
+#define OPTION_COMMON_HOST                                              \
         OPTION('H', "host", "[USER@]HOST", "Operate on remote host")
-#define OPTION_COMMON_MACHINE \
+
+#define OPTION_COMMON_MACHINE                                           \
         OPTION('M', "machine", "CONTAINER", "Operate on local container")
-#define OPTION_COMMON_JSON \
+
+#define OPTION_COMMON_JSON                                              \
         OPTION_LONG("json", "FORMAT", "Generate JSON output (pretty, short, or off)")
-#define OPTION_COMMON_LOWERCASE_J \
-        OPTION_SHORT('j', NULL, \
+
+#define OPTION_COMMON_LOWERCASE_J                                       \
+        OPTION_SHORT('j', NULL,                                         \
                      "Equivalent to --json=pretty (on TTY) or --json=short (otherwise)")
-#define OPTION_COMMON_PRIVATE_KEY(purpose) \
+
+#define OPTION_COMMON_PRIVATE_KEY(purpose)                              \
         OPTION_LONG("private-key", "PATH|URI", purpose)
-#define OPTION_COMMON_PRIVATE_KEY_SOURCE \
-        OPTION_LONG("private-key-source", "SOURCE", \
-                    "Specify how to use the private key " \
+
+#define OPTION_COMMON_PRIVATE_KEY_SOURCE                                \
+        OPTION_LONG("private-key-source", "SOURCE",                     \
+                    "Specify how to use the private key "               \
                     "(file, provider:PROVIDER, engine:ENGINE)")
-#define OPTION_COMMON_CERTIFICATE(purpose) \
-        OPTION_LONG("certificate", "PATH|URI", purpose \
+
+#define OPTION_COMMON_CERTIFICATE(purpose)                              \
+        OPTION_LONG("certificate", "PATH|URI", purpose                  \
                     ", or a provider-specific designation if --certificate-source= is used")
-#define OPTION_COMMON_CERTIFICATE_SOURCE \
-        OPTION_LONG("certificate-source", "SOURCE", \
+
+#define OPTION_COMMON_CERTIFICATE_SOURCE                                \
+        OPTION_LONG("certificate-source", "SOURCE",                     \
                     "Specify how to interpret the certificate from --certificate=. " \
                     "Allows the certificate to be loaded from an OpenSSL provider " \
                     "(file, provider:PROVIDER)")