tree-wide: Drop custom formatting for print() help messages

I think this formatting was originally used because it simplified
adding new options to the help messages. However, these days, most
tools their help message end with "\nSee the %s for details.\n" so
the final line almost never has to be edited which eliminates the
benefit of the custom formatting used for printf() help messages.
Let's make things more consistent and use the same formatting for
printf() help messages that we use everywhere else.

Prompted by https://github.com/systemd/systemd/pull/18355#discussion_r567241580

diff --git a/src/ac-power/ac-power.c b/src/ac-power/ac-power.c
index 9fabdb9e9f1d690adb4915a69f086cb3eb09867f..905da4ad879161230e106b83e433f03620f04ad2 100644 (file)
--- a/src/ac-power/ac-power.c
+++ b/src/ac-power/ac-power.c
@@ -12,8 +12,8 @@ static void help(void) {
                "Report whether we are connected to an external power source.\n\n"
                "  -h --help             Show this help\n"
                "     --version          Show package version\n"
-               "  -v --verbose          Show state as text\n"
-               , program_invocation_short_name);
+               "  -v --verbose          Show state as text\n",
+               program_invocation_short_name);
 }
 
 static int parse_argv(int argc, char *argv[]) {

diff --git a/src/activate/activate.c b/src/activate/activate.c
index 1f7a2490e7b79dce7b6807d8f10af6c3c24e52b9..f298b1d49100f9a925df0922b4e5a88307054467 100644 (file)
--- a/src/activate/activate.c
+++ b/src/activate/activate.c
@@ -342,11 +342,11 @@ static int help(void) {
                "     --fdname=NAME[:NAME...] Specify names for file descriptors\n"
                "     --inetd                 Enable inetd file descriptor passing protocol\n"
                "\nNote: file descriptors from sd_listen_fds() will be passed through.\n"
-               "\nSee the %s for details.\n"
-               , program_invocation_short_name
-               , ansi_highlight(), ansi_normal()
-               , link
-        );
+               "\nSee the %s for details.\n",
+               program_invocation_short_name,
+               ansi_highlight(),
+               ansi_normal(),
+               link);
 
         return 0;
 }

diff --git a/src/analyze/analyze.c b/src/analyze/analyze.c
index a45cc00853b28d4a742f21cecee0adba8e400e0d..31718afebdad233a0bd7a3fd673880750b0a647e 100644 (file)
--- a/src/analyze/analyze.c
+++ b/src/analyze/analyze.c
@@ -2221,13 +2221,12 @@ static int help(int argc, char *argv[], void *userdata) {
                "     --generators[=BOOL]   Do [not] run unit generators (requires privileges)\n"
                "     --iterations=N        Show the specified number of iterations\n"
                "     --base-time=TIMESTAMP Calculate calendar times relative to specified time\n"
-               "\nSee the %s for details.\n"
-               , program_invocation_short_name
-               , ansi_highlight()
-               , ansi_normal()
-               , dot_link
-               , link
-        );
+               "\nSee the %s for details.\n",
+               program_invocation_short_name,
+               ansi_highlight(),
+               ansi_normal(),
+               dot_link,
+               link);
 
         /* When updating this list, including descriptions, apply changes to
          * shell-completion/bash/systemd-analyze and shell-completion/zsh/_systemd-analyze too. */

diff --git a/src/ask-password/ask-password.c b/src/ask-password/ask-password.c
index a24ee9af1c9a0b6d1a4db8686cdb464040c56745..599ffcdf09caee3fde9ecb57ab4335459587788c 100644 (file)
--- a/src/ask-password/ask-password.c
+++ b/src/ask-password/ask-password.c
@@ -44,10 +44,9 @@ static int help(void) {
                "     --accept-cached  Accept cached passwords\n"
                "     --multiple       List multiple passwords if available\n"
                "     --no-output      Do not print password to standard output\n"
-               "\nSee the %s for details.\n"
-               , program_invocation_short_name
-               , link
-        );
+               "\nSee the %s for details.\n",
+               program_invocation_short_name,
+               link);
 
         return 0;
 }

diff --git a/src/backlight/backlight.c b/src/backlight/backlight.c
index d1b6a81e33904727d8ac396b8f8be5c2a8dcdb2e..717f0475caca1b9f8da4369f6513e76f571e6f26 100644 (file)
--- a/src/backlight/backlight.c
+++ b/src/backlight/backlight.c
@@ -33,12 +33,12 @@ static int help(void) {
                "\n%sSave and restore backlight brightness at shutdown and boot.%s\n\n"
                "  save            Save current brightness\n"
                "  load            Set brightness to be the previously saved value\n"
-               "\nSee the %s for details.\n"
-               , program_invocation_short_name
-               , program_invocation_short_name
-               , ansi_highlight(), ansi_normal()
-               , link
-        );
+               "\nSee the %s for details.\n",
+               program_invocation_short_name,
+               program_invocation_short_name,
+               ansi_highlight(),
+               ansi_normal(),
+               link);
 
         return 0;
 }

diff --git a/src/binfmt/binfmt.c b/src/binfmt/binfmt.c
index 43ed2f385bf25220f6e94640e7fd08e1b7a908ea..ecb9d90a7819e6e7224c063f4d4e2c80fdb1e296 100644 (file)
--- a/src/binfmt/binfmt.c
+++ b/src/binfmt/binfmt.c
@@ -118,10 +118,9 @@ static int help(void) {
                "     --cat-config       Show configuration files\n"
                "     --no-pager         Do not pipe output into a pager\n"
                "     --unregister       Unregister all existing entries\n"
-               "\nSee the %s for details.\n"
-               , program_invocation_short_name
-               , link
-        );
+               "\nSee the %s for details.\n",
+               program_invocation_short_name,
+               link);
 
         return 0;
 }

diff --git a/src/boot/bless-boot.c b/src/boot/bless-boot.c
index cd34f88bb9a395c3f934616fa0da46feec7fbf34..bd6f64915d3353bf9053aa6c78a800a69d150a1a 100644 (file)
--- a/src/boot/bless-boot.c
+++ b/src/boot/bless-boot.c
@@ -42,12 +42,11 @@ static int help(int argc, char *argv[], void *userdata) {
                "  -h --help          Show this help\n"
                "     --version       Print version\n"
                "     --path=PATH     Path to the $BOOT partition (may be used multiple times)\n"
-               "\nSee the %s for details.\n"
-               , program_invocation_short_name
-               , ansi_highlight()
-               , ansi_normal()
-               , link
-        );
+               "\nSee the %s for details.\n",
+               program_invocation_short_name,
+               ansi_highlight(),
+               ansi_normal(),
+               link);
 
         return 0;
 }

diff --git a/src/boot/boot-check-no-failures.c b/src/boot/boot-check-no-failures.c
index 92f3cd4ed059fb10bc3b1a66f2a037660d581276..cb4f758cb41603eb463d7ccb95d21202170d51a4 100644 (file)
--- a/src/boot/boot-check-no-failures.c
+++ b/src/boot/boot-check-no-failures.c
@@ -27,12 +27,11 @@ static int help(void) {
                "\n%sVerify system operational state.%s\n\n"
                "  -h --help          Show this help\n"
                "     --version       Print version\n"
-               "\nSee the %s for details.\n"
-               , program_invocation_short_name
-               , ansi_highlight()
-               , ansi_normal()
-               , link
-        );
+               "\nSee the %s for details.\n",
+               program_invocation_short_name,
+               ansi_highlight(),
+               ansi_normal(),
+               link);
 
         return 0;
 }

diff --git a/src/boot/bootctl.c b/src/boot/bootctl.c
index e7e8f5d94f3d6360fbeb3f6e9d98812b0e81e54d..8d2be21dc53e4e81f64751321a9992e7338b6703 100644 (file)
--- a/src/boot/bootctl.c
+++ b/src/boot/bootctl.c
@@ -1043,12 +1043,13 @@ static int help(int argc, char *argv[], void *userdata) {
                "     --no-pager        Do not pipe output into a pager\n"
                "     --graceful        Don't fail when the ESP cannot be found or EFI\n"
                "                       variables cannot be written\n"
-               "\nSee the %2$s for details.\n"
-               , program_invocation_short_name
-               , link
-               , ansi_underline(), ansi_normal()
-               , ansi_highlight(), ansi_normal()
-        );
+               "\nSee the %2$s for details.\n",
+               program_invocation_short_name,
+               link,
+               ansi_underline(),
+               ansi_normal(),
+               ansi_highlight(),
+               ansi_normal());
 
         return 0;
 }

diff --git a/src/busctl/busctl.c b/src/busctl/busctl.c
index 8a31916ad793f4392a34538cfd527276ba83d50b..02648957db1f775894aca2bccde13c2362485807 100644 (file)
--- a/src/busctl/busctl.c
+++ b/src/busctl/busctl.c
@@ -2297,12 +2297,11 @@ static int help(void) {
                "     --watch-bind=BOOL     Wait for bus AF_UNIX socket to be bound in the file\n"
                "                           system\n"
                "     --destination=SERVICE Destination service of a signal\n"
-               "\nSee the %s for details.\n"
-               , program_invocation_short_name
-               , ansi_highlight()
-               , ansi_normal()
-               , link
-        );
+               "\nSee the %s for details.\n",
+               program_invocation_short_name,
+               ansi_highlight(),
+               ansi_normal(),
+               link);
 
         return 0;
 }

diff --git a/src/cgls/cgls.c b/src/cgls/cgls.c
index 693b5047f226c3bd4fdc510c85cf062a2a9c5995..30fd743d11c32a99440ad64ceeffd07f9fc74685 100644 (file)
--- a/src/cgls/cgls.c
+++ b/src/cgls/cgls.c
@@ -57,10 +57,9 @@ static int help(void) {
                "  -l --full           Do not ellipsize output\n"
                "  -k                  Include kernel threads in output\n"
                "  -M --machine=       Show container\n"
-               "\nSee the %s for details.\n"
-               , program_invocation_short_name
-               , link
-        );
+               "\nSee the %s for details.\n",
+               program_invocation_short_name,
+               link);
 
         return 0;
 }

diff --git a/src/cgtop/cgtop.c b/src/cgtop/cgtop.c
index 9c96b4d697b5ba863ded9c8d70537d482d7ce809..f63a7173e661d34db132234e1445002899b0ec18 100644 (file)
--- a/src/cgtop/cgtop.c
+++ b/src/cgtop/cgtop.c
@@ -722,11 +722,10 @@ static int help(void) {
                "  -b --batch          Run in batch mode, accepting no input\n"
                "     --depth=DEPTH    Maximum traversal depth (default: %u)\n"
                "  -M --machine=       Show container\n"
-               "\nSee the %s for details.\n"
-               , program_invocation_short_name
-               , arg_depth
-               , link
-        );
+               "\nSee the %s for details.\n",
+               program_invocation_short_name,
+               arg_depth,
+               link);
 
         return 0;
 }

diff --git a/src/core/main.c b/src/core/main.c
index eaa56aca2a4e01628e970cf5e250d20477653681..85bf558e90f56ce99add9325ac6337a55b4be489 100644 (file)
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -1108,12 +1108,13 @@ static int help(void) {
                "     --log-time[=BOOL]           Prefix log messages with current time\n"
                "     --default-standard-output=  Set default standard output for services\n"
                "     --default-standard-error=   Set default standard error output for services\n"
-               "\nSee the %s for details.\n"
-               , program_invocation_short_name
-               , ansi_highlight(), ansi_normal()
-               , ansi_underline(), ansi_normal()
-               , link
-        );
+               "\nSee the %s for details.\n",
+               program_invocation_short_name,
+               ansi_highlight(),
+               ansi_normal(),
+               ansi_underline(),
+               ansi_normal(),
+               link);
 
         return 0;
 }

diff --git a/src/coredump/coredumpctl.c b/src/coredump/coredumpctl.c
index 1a62916427aaf9f0ce8bb5600cbc0f9c97a334bb..20bd97c1fce98e40aa3b37919433dec6658ed5b1 100644 (file)
--- a/src/coredump/coredumpctl.c
+++ b/src/coredump/coredumpctl.c
@@ -178,12 +178,11 @@ static int help(void) {
                "     --file=PATH               Use journal file\n"
                "  -D --directory=DIR           Use journal files from directory\n\n"
                "  -q --quiet                   Do not show info messages and privilege warning\n"
-               "\nSee the %s for details.\n"
-               , program_invocation_short_name
-               , ansi_highlight()
-               , ansi_normal()
-               , link
-        );
+               "\nSee the %s for details.\n",
+               program_invocation_short_name,
+               ansi_highlight(),
+               ansi_normal(),
+               link);
 
         return 0;
 }

diff --git a/src/cryptenroll/cryptenroll.c b/src/cryptenroll/cryptenroll.c
index b28dbcd6659592887fae74e3e7cf2fc8bec66650..fa4dfb6ef21a1991fd705ac0130fab3bacd7e268 100644 (file)
--- a/src/cryptenroll/cryptenroll.c
+++ b/src/cryptenroll/cryptenroll.c
@@ -93,11 +93,11 @@ static int help(void) {
                "                       Specify TPM2 PCRs to seal against\n"
                "     --wipe-slot=SLOT1,SLOT2,…\n"
                "                       Wipe specified slots\n"
-               "\nSee the %s for details.\n"
-               , program_invocation_short_name
-               , ansi_highlight(), ansi_normal()
-               , link
-        );
+               "\nSee the %s for details.\n",
+               program_invocation_short_name,
+               ansi_highlight(),
+               ansi_normal(),
+               link);
 
         return 0;
 }

diff --git a/src/cryptsetup/cryptsetup.c b/src/cryptsetup/cryptsetup.c
index 65cbd1aec83fb712b4937acc914512af06e19ef9..9cef31398f1355eb2f8c423545b92c29dfd9ba22 100644 (file)
--- a/src/cryptsetup/cryptsetup.c
+++ b/src/cryptsetup/cryptsetup.c
@@ -1334,11 +1334,10 @@ static int help(void) {
         printf("%s attach VOLUME SOURCEDEVICE [PASSWORD] [OPTIONS]\n"
                "%s detach VOLUME\n\n"
                "Attaches or detaches an encrypted block device.\n"
-               "\nSee the %s for details.\n"
-               , program_invocation_short_name
-               , program_invocation_short_name
-               , link
-        );
+               "\nSee the %s for details.\n",
+               program_invocation_short_name,
+               program_invocation_short_name,
+               link);
 
         return 0;
 }

diff --git a/src/delta/delta.c b/src/delta/delta.c
index 4295abdc30b3b4a3020c960acc15f23730f1ddf1..a50cb36ee3915f1621b445b369fb2b717d851aa9 100644 (file)
--- a/src/delta/delta.c
+++ b/src/delta/delta.c
@@ -532,10 +532,9 @@ static int help(void) {
                "     --no-pager       Do not pipe output into a pager\n"
                "     --diff[=1|0]     Show a diff when overridden files differ\n"
                "  -t --type=LIST...   Only display a selected set of override types\n"
-               "\nSee the %s for details.\n"
-               , program_invocation_short_name
-               , link
-        );
+               "\nSee the %s for details.\n",
+               program_invocation_short_name,
+               link);
 
         return 0;
 }

diff --git a/src/detect-virt/detect-virt.c b/src/detect-virt/detect-virt.c
index 14d649c6ed4f3a9306516d7a2f82652de53c7c2c..be0db85d7cec749e0511f29ce1c5a3812fe844b6 100644 (file)
--- a/src/detect-virt/detect-virt.c
+++ b/src/detect-virt/detect-virt.c
@@ -39,10 +39,9 @@ static int help(void) {
                "     --private-users    Only detect whether we are running in a user namespace\n"
                "  -q --quiet            Don't output anything, just set return value\n"
                "     --list             List all known and detectable types of virtualization\n"
-               "\nSee the %s for details.\n"
-               , program_invocation_short_name
-               , link
-        );
+               "\nSee the %s for details.\n",
+               program_invocation_short_name,
+               link);
 
         return 0;
 }

diff --git a/src/dissect/dissect.c b/src/dissect/dissect.c
index 9b127d456a9885ac9ddcf2c0208f72094aa2a36e..0b83d79cc938a02023ed7ddd8a9813046768e56f 100644 (file)
--- a/src/dissect/dissect.c
+++ b/src/dissect/dissect.c
@@ -87,11 +87,13 @@ static int help(void) {
                "  -M                      Shortcut for --mount --mkdir\n"
                "  -x --copy-from          Copy files from image to host\n"
                "  -a --copy-to            Copy files from host to image\n"
-               "\nSee the %2$s for details.\n"
-               , program_invocation_short_name
-               , link
-               , ansi_underline(), ansi_normal()
-               , ansi_highlight(), ansi_normal());
+               "\nSee the %2$s for details.\n",
+               program_invocation_short_name,
+               link,
+               ansi_underline(),
+               ansi_normal(),
+               ansi_highlight(),
+               ansi_normal());
 
         return 0;
 }

diff --git a/src/escape/escape.c b/src/escape/escape.c
index 05d03ad762bf31b3c8bcd0a8d0c2f822d71c4182..24c53bf14b33ee5be1a6adb03d0aac1a292cf97f 100644 (file)
--- a/src/escape/escape.c
+++ b/src/escape/escape.c
@@ -40,10 +40,9 @@ static int help(void) {
                "  -u --unescape           Unescape strings\n"
                "  -m --mangle             Mangle strings\n"
                "  -p --path               When escaping/unescaping assume the string is a path\n"
-               "\nSee the %s for details.\n"
-               , program_invocation_short_name
-               , link
-        );
+               "\nSee the %s for details.\n",
+               program_invocation_short_name,
+               link);
 
         return 0;
 }

diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c
index afead11b42b0e9e034f5ab5d4082fb4e2127ea68..6982cf2eed6c118d633a8b1f0fb8d44c6bb7035b 100644 (file)
--- a/src/firstboot/firstboot.c
+++ b/src/firstboot/firstboot.c
@@ -954,10 +954,9 @@ static int help(void) {
                "     --force                                Overwrite existing files\n"
                "     --delete-root-password                 Delete root password\n"
                "     --welcome=no                           Disable the welcome text\n"
-               "\nSee the %s for details.\n"
-               , program_invocation_short_name
-               , link
-        );
+               "\nSee the %s for details.\n",
+               program_invocation_short_name,
+               link);
 
         return 0;
 }

diff --git a/src/home/homectl.c b/src/home/homectl.c
index 93d322110b5dcd3d5359299b01ff6cf5126a4d1c..0b4148989783639dda904238f1bf72d156ee72be 100644 (file)
--- a/src/home/homectl.c
+++ b/src/home/homectl.c
@@ -2026,12 +2026,13 @@ static int help(int argc, char *argv[], void *userdata) {
                "     --kill-processes=BOOL    Whether to kill user processes when sessions\n"
                "                              terminate\n"
                "     --auto-login=BOOL        Try to log this user in automatically\n"
-               "\nSee the %6$s for details.\n"
-               , program_invocation_short_name
-               , ansi_highlight(), ansi_normal()
-               , ansi_underline(), ansi_normal()
-               , link
-        );
+               "\nSee the %6$s for details.\n",
+               program_invocation_short_name,
+               ansi_highlight(),
+               ansi_normal(),
+               ansi_underline(),
+               ansi_normal(),
+               link);
 
         return 0;
 }

diff --git a/src/hostname/hostnamectl.c b/src/hostname/hostnamectl.c
index c2338a69f6ef974e7cf59697a73efecf1cc155f8..4482608b285dcb258d3874f47be329bb8b7f743a 100644 (file)
--- a/src/hostname/hostnamectl.c
+++ b/src/hostname/hostnamectl.c
@@ -336,12 +336,11 @@ static int help(void) {
                "     --transient         Only set transient hostname\n"
                "     --static            Only set static hostname\n"
                "     --pretty            Only set pretty hostname\n"
-               "\nSee the %s for details.\n"
-               , program_invocation_short_name
-               , ansi_highlight()
-               , ansi_normal()
-               , link
-        );
+               "\nSee the %s for details.\n",
+               program_invocation_short_name,
+               ansi_highlight(),
+               ansi_normal(),
+               link);
 
         return 0;
 }

diff --git a/src/hwdb/hwdb.c b/src/hwdb/hwdb.c
index 1246d6896959463834564f94d94190c13a59829d..26cc83f31bd57249bf5cc3bf7d63f64195e6e270 100644 (file)
--- a/src/hwdb/hwdb.c
+++ b/src/hwdb/hwdb.c
@@ -44,12 +44,11 @@ static int help(void) {
                "  -s --strict     When updating, return non-zero exit value on any parsing error\n"
                "     --usr        Generate in " UDEVLIBEXECDIR " instead of /etc/udev\n"
                "  -r --root=PATH  Alternative root path in the filesystem\n\n"
-               "\nSee the %s for details.\n"
-               , program_invocation_short_name
-               , ansi_highlight()
-               , ansi_normal()
-               , link
-        );
+               "\nSee the %s for details.\n",
+               program_invocation_short_name,
+               ansi_highlight(),
+               ansi_normal(),
+               link);
 
         return 0;
 }

diff --git a/src/id128/id128.c b/src/id128/id128.c
index 086f398108112f3241fb6dd9b66521d54007a5cc..70ea4d0a690f6e070a4005e8f93e9f6849ba5edf 100644 (file)
--- a/src/id128/id128.c
+++ b/src/id128/id128.c
@@ -167,11 +167,11 @@ static int help(void) {
                "  -p --pretty             Generate samples of program code\n"
                "  -a --app-specific=ID    Generate app-specific IDs\n"
                "  -u --uuid               Output in UUID format\n"
-               "\nSee the %s for details.\n"
-               , program_invocation_short_name
-               , ansi_highlight(), ansi_normal()
-               , link
-        );
+               "\nSee the %s for details.\n",
+               program_invocation_short_name,
+               ansi_highlight(),
+               ansi_normal(),
+               link);
 
         return 0;
 }

diff --git a/src/journal-remote/journal-gatewayd.c b/src/journal-remote/journal-gatewayd.c
index 534de51b0f60a7345fc32c98836983b9cf31db9e..17216c8e20c8ca40f52f2a61de3dcab2160aff5a 100644 (file)
--- a/src/journal-remote/journal-gatewayd.c
+++ b/src/journal-remote/journal-gatewayd.c
@@ -852,10 +852,9 @@ static int help(void) {
                "     --key=KEY.PEM    Server key in PEM format\n"
                "     --trust=CERT.PEM Certificate authority certificate in PEM format\n"
                "  -D --directory=PATH Serve journal files in directory\n"
-               "\nSee the %s for details.\n"
-               , program_invocation_short_name
-               , link
-        );
+               "\nSee the %s for details.\n",
+               program_invocation_short_name,
+               link);
 
         return 0;
 }

diff --git a/src/journal-remote/journal-remote-main.c b/src/journal-remote/journal-remote-main.c
index b00151c32e8247250c140aa6f617bd33f75ac072..685ce5a16b8810119309409a4ada537208d18bca 100644 (file)
--- a/src/journal-remote/journal-remote-main.c
+++ b/src/journal-remote/journal-remote-main.c
@@ -801,10 +801,9 @@ static int help(void) {
                "                            Specify a list of gnutls logging categories\n"
                "     --split-mode=none|host How many output files to create\n"
                "\nNote: file descriptors from sd_listen_fds() will be consumed, too.\n"
-               "\nSee the %s for details.\n"
-               , program_invocation_short_name
-               , link
-        );
+               "\nSee the %s for details.\n",
+               program_invocation_short_name,
+               link);
 
         return 0;
 }

diff --git a/src/journal-remote/journal-upload.c b/src/journal-remote/journal-upload.c
index bf362d0919d10b87c61f08e15a5faa74a47b9551..2d84bdcae5ec04c08b91e1483044029d65079cb4 100644 (file)
--- a/src/journal-remote/journal-upload.c
+++ b/src/journal-remote/journal-upload.c
@@ -606,10 +606,9 @@ static int help(void) {
                "     --follow[=BOOL]        Do [not] wait for input\n"
                "     --save-state[=FILE]    Save uploaded cursors (default \n"
                "                            " STATE_FILE ")\n"
-               "\nSee the %s for details.\n"
-               , program_invocation_short_name
-               , link
-        );
+               "\nSee the %s for details.\n",
+               program_invocation_short_name,
+               link);
 
         return 0;
 }

diff --git a/src/journal/cat.c b/src/journal/cat.c
index bccf615189c1f9ba22eed2d02fe941c00755d73c..223af8da1edd00acf8319daf012dc3f00fbd1415 100644 (file)
--- a/src/journal/cat.c
+++ b/src/journal/cat.c
@@ -40,11 +40,11 @@ static int help(void) {
                "  -p --priority=PRIORITY         Set priority value (0..7)\n"
                "     --stderr-priority=PRIORITY  Set priority value (0..7) used for stderr\n"
                "     --level-prefix=BOOL         Control whether level prefix shall be parsed\n"
-               "\nSee the %s for details.\n"
-               , program_invocation_short_name
-               , ansi_highlight(), ansi_normal()
-               , link
-        );
+               "\nSee the %s for details.\n",
+               program_invocation_short_name,
+               ansi_highlight(),
+               ansi_normal(),
+               link);
 
         return 0;
 }

diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
index bcf2e01d5c9e7c29f81865ca17be949aff4a62c6..dee0a0835b1030dc030f23e75046dcea5bdf549d 100644 (file)
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -402,12 +402,13 @@ static int help(void) {
                "     --dump-catalog          Show entries in the message catalog\n"
                "     --update-catalog        Update the message catalog database\n"
                "     --setup-keys            Generate a new FSS key pair\n"
-               "\nSee the %2$s for details.\n"
-               , program_invocation_short_name
-               , link
-               , ansi_underline(), ansi_normal()
-               , ansi_highlight(), ansi_normal()
-        );
+               "\nSee the %2$s for details.\n",
+               program_invocation_short_name,
+               link,
+               ansi_underline(),
+               ansi_normal(),
+               ansi_highlight(),
+               ansi_normal());
 
         return 0;
 }

diff --git a/src/locale/localectl.c b/src/locale/localectl.c
index 7d3d3f8c18d36020965028f8fd9f7ea6e0912416..692a259275d55f0f5bb116e1eeecb37f7bbe400d 100644 (file)
--- a/src/locale/localectl.c
+++ b/src/locale/localectl.c
@@ -401,12 +401,11 @@ static int help(void) {
                "  -H --host=[USER@]HOST    Operate on remote host\n"
                "  -M --machine=CONTAINER   Operate on local container\n"
                "     --no-convert          Don't convert keyboard mappings\n"
-               "\nSee the %s for details.\n"
-               , program_invocation_short_name
-               , ansi_highlight()
-               , ansi_normal()
-               , link
-        );
+               "\nSee the %s for details.\n",
+               program_invocation_short_name,
+               ansi_highlight(),
+               ansi_normal(),
+               link);
 
         return 0;
 }

diff --git a/src/login/inhibit.c b/src/login/inhibit.c
index e18dbc51326cb9c913c74bda6354eec6a97f80fe..afb4d7e2e1f9eb65380066a7f27a4df6a379f4a9 100644 (file)
--- a/src/login/inhibit.c
+++ b/src/login/inhibit.c
@@ -173,11 +173,11 @@ static int help(void) {
                "     --why=STRING         A descriptive string why is being inhibited\n"
                "     --mode=MODE          One of block or delay\n"
                "     --list               List active inhibitors\n"
-               "\nSee the %s for details.\n"
-               , program_invocation_short_name
-               , ansi_highlight(), ansi_normal()
-               , link
-        );
+               "\nSee the %s for details.\n",
+               program_invocation_short_name,
+               ansi_highlight(),
+               ansi_normal(),
+               link);
 
         return 0;
 }

diff --git a/src/login/loginctl.c b/src/login/loginctl.c
index 695d18bba5bc460e20b7ef71d7b7cea9faab1b2b..995bcbff760f20deadcbe90c501792d84bb8e12e 100644 (file)
--- a/src/login/loginctl.c
+++ b/src/login/loginctl.c
@@ -1276,12 +1276,11 @@ static int help(int argc, char *argv[], void *userdata) {
                "                             short-monotonic, short-unix, verbose, export,\n"
                "                             json, json-pretty, json-sse, json-seq, cat,\n"
                "                             with-unit)\n"
-               "\nSee the %s for details.\n"
-               , program_invocation_short_name
-               , ansi_highlight()
-               , ansi_normal()
-               , link
-        );
+               "\nSee the %s for details.\n",
+               program_invocation_short_name,
+               ansi_highlight(),
+               ansi_normal(),
+               link);
 
         return 0;
 }

diff --git a/src/machine-id-setup/machine-id-setup-main.c b/src/machine-id-setup/machine-id-setup-main.c
index c35da05ffc430b022ec5267e21146b07014ce158..6074b1b42eec4d2c874fb0b0262b7dc54a413d5d 100644 (file)
--- a/src/machine-id-setup/machine-id-setup-main.c
+++ b/src/machine-id-setup/machine-id-setup-main.c
@@ -35,10 +35,9 @@ static int help(void) {
                "     --root=ROOT        Filesystem root\n"
                "     --commit           Commit transient ID\n"
                "     --print            Print used machine ID\n"
-               "\nSee the %s for details.\n"
-               , program_invocation_short_name
-               , link
-        );
+               "\nSee the %s for details.\n",
+               program_invocation_short_name,
+               link);
 
         return 0;
 }

diff --git a/src/machine/machinectl.c b/src/machine/machinectl.c
index 6eb6cbb35ad4958f4d9ec7d74b997b4db49b859b..e254e255599571dfee99a06754b560b037e4f17a 100644 (file)
--- a/src/machine/machinectl.c
+++ b/src/machine/machinectl.c
@@ -2534,14 +2534,13 @@ static int help(int argc, char *argv[], void *userdata) {
                "     --verify=MODE            Verification mode for downloaded images (no,\n"
                "                              checksum, signature)\n"
                "     --force                  Download image even if already exists\n"
-               "\nSee the %s for details.\n"
-               , program_invocation_short_name
-               , ansi_highlight()
-               , ansi_normal()
-               , ansi_highlight()
-               , ansi_normal()
-               , link
-        );
+               "\nSee the %s for details.\n",
+               program_invocation_short_name,
+               ansi_highlight(),
+               ansi_normal(),
+               ansi_highlight(),
+               ansi_normal(),
+               link);
 
         return 0;
 }

diff --git a/src/modules-load/modules-load.c b/src/modules-load/modules-load.c
index 2f0cef5ff93c6207467e77ca1393e5833b928135..ba690f52cabef28fbcb588de972367cfd68a70bc 100644 (file)
--- a/src/modules-load/modules-load.c
+++ b/src/modules-load/modules-load.c
@@ -115,10 +115,9 @@ static int help(void) {
                "Loads statically configured kernel modules.\n\n"
                "  -h --help             Show this help\n"
                "     --version          Show package version\n"
-               "\nSee the %s for details.\n"
-               , program_invocation_short_name
-               , link
-        );
+               "\nSee the %s for details.\n",
+               program_invocation_short_name,
+               link);
 
         return 0;
 }

diff --git a/src/mount/mount-tool.c b/src/mount/mount-tool.c
index 673f85519816dbec555e33090e693767f4c856d3..39e67b57f8945544cbe093a4596a09e23ebb56a7 100644 (file)
--- a/src/mount/mount-tool.c
+++ b/src/mount/mount-tool.c
@@ -114,11 +114,10 @@ static int help(void) {
                "     --list                       List mountable block devices\n"
                "  -u --umount                     Unmount mount points\n"
                "  -G --collect                    Unload unit after it stopped, even when failed\n"
-               "\nSee the %s for details.\n"
-               , program_invocation_short_name
-               , streq(program_invocation_short_name, "systemd-umount") ? "" : "--umount "
-               , link
-        );
+               "\nSee the %s for details.\n",
+               program_invocation_short_name,
+               streq(program_invocation_short_name, "systemd-umount") ? "" : "--umount ",
+               link);
 
         return 0;
 }

diff --git a/src/network/generator/main.c b/src/network/generator/main.c
index 4eb3f3b2c2476bf78ad4cfe177494622ee00e503..1ac8bf01c5e37ec5606b909bdf075965f6235a5c 100644 (file)
--- a/src/network/generator/main.c
+++ b/src/network/generator/main.c
@@ -117,9 +117,8 @@ static int help(void) {
         printf("%s [OPTIONS...] [-- KERNEL_CMDLINE]\n"
                "  -h --help                       Show this help\n"
                "     --version                    Show package version\n"
-               "     --root=PATH                  Operate on an alternate filesystem root\n"
-               , program_invocation_short_name
-               );
+               "     --root=PATH                  Operate on an alternate filesystem root\n",
+               program_invocation_short_name);
 
         return 0;
 }

diff --git a/src/network/networkctl.c b/src/network/networkctl.c
index a37618c8e0b61ced4baf8b71cf0f59e34b380f5e..3b9a7d6485eeafc0519751cae6297653c2df3355 100644 (file)
--- a/src/network/networkctl.c
+++ b/src/network/networkctl.c
@@ -2711,12 +2711,11 @@ static int help(void) {
                "  -s --stats             Show detailed link statics\n"
                "  -l --full              Do not ellipsize output\n"
                "  -n --lines=INTEGER     Number of journal entries to show\n"
-               "\nSee the %s for details.\n"
-               , program_invocation_short_name
-               , ansi_highlight()
-               , ansi_normal()
-               , link
-        );
+               "\nSee the %s for details.\n",
+               program_invocation_short_name,
+               ansi_highlight(),
+               ansi_normal(),
+               link);
 
         return 0;
 }

diff --git a/src/network/wait-online/wait-online.c b/src/network/wait-online/wait-online.c
index d6716e18744d3e8739414d81ddad9ac663af6440..2de3e79c3c79d393502d794a7a896f2c317c3b2b 100644 (file)
--- a/src/network/wait-online/wait-online.c
+++ b/src/network/wait-online/wait-online.c
@@ -44,10 +44,9 @@ static int help(void) {
                "                            Required operational state\n"
                "     --any                  Wait until at least one of the interfaces is online\n"
                "     --timeout=SECS         Maximum time to wait for network connectivity\n"
-               "\nSee the %s for details.\n"
-               , program_invocation_short_name
-               , link
-        );
+               "\nSee the %s for details.\n",
+               program_invocation_short_name,
+               link);
 
         return 0;
 }

diff --git a/src/notify/notify.c b/src/notify/notify.c
index 6a506db3a4499dd4336ccc9d9da232488b153ef5..1309d8f4e07551e29b79f20dd408021711542882 100644 (file)
--- a/src/notify/notify.c
+++ b/src/notify/notify.c
@@ -48,11 +48,11 @@ static int help(void) {
                "     --status=TEXT     Set status text\n"
                "     --booted          Check if the system was booted up with systemd\n"
                "     --no-block        Do not wait until operation finished\n"
-               "\nSee the %s for details.\n"
-               , program_invocation_short_name
-               , ansi_highlight(), ansi_normal()
-               , link
-        );
+               "\nSee the %s for details.\n",
+               program_invocation_short_name,
+               ansi_highlight(),
+               ansi_normal(),
+               link);
 
         return 0;
 }

diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index a564b95d85147b66283cf5acf4d8a867f3bd5fca..aa3bcdb7a299ab50444e08f23a289481c3a60106 100644 (file)
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -429,12 +429,13 @@ static int help(void) {
                "     --load-credential=ID:PATH\n"
                "                            Load credential to pass to container from file or\n"
                "                            AF_UNIX stream socket.\n"
-               "\nSee the %2$s for details.\n"
-               , program_invocation_short_name
-               , link
-               , ansi_underline(), ansi_normal()
-               , ansi_highlight(), ansi_normal()
-        );
+               "\nSee the %2$s for details.\n",
+               program_invocation_short_name,
+               link,
+               ansi_underline(),
+               ansi_normal(),
+               ansi_highlight(),
+               ansi_normal());
 
         return 0;
 }

diff --git a/src/oom/oomctl.c b/src/oom/oomctl.c
index dd393fcac989d02fff4dc9adc322568ce7fde8cf..7fcb4b82cc65f618abdf71773a3b12cc64bef068 100644 (file)
--- a/src/oom/oomctl.c
+++ b/src/oom/oomctl.c
@@ -30,12 +30,13 @@ static int help(int argc, char *argv[], void *userdata) {
                "  -h --help                   Show this help\n"
                "     --version                Show package version\n"
                "     --no-pager               Do not pipe output into a pager\n"
-               "\nSee the %6$s for details.\n"
-               , program_invocation_short_name
-               , ansi_highlight(), ansi_normal()
-               , ansi_underline(), ansi_normal()
-               , link
-        );
+               "\nSee the %6$s for details.\n",
+               program_invocation_short_name,
+               ansi_highlight(),
+               ansi_normal(),
+               ansi_underline(),
+               ansi_normal(),
+               link);
 
         return 0;
 }

diff --git a/src/oom/oomd.c b/src/oom/oomd.c
index 1fbcf41492ddfc589658dba1d4f7502cd71f6b9e..3f3ef944ee17988db07b9fc345da2100ee5b4ac0 100644 (file)
--- a/src/oom/oomd.c
+++ b/src/oom/oomd.c
@@ -53,10 +53,9 @@ static int help(void) {
                "     --version              Show package version\n"
                "     --dry-run              Only print destructive actions instead of doing them\n"
                "     --bus-introspect=PATH  Write D-Bus XML introspection data\n"
-               "\nSee the %s for details.\n"
-               , program_invocation_short_name
-               , link
-        );
+               "\nSee the %s for details.\n",
+               program_invocation_short_name,
+               link);
 
         return 0;
 }

diff --git a/src/partition/growfs.c b/src/partition/growfs.c
index 9406ae8373f62f2085ee0815d0d4fcca24884717..367644e3c9ecc38e7aebb5411be4570c86ddefaf 100644 (file)
--- a/src/partition/growfs.c
+++ b/src/partition/growfs.c
@@ -140,10 +140,9 @@ static int help(void) {
                "  -h --help          Show this help and exit\n"
                "     --version       Print version string and exit\n"
                "  -n --dry-run       Just print what would be done\n"
-               "\nSee the %s for details.\n"
-               , program_invocation_short_name
-               , link
-        );
+               "\nSee the %s for details.\n",
+               program_invocation_short_name,
+               link);
 
         return 0;
 }

diff --git a/src/partition/repart.c b/src/partition/repart.c
index 3d25fdb34e7731c1a26e50250e1858a18e69b67d..3004e59f9c4c62b9c27f867ee7995dff10c71d43 100644 (file)
--- a/src/partition/repart.c
+++ b/src/partition/repart.c
@@ -3497,11 +3497,11 @@ static int help(void) {
                "     --size=BYTES         Grow loopback file to specified size\n"
                "     --json=pretty|short|off\n"
                "                          Generate JSON output\n"
-               "\nSee the %s for details.\n"
-               , program_invocation_short_name
-               , ansi_highlight(), ansi_normal()
-               , link
-        );
+               "\nSee the %s for details.\n",
+               program_invocation_short_name,
+               ansi_highlight(),
+               ansi_normal(),
+               link);
 
         return 0;
 }

diff --git a/src/path/path.c b/src/path/path.c
index 5f1bb14e45ea75fcd5b39f2c4f9a5a1e896bb581..aec75f1fb7b8df5e23d851a62c015c6812704246 100644 (file)
--- a/src/path/path.c
+++ b/src/path/path.c
@@ -142,10 +142,9 @@ static int help(void) {
                "  -h --help             Show this help\n"
                "     --version          Show package version\n"
                "     --suffix=SUFFIX    Suffix to append to paths\n"
-               "\nSee the %s for details.\n"
-               , program_invocation_short_name
-               , link
-        );
+               "\nSee the %s for details.\n",
+               program_invocation_short_name,
+               link);
 
         return 0;
 }

diff --git a/src/portable/portablectl.c b/src/portable/portablectl.c
index 457170e6843c405031ee6dbaea03473c332c06a3..0b329134de5926ca64206b1c18e72babef97f08c 100644 (file)
--- a/src/portable/portablectl.c
+++ b/src/portable/portablectl.c
@@ -946,12 +946,11 @@ static int help(int argc, char *argv[], void *userdata) {
                "     --now                    Immediately start/stop the portable service after\n"
                "                              attach/before detach\n"
                "     --no-block               Don't block waiting for attach --now to complete\n"
-               "\nSee the %s for details.\n"
-               , program_invocation_short_name
-               , ansi_highlight()
-               , ansi_normal()
-               , link
-        );
+               "\nSee the %s for details.\n",
+               program_invocation_short_name,
+               ansi_highlight(),
+               ansi_normal(),
+               link);
 
         return 0;
 }

diff --git a/src/resolve/resolvconf-compat.c b/src/resolve/resolvconf-compat.c
index 5bc936faa709673564325a36ec4ec570b664086e..b3f1e12fa6189fb97f8b4299c8a607e35575b770 100644 (file)
--- a/src/resolve/resolvconf-compat.c
+++ b/src/resolve/resolvconf-compat.c
@@ -43,10 +43,9 @@ static int resolvconf_help(void) {
                "implementations are not supported and will cause the invocation to fail: -u,\n"
                "-I, -i, -l, -R, -r, -v, -V, --enable-updates, --disable-updates,\n"
                "--updates-are-enabled.\n"
-               "\nSee the %2$s for details.\n"
-               , program_invocation_short_name
-               , link
-        );
+               "\nSee the %2$s for details.\n",
+               program_invocation_short_name,
+               link);
 
         return 0;
 }

diff --git a/src/resolve/resolvectl.c b/src/resolve/resolvectl.c
index b479335769105d4beb125c5a16a80e3c81cce222..b1779a6418a43c8a8865f9688893dcde69ab1be8 100644 (file)
--- a/src/resolve/resolvectl.c
+++ b/src/resolve/resolvectl.c
@@ -2568,12 +2568,11 @@ static int compat_help(void) {
                "     --set-dnssec=MODE      Set per-interface DNSSEC mode\n"
                "     --set-nta=DOMAIN       Set per-interface DNSSEC NTA\n"
                "     --revert               Revert per-interface configuration\n"
-               "\nSee the %4$s for details.\n"
-               , program_invocation_short_name
-               , ansi_highlight()
-               , ansi_normal()
-               , link
-        );
+               "\nSee the %4$s for details.\n",
+               program_invocation_short_name,
+               ansi_highlight(),
+               ansi_normal(),
+               link);
 
         return 0;
 }
@@ -2627,14 +2626,13 @@ static int native_help(void) {
                "                                                              (default: yes)\n"
                "     --raw[=payload|packet]    Dump the answer as binary data\n"
                "     --legend=BOOL             Print headers and additional info (default: yes)\n"
-               "\nSee the %s for details.\n"
-               , program_invocation_short_name
-               , ansi_highlight()
-               , ansi_normal()
-               , ansi_highlight()
-               , ansi_normal()
-               , link
-        );
+               "\nSee the %s for details.\n",
+               program_invocation_short_name,
+               ansi_highlight(),
+               ansi_normal(),
+               ansi_highlight(),
+               ansi_normal(),
+               link);
 
         return 0;
 }

diff --git a/src/run/run.c b/src/run/run.c
index b4cc6fe7f84076f8bee1869074316c9af67c50ad..29b182718b74ee403abb1f92121d4d13d9f411aa 100644 (file)
--- a/src/run/run.c
+++ b/src/run/run.c
@@ -131,11 +131,11 @@ static int help(void) {
                "     --on-timezone-change         Run when the timezone changes\n"
                "     --on-clock-change            Run when the realtime clock jumps\n"
                "     --timer-property=NAME=VALUE  Set timer unit property\n"
-               "\nSee the %s for details.\n"
-               , program_invocation_short_name
-               , ansi_highlight(), ansi_normal()
-               , link
-        );
+               "\nSee the %s for details.\n",
+               program_invocation_short_name,
+               ansi_highlight(),
+               ansi_normal(),
+               link);
 
         return 0;
 }

diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c
index 90bc90e982600609e74aff6c1774f8a1c5df8bd2..297cc1fec69271d41f5bfa14df0707a92f274509 100644 (file)
--- a/src/sleep/sleep.c
+++ b/src/sleep/sleep.c
@@ -308,10 +308,9 @@ static int help(void) {
                "  hybrid-sleep           Both hibernate and suspend the system\n"
                "  suspend-then-hibernate Initially suspend and then hibernate\n"
                "                         the system after a fixed period of time\n"
-               "\nSee the %s for details.\n"
-               , program_invocation_short_name
-               , link
-        );
+               "\nSee the %s for details.\n",
+               program_invocation_short_name,
+               link);
 
         return 0;
 }

diff --git a/src/socket-proxy/socket-proxyd.c b/src/socket-proxy/socket-proxyd.c
index 4391d9f1f5dc409d58bfcaa51a339cd2864103a6..6e3ee0d76b00153d51476dfde6016b95af7d2fcc 100644 (file)
--- a/src/socket-proxy/socket-proxyd.c
+++ b/src/socket-proxy/socket-proxyd.c
@@ -595,11 +595,10 @@ static int help(void) {
                "                         the %3$s for time span format\n"
                "  -h --help              Show this help\n"
                "     --version           Show package version\n"
-               "\nSee the %2$s for details.\n"
-               , program_invocation_short_name
-               , link
-               , time_link
-        );
+               "\nSee the %2$s for details.\n",
+               program_invocation_short_name,
+               link,
+               time_link);
 
         return 0;
 }

diff --git a/src/sysctl/sysctl.c b/src/sysctl/sysctl.c
index e263d459a84c9aba1324817293bfb5ed44624bfc..6d20ee1a84b07e38c410c70a68614932dcbaa4af 100644 (file)
--- a/src/sysctl/sysctl.c
+++ b/src/sysctl/sysctl.c
@@ -294,10 +294,9 @@ static int help(void) {
                "     --cat-config       Show configuration files\n"
                "     --prefix=PATH      Only apply rules with the specified prefix\n"
                "     --no-pager         Do not pipe output into a pager\n"
-               "\nSee the %s for details.\n"
-               , program_invocation_short_name
-               , link
-        );
+               "\nSee the %s for details.\n",
+               program_invocation_short_name,
+               link);
 
         return 0;
 }

diff --git a/src/sysext/sysext.c b/src/sysext/sysext.c
index 81b3b29c08ad60745f51e4d9cc508c974a3fe0b0..601fd63a1442a573c816ce02e21546eb12f39dc8 100644 (file)
--- a/src/sysext/sysext.c
+++ b/src/sysext/sysext.c
@@ -886,12 +886,13 @@ static int verb_help(int argc, char **argv, void *userdata) {
                "     --json=pretty|short|off\n"
                "                          Generate JSON output\n"
                "     --force              Ignore version incompatibilities\n"
-               "\nSee the %2$s for details.\n"
-               , program_invocation_short_name
-               , link
-               , ansi_underline(), ansi_normal()
-               , ansi_highlight(), ansi_normal()
-        );
+               "\nSee the %2$s for details.\n",
+               program_invocation_short_name,
+               link,
+               ansi_underline(),
+               ansi_normal(),
+               ansi_highlight(),
+               ansi_normal());
 
         return 0;
 }

diff --git a/src/systemctl/systemctl-compat-halt.c b/src/systemctl/systemctl-compat-halt.c
index 8e41bd6cb83f93b015b7a0cb22f8333d6182dcca..82cb3df6cdd332acdc6ce8a85d2a78798c63d4d2 100644 (file)
--- a/src/systemctl/systemctl-compat-halt.c
+++ b/src/systemctl/systemctl-compat-halt.c
@@ -36,16 +36,15 @@ static int halt_help(void) {
                "  -w --wtmp-only Don't halt/power-off/reboot, just write wtmp record\n"
                "  -d --no-wtmp   Don't write wtmp record\n"
                "     --no-wall   Don't send wall message before halt/power-off/reboot\n"
-               "\nSee the %s for details.\n"
-               , program_invocation_short_name
-               , arg_action == ACTION_REBOOT   ? " [ARG]" : ""
-               , ansi_highlight()
-               , arg_action == ACTION_REBOOT   ? "Reboot" :
-                 arg_action == ACTION_POWEROFF ? "Power off" :
-                                                 "Halt"
-               , ansi_normal()
-               , link
-        );
+               "\nSee the %s for details.\n",
+               program_invocation_short_name,
+               arg_action == ACTION_REBOOT ? " [ARG]" : "",
+               ansi_highlight(),
+               arg_action == ACTION_REBOOT           ? "Reboot" :
+                       arg_action == ACTION_POWEROFF ? "Power off" :
+                                                       "Halt",
+               ansi_normal(),
+               link);
 
         return 0;
 }

diff --git a/src/systemctl/systemctl-compat-runlevel.c b/src/systemctl/systemctl-compat-runlevel.c
index e05b1b4705f4358b3238f92284d2dd0578c77bdf..ad6325bf35f364e3b1bd989b8409a6038e426351 100644 (file)
--- a/src/systemctl/systemctl-compat-runlevel.c
+++ b/src/systemctl/systemctl-compat-runlevel.c
@@ -21,11 +21,11 @@ static int runlevel_help(void) {
                "\n%sPrints the previous and current runlevel of the init system.%s\n"
                "\nOptions:\n"
                "     --help      Show this help\n"
-               "\nSee the %s for details.\n"
-               , program_invocation_short_name
-               , ansi_highlight(), ansi_normal()
-               , link
-        );
+               "\nSee the %s for details.\n",
+               program_invocation_short_name,
+               ansi_highlight(),
+               ansi_normal(),
+               link);
 
         return 0;
 }

diff --git a/src/systemctl/systemctl-compat-shutdown.c b/src/systemctl/systemctl-compat-shutdown.c
index 0c7d18b6d4b800045a224b1154363a5a9f3bd7f0..d876c79d33f8621dfc44adb2f9a1f82d41cf9dfa 100644 (file)
--- a/src/systemctl/systemctl-compat-shutdown.c
+++ b/src/systemctl/systemctl-compat-shutdown.c
@@ -28,11 +28,11 @@ static int shutdown_help(void) {
                "  -k             Don't halt/power-off/reboot, just send warnings\n"
                "     --no-wall   Don't send wall message before halt/power-off/reboot\n"
                "  -c             Cancel a pending shutdown\n"
-               "\nSee the %s for details.\n"
-               , program_invocation_short_name
-               , ansi_highlight(), ansi_normal()
-               , link
-        );
+               "\nSee the %s for details.\n",
+               program_invocation_short_name,
+               ansi_highlight(),
+               ansi_normal(),
+               link);
 
         return 0;
 }

diff --git a/src/systemctl/systemctl-compat-telinit.c b/src/systemctl/systemctl-compat-telinit.c
index 148574d52c154ab64786408a3e9bf1cd6b9cbd82..f67361ea906b853222b2c6d6a4577f1b20dc2139 100644 (file)
--- a/src/systemctl/systemctl-compat-telinit.c
+++ b/src/systemctl/systemctl-compat-telinit.c
@@ -31,11 +31,11 @@ static int telinit_help(void) {
                "\nOptions:\n"
                "     --help      Show this help\n"
                "     --no-wall   Don't send wall message before halt/power-off/reboot\n"
-               "\nSee the %s for details.\n"
-               , program_invocation_short_name
-               , ansi_highlight(), ansi_normal()
-               , link
-        );
+               "\nSee the %s for details.\n",
+               program_invocation_short_name,
+               ansi_highlight(),
+               ansi_normal(),
+               link);
 
         return 0;
 }

diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index 4739faae39a6395989fca75416a3293514454ea6..c53ed41cc325dd6e991917bd2b4ae088b1813796 100644 (file)
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -295,12 +295,13 @@ static int systemctl_help(void) {
                "                         'us+utc': 'Day YYYY-MM-DD HH:MM:SS.UUUUUU UTC\n"
                "     --read-only         Create read-only bind mount\n"
                "     --mkdir             Create directory before mounting, if missing\n"
-               "\nSee the %2$s for details.\n"
-               , program_invocation_short_name
-               , link
-               , ansi_underline(), ansi_normal()
-               , ansi_highlight(), ansi_normal()
-        );
+               "\nSee the %2$s for details.\n",
+               program_invocation_short_name,
+               link,
+               ansi_underline(),
+               ansi_normal(),
+               ansi_highlight(),
+               ansi_normal());
 
         return 0;
 }

diff --git a/src/sysusers/sysusers.c b/src/sysusers/sysusers.c
index 648d1922008c67b531936fdff06a3eb5a9441c3d..25a1871bd4c0145d63b5d8fe391166ee42cc6602 100644 (file)
--- a/src/sysusers/sysusers.c
+++ b/src/sysusers/sysusers.c
@@ -1762,10 +1762,9 @@ static int help(void) {
                "     --replace=PATH         Treat arguments as replacement for PATH\n"
                "     --inline               Treat arguments as configuration lines\n"
                "     --no-pager             Do not pipe output into a pager\n"
-               "\nSee the %s for details.\n"
-               , program_invocation_short_name
-               , link
-        );
+               "\nSee the %s for details.\n",
+               program_invocation_short_name,
+               link);
 
         return 0;
 }

diff --git a/src/timedate/timedatectl.c b/src/timedate/timedatectl.c
index abc792a4525fc05f05516c0afff07bd5a2cf443f..7088a771a65853dbc9fcf1cb2babfbcc1c1e8257 100644 (file)
--- a/src/timedate/timedatectl.c
+++ b/src/timedate/timedatectl.c
@@ -916,12 +916,11 @@ static int help(void) {
                "  -p --property=NAME       Show only properties by this name\n"
                "  -a --all                 Show all properties, including empty ones\n"
                "     --value               When showing properties, only print the value\n"
-               "\nSee the %s for details.\n"
-               , program_invocation_short_name
-               , ansi_highlight()
-               , ansi_normal()
-               , link
-        );
+               "\nSee the %s for details.\n",
+               program_invocation_short_name,
+               ansi_highlight(),
+               ansi_normal(),
+               link);
 
         return 0;
 }

diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
index 955cf00ce48eac2e4a61eb1024413fc99355ce3f..b033def9dffbc4896b40448c395bdf1bf6e2a206 100644 (file)
--- a/src/tmpfiles/tmpfiles.c
+++ b/src/tmpfiles/tmpfiles.c
@@ -3013,11 +3013,11 @@ static int help(void) {
                "     --image=PATH           Operate on disk image as filesystem root\n"
                "     --replace=PATH         Treat arguments as replacement for PATH\n"
                "     --no-pager             Do not pipe output into a pager\n"
-               "\nSee the %s for details.\n"
-               , program_invocation_short_name
-               , ansi_highlight(), ansi_normal()
-               , link
-        );
+               "\nSee the %s for details.\n",
+               program_invocation_short_name,
+               ansi_highlight(),
+               ansi_normal(),
+               link);
 
         return 0;
 }

diff --git a/src/tty-ask-password-agent/tty-ask-password-agent.c b/src/tty-ask-password-agent/tty-ask-password-agent.c
index 1940792b9d565243c02ec0c5bfd393d023ec6178..5695327024a8e2f38e4c6ff3435defed7dc75eb2 100644 (file)
--- a/src/tty-ask-password-agent/tty-ask-password-agent.c
+++ b/src/tty-ask-password-agent/tty-ask-password-agent.c
@@ -424,10 +424,9 @@ static int help(void) {
                "     --wall     Continuously forward password requests to wall\n"
                "     --plymouth Ask question with Plymouth instead of on TTY\n"
                "     --console  Ask question on /dev/console instead of current TTY\n"
-               "\nSee the %s for details.\n"
-               , program_invocation_short_name
-               , link
-        );
+               "\nSee the %s for details.\n",
+               program_invocation_short_name,
+               link);
 
         return 0;
 }

diff --git a/src/udev/scsi_id/scsi_id.c b/src/udev/scsi_id/scsi_id.c
index bce8b4c69fc40cf9e47b3ea478a66e4c46219be0..0c4a17c456d15f3b1f79fd8605114d36eb9d953f 100644 (file)
--- a/src/udev/scsi_id/scsi_id.c
+++ b/src/udev/scsi_id/scsi_id.c
@@ -299,9 +299,8 @@ static void help(void) {
                "  -g --whitelisted                 Treat device as whitelisted\n"
                "  -u --replace-whitespace          Replace all whitespace by underscores\n"
                "  -v --verbose                     Verbose logging\n"
-               "  -x --export                      Print values as environment keys\n"
-               , program_invocation_short_name);
-
+               "  -x --export                      Print values as environment keys\n",
+               program_invocation_short_name);
 }
 
 static int set_options(int argc, char **argv,

diff --git a/src/udev/udevadm-control.c b/src/udev/udevadm-control.c
index ef23a6c9f65d43159a5c45b40126d8ba80ba6e9f..437ac9b832cd8e9ad462e857ceffe9f7030adaae 100644 (file)
--- a/src/udev/udevadm-control.c
+++ b/src/udev/udevadm-control.c
@@ -41,8 +41,8 @@ static int help(void) {
                "  -p --property=KEY=VALUE  Set a global property for all events\n"
                "  -m --children-max=N      Maximum number of children\n"
                "     --ping                Wait for udev to respond to a ping message\n"
-               "  -t --timeout=SECONDS     Maximum time to block for a reply\n"
-               , program_invocation_short_name);
+               "  -t --timeout=SECONDS     Maximum time to block for a reply\n",
+               program_invocation_short_name);
 
         return 0;
 }

diff --git a/src/udev/udevadm-hwdb.c b/src/udev/udevadm-hwdb.c
index 3d219222b9d46081a1e1361f5d6be2d1d2fad219..9414269fb80cbf6b381d2311db252b07de50a58b 100644 (file)
--- a/src/udev/udevadm-hwdb.c
+++ b/src/udev/udevadm-hwdb.c
@@ -23,8 +23,8 @@ static int help(void) {
                "  -r --root=PATH       Alternative root path in the filesystem\n\n"
                "NOTE:\n"
                "The sub-command 'hwdb' is deprecated, and is left for backwards compatibility.\n"
-               "Please use systemd-hwdb instead.\n"
-               , program_invocation_short_name);
+               "Please use systemd-hwdb instead.\n",
+               program_invocation_short_name);
 
         return 0;
 }

diff --git a/src/udev/udevadm-info.c b/src/udev/udevadm-info.c
index 5ff6256dfa5d54dc56f5145368fdfe44249c87d8..71cc0d2d9b87eb479516e4b8490dd24c32923a5b 100644 (file)
--- a/src/udev/udevadm-info.c
+++ b/src/udev/udevadm-info.c
@@ -356,8 +356,8 @@ static int help(void) {
                "  -e --export-db              Export the content of the udev database\n"
                "  -c --cleanup-db             Clean up the udev database\n"
                "  -w --wait-for-initialization[=SECONDS]\n"
-               "                              Wait for device to be initialized\n"
-               , program_invocation_short_name);
+               "                              Wait for device to be initialized\n",
+               program_invocation_short_name);
 
         return 0;
 }

diff --git a/src/udev/udevadm-monitor.c b/src/udev/udevadm-monitor.c
index 64b1160d71a4a5270dbda1222cbbc01e0bd079de..1a8a1a5b3b5b19bdb03031f145a4416b8e11f700 100644 (file)
--- a/src/udev/udevadm-monitor.c
+++ b/src/udev/udevadm-monitor.c
@@ -107,8 +107,8 @@ static int help(void) {
                "  -k --kernel                              Print kernel uevents\n"
                "  -u --udev                                Print udev events\n"
                "  -s --subsystem-match=SUBSYSTEM[/DEVTYPE] Filter events by subsystem\n"
-               "  -t --tag-match=TAG                       Filter events by tag\n"
-               , program_invocation_short_name);
+               "  -t --tag-match=TAG                       Filter events by tag\n",
+               program_invocation_short_name);
 
         return 0;
 }

diff --git a/src/udev/udevadm-settle.c b/src/udev/udevadm-settle.c
index 33d799057292aed117f90b677beaafa18709701f..2c61c2d8b02e920d2c60c3aaf9cbe749305b1f15 100644 (file)
--- a/src/udev/udevadm-settle.c
+++ b/src/udev/udevadm-settle.c
@@ -38,8 +38,8 @@ static int help(void) {
                "  -h --help                 Show this help\n"
                "  -V --version              Show package version\n"
                "  -t --timeout=SEC          Maximum time to wait for events\n"
-               "  -E --exit-if-exists=FILE  Stop waiting if file exists\n"
-               , program_invocation_short_name);
+               "  -E --exit-if-exists=FILE  Stop waiting if file exists\n",
+               program_invocation_short_name);
 
         return 0;
 }

diff --git a/src/udev/udevadm-test-builtin.c b/src/udev/udevadm-test-builtin.c
index 8995e5ccaebaea2f061047a77b8416df60e1d23a..008d6f29143be7e0a9c1b9234bc75a9fab1e1bd2 100644 (file)
--- a/src/udev/udevadm-test-builtin.c
+++ b/src/udev/udevadm-test-builtin.c
@@ -19,8 +19,8 @@ static int help(void) {
                "Test a built-in command.\n\n"
                "  -h --help     Print this message\n"
                "  -V --version  Print version of the program\n\n"
-               "Commands:\n"
-               , program_invocation_short_name);
+               "Commands:\n",
+               program_invocation_short_name);
 
         udev_builtin_list();
 

diff --git a/src/udev/udevadm-test.c b/src/udev/udevadm-test.c
index e6a5f423e555cc5d569f9fd3bf966f3cfca00f22..e28378eea81c4156fe4f5e7f2448ac1d02c11093 100644 (file)
--- a/src/udev/udevadm-test.c
+++ b/src/udev/udevadm-test.c
@@ -34,8 +34,8 @@ static int help(void) {
                "  -h --help                            Show this help\n"
                "  -V --version                         Show package version\n"
                "  -a --action=ACTION|help              Set action string\n"
-               "  -N --resolve-names=early|late|never  When to resolve names\n"
-               , program_invocation_short_name);
+               "  -N --resolve-names=early|late|never  When to resolve names\n",
+               program_invocation_short_name);
 
         return 0;
 }

diff --git a/src/udev/udevadm-trigger.c b/src/udev/udevadm-trigger.c
index f7ca88195d1b822b927e5a1fb08fe98486e2e838..7a9f968128950364f2f38d39374d11123ae70d18 100644 (file)
--- a/src/udev/udevadm-trigger.c
+++ b/src/udev/udevadm-trigger.c
@@ -133,8 +133,8 @@ static int help(void) {
                "  -b --parent-match=NAME            Trigger devices with that parent device\n"
                "  -w --settle                       Wait for the triggered events to complete\n"
                "     --wait-daemon[=SECONDS]        Wait for udevd daemon to be initialized\n"
-               "                                    before triggering uevents\n"
-               , program_invocation_short_name);
+               "                                    before triggering uevents\n",
+               program_invocation_short_name);
 
         return 0;
 }

diff --git a/src/udev/udevadm.c b/src/udev/udevadm.c
index 39e40411b18ad3f64cb8ae739a0a483df26d9dea..47d1a2fb9c9be1cbfe46baaf5086c5cedc99e096 100644 (file)
--- a/src/udev/udevadm.c
+++ b/src/udev/udevadm.c
@@ -37,8 +37,8 @@ static int help(void) {
 
         printf("%s [--help] [--version] [--debug] COMMAND [COMMAND OPTIONS]\n\n"
                "Send control commands or test the device manager.\n\n"
-               "Commands:\n"
-               , program_invocation_short_name);
+               "Commands:\n",
+               program_invocation_short_name);
 
         for (i = 0; i < ELEMENTSOF(short_descriptions); i++)
                 printf("  %-12s  %s\n", short_descriptions[i][0], short_descriptions[i][1]);

diff --git a/src/udev/udevd.c b/src/udev/udevd.c
index a19232bd4e09db2d482690ae403bf0af061d05d5..0134f78b4ba4e0c3e82542d0e2776c8f66e800f6 100644 (file)
--- a/src/udev/udevd.c
+++ b/src/udev/udevd.c
@@ -1578,10 +1578,9 @@ static int help(void) {
                "  -t --event-timeout=SECONDS  Seconds to wait before terminating an event\n"
                "  -N --resolve-names=early|late|never\n"
                "                              When to resolve users and groups\n"
-               "\nSee the %s for details.\n"
-               , program_invocation_short_name
-               , link
-        );
+               "\nSee the %s for details.\n",
+               program_invocation_short_name,
+               link);
 
         return 0;
 }

diff --git a/src/udev/v4l_id/v4l_id.c b/src/udev/v4l_id/v4l_id.c
index 932446b766dadfef611c5d6b3f09d735531490fd..26b634ef5b4977e1fa07df182c1ddf658654f25b 100644 (file)
--- a/src/udev/v4l_id/v4l_id.c
+++ b/src/udev/v4l_id/v4l_id.c
@@ -45,8 +45,8 @@ int main(int argc, char *argv[]) {
                 case 'h':
                         printf("%s [-h,--help] <device file>\n\n"
                                "Video4Linux device identification.\n\n"
-                               "  -h  Print this message\n"
-                               , program_invocation_short_name);
+                               "  -h  Print this message\n",
+                               program_invocation_short_name);
                         return 0;
                 case '?':
                         return -EINVAL;

diff --git a/src/userdb/userdbctl.c b/src/userdb/userdbctl.c
index a0e22dff559ee5b0916de88ce5c5ebc3f1747b93..ecaead39d76a58b54169a572a4acd31533f60550 100644 (file)
--- a/src/userdb/userdbctl.c
+++ b/src/userdb/userdbctl.c
@@ -600,11 +600,11 @@ static int help(int argc, char *argv[], void *userdata) {
                "  -N                         Do not synthesize or include glibc NSS data\n"
                "                             (Same as --synthesize=no --with-nss=no)\n"
                "     --synthesize=BOOL       Synthesize root/nobody user\n"
-               "\nSee the %s for details.\n"
-               , program_invocation_short_name
-               , ansi_highlight(), ansi_normal()
-               , link
-        );
+               "\nSee the %s for details.\n",
+               program_invocation_short_name,
+               ansi_highlight(),
+               ansi_normal(),
+               link);
 
         return 0;
 }

diff --git a/src/veritysetup/veritysetup.c b/src/veritysetup/veritysetup.c
index cd9f0e7f64bb536de345a99a4985f0cbad54c49a..9ecfbc5217f901c141bcb8dcf41fc2414cca1feb 100644 (file)
--- a/src/veritysetup/veritysetup.c
+++ b/src/veritysetup/veritysetup.c
@@ -31,11 +31,10 @@ static int help(void) {
         printf("%s attach VOLUME DATADEVICE HASHDEVICE ROOTHASH [OPTIONS]\n"
                "%s detach VOLUME\n\n"
                "Attaches or detaches an integrity protected block device.\n"
-               "\nSee the %s for details.\n"
-               , program_invocation_short_name
-               , program_invocation_short_name
-               , link
-        );
+               "\nSee the %s for details.\n",
+               program_invocation_short_name,
+               program_invocation_short_name,
+               link);
 
         return 0;
 }