diff options
Diffstat (limited to 'src')
78 files changed, 335 insertions, 370 deletions
diff --git a/src/ac-power/ac-power.c b/src/ac-power/ac-power.c index 9fabdb9e9f..905da4ad87 100644 --- 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 1f7a2490e7..f298b1d491 100644 --- 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 a45cc00853..31718afebd 100644 --- 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 a24ee9af1c..599ffcdf09 100644 --- 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 d1b6a81e33..717f0475ca 100644 --- 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 43ed2f385b..ecb9d90a78 100644 --- 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 cd34f88bb9..bd6f64915d 100644 --- 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 92f3cd4ed0..cb4f758cb4 100644 --- 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 e7e8f5d94f..8d2be21dc5 100644 --- 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 8a31916ad7..02648957db 100644 --- 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 693b5047f2..30fd743d11 100644 --- 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 9c96b4d697..f63a7173e6 100644 --- 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 eaa56aca2a..85bf558e90 100644 --- 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 1a62916427..20bd97c1fc 100644 --- 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 b28dbcd665..fa4dfb6ef2 100644 --- 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 65cbd1aec8..9cef31398f 100644 --- 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 4295abdc30..a50cb36ee3 100644 --- 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 14d649c6ed..be0db85d7c 100644 --- 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 9b127d456a..0b83d79cc9 100644 --- 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 05d03ad762..24c53bf14b 100644 --- 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 afead11b42..6982cf2eed 100644 --- 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 93d322110b..0b41489897 100644 --- 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 c2338a69f6..4482608b28 100644 --- 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 1246d68969..26cc83f31b 100644 --- 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 086f398108..70ea4d0a69 100644 --- 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 534de51b0f..17216c8e20 100644 --- 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 b00151c32e..685ce5a16b 100644 --- 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 bf362d0919..2d84bdcae5 100644 --- 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 bccf615189..223af8da1e 100644 --- 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 bcf2e01d5c..dee0a0835b 100644 --- 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 7d3d3f8c18..692a259275 100644 --- 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 e18dbc5132..afb4d7e2e1 100644 --- 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 695d18bba5..995bcbff76 100644 --- 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 c35da05ffc..6074b1b42e 100644 --- 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 6eb6cbb35a..e254e25559 100644 --- 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 2f0cef5ff9..ba690f52ca 100644 --- 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 673f855198..39e67b57f8 100644 --- 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 4eb3f3b2c2..1ac8bf01c5 100644 --- 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 a37618c8e0..3b9a7d6485 100644 --- 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 d6716e1874..2de3e79c3c 100644 --- 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 6a506db3a4..1309d8f4e0 100644 --- 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 a564b95d85..aa3bcdb7a2 100644 --- 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 dd393fcac9..7fcb4b82cc 100644 --- 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 1fbcf41492..3f3ef944ee 100644 --- 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 9406ae8373..367644e3c9 100644 --- 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 3d25fdb34e..3004e59f9c 100644 --- 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 5f1bb14e45..aec75f1fb7 100644 --- 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 457170e684..0b329134de 100644 --- 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 5bc936faa7..b3f1e12fa6 100644 --- 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 b479335769..b1779a6418 100644 --- 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 b4cc6fe7f8..29b182718b 100644 --- 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 90bc90e982..297cc1fec6 100644 --- 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 4391d9f1f5..6e3ee0d76b 100644 --- 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 e263d459a8..6d20ee1a84 100644 --- 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 81b3b29c08..601fd63a14 100644 --- 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 8e41bd6cb8..82cb3df6cd 100644 --- 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 e05b1b4705..ad6325bf35 100644 --- 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 0c7d18b6d4..d876c79d33 100644 --- 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 148574d52c..f67361ea90 100644 --- 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 4739faae39..c53ed41cc3 100644 --- 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 648d192200..25a1871bd4 100644 --- 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 abc792a452..7088a771a6 100644 --- 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 955cf00ce4..b033def9df 100644 --- 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 1940792b9d..5695327024 100644 --- 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 bce8b4c69f..0c4a17c456 100644 --- 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 ef23a6c9f6..437ac9b832 100644 --- 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 3d219222b9..9414269fb8 100644 --- 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 5ff6256dfa..71cc0d2d9b 100644 --- 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 64b1160d71..1a8a1a5b3b 100644 --- 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 33d7990572..2c61c2d8b0 100644 --- 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 8995e5ccae..008d6f2914 100644 --- 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 e6a5f423e5..e28378eea8 100644 --- 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 f7ca88195d..7a9f968128 100644 --- 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 39e40411b1..47d1a2fb9c 100644 --- 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 a19232bd4e..0134f78b4b 100644 --- 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 932446b766..26b634ef5b 100644 --- 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 a0e22dff55..ecaead39d7 100644 --- 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 cd9f0e7f64..9ecfbc5217 100644 --- 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; } |