shared/verbs: stop requiring an explicit program name

Almost all programs are simple and have only a single command. When
printing options, let's just use the first COMMAND block found by default.
This means we can drop the explicit program-name argument and reduce
copy&paste boilerplate.

src/ac-power/ac-power.c

@@ -32,7 +32,7 @@ static int parse_argv(int argc, char *argv[]) {
         FOREACH_OPTION_OR_RETURN(c, &opts)
                 switch (c) {
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-ac-power");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/analyze/analyze.c

@@ -203,7 +203,7 @@ COMMAND(
         .pager_flags = &arg_pager_flags,
 );
 
-VERB_COMMON_HELP_AUTO_HIDDEN("systemd-analyze");
+VERB_COMMON_HELP_AUTO_HIDDEN();
 
 /* When updating this list, including descriptions, apply changes to
  * shell-completion/bash/systemd-analyze and shell-completion/zsh/_systemd-analyze too. */
@@ -336,7 +336,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
                         break;
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-analyze");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/ask-password/ask-password.c

@@ -55,7 +55,7 @@ static int parse_argv(int argc, char *argv[]) {
         FOREACH_OPTION_OR_RETURN(c, &opts)
                 switch (c) {
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-ask-password");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/backlight/backlight.c

@@ -625,7 +625,7 @@ static int verb_save(int argc, char *argv[], uintptr_t _data, void *userdata) {
         return 0;
 }
 
-VERB_COMMON_HELP_AUTO_HIDDEN("systemd-backlight");
+VERB_COMMON_HELP_AUTO_HIDDEN();
 
 static int parse_argv(int argc, char *argv[], char ***ret_args) {
         assert(argc >= 0);
@@ -638,7 +638,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-backlight");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/battery-check/battery-check.c

@@ -66,7 +66,7 @@ static int parse_argv(int argc, char *argv[]) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-battery-check");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/binfmt/binfmt.c

@@ -126,7 +126,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
         FOREACH_OPTION_OR_RETURN(c, &opts)
                 switch (c) {
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-binfmt");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/bless-boot/bless-boot.c

@@ -39,7 +39,7 @@ typedef enum Status {
         STATUS_INDETERMINATE,
 } Status;
 
-VERB_COMMON_HELP_AUTO_HIDDEN("systemd-bless-boot");
+VERB_COMMON_HELP_AUTO_HIDDEN();
 
 static int check_support(void) {
         if (detect_container() > 0)
@@ -65,7 +65,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
         FOREACH_OPTION_OR_RETURN(c, &opts)
                 switch (c) {
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-bless-boot");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/bless-boot/boot-check-no-failures.c

@@ -25,7 +25,7 @@ static int parse_argv(int argc, char *argv[]) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-boot-check-no-failures");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/bootctl/bootctl.c

@@ -295,7 +295,7 @@ GracefulMode arg_graceful(void) {
         return _arg_graceful;
 }
 
-VERB_COMMON_HELP_AUTO_HIDDEN("bootctl");
+VERB_COMMON_HELP_AUTO_HIDDEN();
 
 VERB_GROUP("Generic EFI Firmware/Boot Loader Commands");
 
@@ -413,7 +413,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
                 OPTION_GROUP("Options"): {}
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("bootctl");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/busctl/busctl.c

@@ -2081,7 +2081,7 @@ static int verb_set_property(int argc, char *argv[], uintptr_t _data, void *user
         return 0;
 }
 
-VERB_COMMON_HELP_AUTO("busctl");
+VERB_COMMON_HELP_AUTO();
 
 static int parse_argv(int argc, char *argv[], char ***remaining_args) {
         assert(argc >= 0);
@@ -2095,7 +2095,7 @@ static int parse_argv(int argc, char *argv[], char ***remaining_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("busctl");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/cgls/cgls.c

@@ -56,7 +56,7 @@ static int parse_argv(int argc, char *argv[]) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-cgls");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/cgtop/cgtop.c

@@ -703,7 +703,7 @@ static int parse_argv(int argc, char *argv[]) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-cgtop");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/clonesetup/clonesetup.c

@@ -150,7 +150,7 @@ static int parse_argv(int argc, char *argv[]) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-clonesetup");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/coredump/coredumpctl.c

@@ -183,7 +183,7 @@ static int acquire_journal(sd_journal **ret, char **matches) {
         return 0;
 }
 
-VERB_COMMON_HELP_AUTO_HIDDEN("coredumpctl");
+VERB_COMMON_HELP_AUTO_HIDDEN();
 
 static int parse_argv(int argc, char *argv[], char ***remaining_args) {
         int r;
@@ -198,7 +198,7 @@ static int parse_argv(int argc, char *argv[], char ***remaining_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("coredumpctl");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/creds/creds.c

@@ -779,7 +779,7 @@ static int verb_has_tpm2(int argc, char *argv[], uintptr_t _data, void *userdata
         return verb_has_tpm2_generic(arg_quiet);
 }
 
-VERB_COMMON_HELP_AUTO("systemd-creds");
+VERB_COMMON_HELP_AUTO();
 
 static int parse_argv(int argc, char *argv[], char ***ret_args) {
         assert(argc >= 0);
@@ -792,7 +792,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-creds");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/cryptenroll/cryptenroll.c

@@ -365,7 +365,7 @@ static int parse_argv(int argc, char *argv[]) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-cryptenroll");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/cryptsetup/cryptsetup.c

@@ -2379,7 +2379,7 @@ static int attach_luks_or_plain_or_bitlk(
         return attach_luks_or_plain_or_bitlk_by_passphrase(cd, name, passwords, flags, pass_volume_key);
 }
 
-VERB_COMMON_HELP_AUTO_HIDDEN("systemd-cryptsetup");
+VERB_COMMON_HELP_AUTO_HIDDEN();
 
 static int parse_argv(int argc, char *argv[], char ***ret_args) {
         assert(argc >= 0);
@@ -2392,7 +2392,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-cryptsetup");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/delta/delta.c

@@ -513,7 +513,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-delta");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/detect-virt/detect-virt.c

@@ -36,7 +36,7 @@ static int parse_argv(int argc, char *argv[]) {
         FOREACH_OPTION_OR_RETURN(c, &opts)
                 switch (c) {
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-detect-virt");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/dissect/dissect.c

@@ -404,7 +404,7 @@ static int parse_argv(int argc, char *argv[]) {
                 OPTION_GROUP("Commands"): {}
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-dissect");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/escape/escape-tool.c

@@ -44,7 +44,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-escape");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/factory-reset/factory-reset-tool.c

@@ -39,7 +39,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
         FOREACH_OPTION_OR_RETURN(c, &opts)
                 switch (c) {
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-factory-reset");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/firstboot/firstboot.c

@@ -1394,7 +1394,7 @@ static int parse_argv(int argc, char *argv[]) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-firstboot");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/growfs/growfs.c

@@ -145,7 +145,7 @@ static int parse_argv(int argc, char *argv[]) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-growfs");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/hibernate-resume/hibernate-resume.c

@@ -42,7 +42,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-hibernate-resume");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/home/homectl.c

@@ -4009,7 +4009,7 @@ static int parse_fido2_device_field(const char *arg) {
         return 1;
 }
 
-VERB_COMMON_HELP_AUTO_HIDDEN("homectl");
+VERB_COMMON_HELP_AUTO_HIDDEN();
 
 static int parse_argv(int argc, char *argv[], char ***remaining_args) {
         _cleanup_strv_free_ char **arg_languages = NULL;
@@ -4038,7 +4038,7 @@ static int parse_argv(int argc, char *argv[], char ***remaining_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("homectl");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/hostname/hostnamectl.c

@@ -853,7 +853,7 @@ static int verb_get_or_set_tags(int argc, char *argv[], uintptr_t _data, void *u
         return 0;
 }
 
-VERB_COMMON_HELP_AUTO_HIDDEN("hostnamectl");
+VERB_COMMON_HELP_AUTO_HIDDEN();
 
 static int parse_argv(int argc, char *argv[], char ***ret_args) {
         int r;
@@ -866,7 +866,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
         FOREACH_OPTION_OR_RETURN(c, &opts)
                 switch (c) {
                 OPTION_COMMON_HELP:
-                        return command_print_help("hostnamectl");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/hwdb/hwdb.c

@@ -35,7 +35,7 @@ static int verb_update(int argc, char *argv[], uintptr_t _data, void *userdata)
         return hwdb_update(arg_root, arg_hwdb_bin_dir, arg_strict, false);
 }
 
-VERB_COMMON_HELP_AUTO_HIDDEN("systemd-hwdb");
+VERB_COMMON_HELP_AUTO_HIDDEN();
 
 static int parse_argv(int argc, char *argv[], char ***ret_args) {
         assert(argc >= 0);
@@ -48,7 +48,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-hwdb");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/id128/id128.c

@@ -234,7 +234,7 @@ static int verb_show(int argc, char *argv[], uintptr_t _data, void *userdata) {
         return 0;
 }
 
-VERB_COMMON_HELP_AUTO("systemd-id128");
+VERB_COMMON_HELP_AUTO();
 
 static int parse_argv(int argc, char *argv[], char ***ret_args) {
         int r;
@@ -247,7 +247,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
         FOREACH_OPTION_OR_RETURN(c, &opts)
                 switch (c) {
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-id128");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/imds/imds-tool.c

@@ -70,7 +70,7 @@ static int parse_argv(int argc, char *argv[]) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-imds");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/imds/imdsd.c

@@ -2213,7 +2213,7 @@ static int parse_argv(int argc, char *argv[]) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-imdsd");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/import/export.c

@@ -197,7 +197,7 @@ static int verb_export_raw(int argc, char *argv[], uintptr_t _data, void *userda
         return -r;
 }
 
-VERB_COMMON_HELP_AUTO_HIDDEN("systemd-export");
+VERB_COMMON_HELP_AUTO_HIDDEN();
 
 static int parse_argv(int argc, char *argv[], char ***ret_args) {
         assert(argc >= 0);
@@ -210,7 +210,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-export");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/import/import-fs.c

@@ -272,7 +272,7 @@ static int verb_import_fs(int argc, char *argv[], uintptr_t _data, void *userdat
         return 0;
 }
 
-VERB_COMMON_HELP_AUTO_HIDDEN("systemd-import-fs");
+VERB_COMMON_HELP_AUTO_HIDDEN();
 
 static int parse_argv(int argc, char *argv[], char ***ret_args) {
         assert(argc >= 0);
@@ -286,7 +286,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-import-fs");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/import/import.c

@@ -275,7 +275,7 @@ static int verb_raw(int argc, char *argv[], uintptr_t _data, void *userdata) {
         return -r;
 }
 
-VERB_COMMON_HELP_AUTO_HIDDEN("systemd-import");
+VERB_COMMON_HELP_AUTO_HIDDEN();
 
 static int parse_argv(int argc, char *argv[], char ***ret_args) {
         int r;
@@ -289,7 +289,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-import");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/import/importctl.c

@@ -1066,7 +1066,7 @@ static int verb_list_images(int argc, char *argv[], uintptr_t _data, void *userd
         return 0;
 }
 
-VERB_COMMON_HELP_AUTO("importctl");
+VERB_COMMON_HELP_AUTO();
 
 static int parse_argv(int argc, char *argv[], char ***ret_args) {
         int r;
@@ -1080,7 +1080,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("importctl");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/import/pull.c

@@ -320,7 +320,7 @@ static int verb_oci(int argc, char *argv[], uintptr_t _data, void *userdata) {
         return -r;
 }
 
-VERB_COMMON_HELP_AUTO_HIDDEN("systemd-pull");
+VERB_COMMON_HELP_AUTO_HIDDEN();
 
 static int parse_argv(int argc, char *argv[], char ***ret_args) {
         int r;
@@ -335,7 +335,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-pull");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/journal-remote/journal-gatewayd.c

@@ -1112,7 +1112,7 @@ static int parse_argv(int argc, char *argv[]) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-journal-gatewayd");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/journal-remote/journal-remote-main.c

@@ -889,7 +889,7 @@ static int parse_argv(int argc, char *argv[]) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-journal-remote");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/journal-remote/journal-upload.c

@@ -703,7 +703,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-journal-upload");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/journal/bsod.c

@@ -231,7 +231,7 @@ static int parse_argv(int argc, char *argv[]) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-bsod");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/journal/cat.c

@@ -43,7 +43,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-cat");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/journal/journalctl.c

@@ -793,7 +793,7 @@ static int parse_argv(int argc, char *argv[], char ***remaining_args) {
                 OPTION_GROUP("Commands"): {}
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("journalctl");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/keyutil/keyutil.c

@@ -42,7 +42,7 @@ COMMAND(
         .man_pages = "systemd-keyutil.1\0",
 );
 
-VERB_COMMON_HELP_AUTO_HIDDEN("systemd-keyutil");
+VERB_COMMON_HELP_AUTO_HIDDEN();
 
 static int parse_argv(int argc, char *argv[], char ***ret_args) {
         assert(argc >= 0);
@@ -56,7 +56,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-keyutil");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/locale/localectl.c

@@ -426,7 +426,7 @@ static int verb_list_x11_keymaps(int argc, char *argv[], uintptr_t _data, void *
         return 0;
 }
 
-VERB_COMMON_HELP_AUTO_HIDDEN("localectl");
+VERB_COMMON_HELP_AUTO_HIDDEN();
 
 static int parse_argv(int argc, char *argv[], char ***remaining_args) {
         assert(argc >= 0);
@@ -440,7 +440,7 @@ static int parse_argv(int argc, char *argv[], char ***remaining_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("localectl");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/login/inhibit.c

@@ -190,7 +190,7 @@ static int parse_argv(int argc, char *argv[], char ***remaining_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-inhibit");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/login/loginctl.c

@@ -1499,7 +1499,7 @@ static int verb_terminate_seat(int argc, char *argv[], uintptr_t _data, void *us
         return 0;
 }
 
-VERB_COMMON_HELP_AUTO_HIDDEN("loginctl");
+VERB_COMMON_HELP_AUTO_HIDDEN();
 
 static int parse_argv(int argc, char *argv[], char ***remaining_args) {
         int r;
@@ -1514,7 +1514,7 @@ static int parse_argv(int argc, char *argv[], char ***remaining_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("loginctl");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/machine-id-setup/machine-id-setup-main.c

@@ -47,7 +47,7 @@ static int parse_argv(int argc, char *argv[]) {
                 OPTION_GROUP("Commands"): {}
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-machine-id-setup");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/machine/machinectl.c

@@ -2376,7 +2376,7 @@ static int chainload_importctl(char **args) {
         return log_error_errno(r, "Failed to invoke 'importctl': %m");
 }
 
-VERB_COMMON_HELP_AUTO_HIDDEN("machinectl");
+VERB_COMMON_HELP_AUTO_HIDDEN();
 
 static int parse_argv(int argc, char *argv[], char ***ret_args) {
         assert(argc >= 0);
@@ -2409,7 +2409,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
                         break;
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("machinectl");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/measure/measure-tool.c

@@ -72,7 +72,7 @@ COMMAND(
         .pager_flags = &arg_pager_flags,
 );
 
-VERB_COMMON_HELP_AUTO_HIDDEN("systemd-measure");
+VERB_COMMON_HELP_AUTO_HIDDEN();
 
 static char *normalize_phase(const char *s) {
         _cleanup_strv_free_ char **l = NULL;
@@ -101,7 +101,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-measure");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/modules-load/modules-load.c

@@ -350,7 +350,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-modules-load");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/mstack/mstack-tool.c

@@ -70,7 +70,7 @@ static int parse_argv(int argc, char *argv[]) {
                 OPTION_GROUP("Commands"): {}
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-mstack");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/mute-console/mute-console.c

@@ -44,7 +44,7 @@ static int parse_argv(int argc, char *argv[]) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-mute-console");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/network/generator/network-generator-main.c

@@ -169,7 +169,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-network-generator");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/network/networkctl.c

@@ -80,7 +80,7 @@ VERB_SCOPE(, verb_unmask,                     "unmask",             "FILES...",
 VERB_SCOPE(, verb_persistent_storage,         "persistent-storage", "BOOL",          2,        2,        0,
            "Notify systemd-networkd if persistent storage is ready");
 
-VERB_COMMON_HELP_AUTO_HIDDEN("networkctl");
+VERB_COMMON_HELP_AUTO_HIDDEN();
 
 static int parse_argv(int argc, char *argv[], char ***remaining_args) {
         int r;
@@ -95,7 +95,7 @@ static int parse_argv(int argc, char *argv[], char ***remaining_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("networkctl");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/network/wait-online/wait-online.c

@@ -92,7 +92,7 @@ static int parse_argv(int argc, char *argv[]) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-networkd-wait-online");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/notify/notify.c

@@ -146,7 +146,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-notify");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/nspawn/nspawn.c

@@ -559,7 +559,7 @@ static int parse_argv(int argc, char *argv[]) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-nspawn");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/oom/oomctl.c

@@ -21,7 +21,7 @@ COMMAND(
         .pager_flags = &arg_pager_flags,
 );
 
-VERB_COMMON_HELP_AUTO_HIDDEN("oomctl");
+VERB_COMMON_HELP_AUTO_HIDDEN();
 
 VERB_DEFAULT_NOARG(verb_dump_state, "dump", "Output the current state of systemd-oomd");
 static int verb_dump_state(int argc, char *argv[], uintptr_t _data, void *userdata) {
@@ -54,7 +54,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("oomctl");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/oom/oomd.c

@@ -37,7 +37,7 @@ static int parse_argv(int argc, char *argv[]) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-oomd");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/path/path-tool.c

@@ -192,7 +192,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-path");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/pcrextend/pcrextend.c

@@ -68,7 +68,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-pcrextend");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/pcrlock/pcrlock.c

@@ -5325,7 +5325,7 @@ static int verb_lock_raw(int argc, char *argv[], uintptr_t _data, void *userdata
 VERB_NOARG(verb_unlock_simple, "unlock-raw",
            "Remove .pcrlock file for raw data");
 
-VERB_COMMON_HELP_AUTO_HIDDEN("systemd-pcrlock");
+VERB_COMMON_HELP_AUTO_HIDDEN();
 
 static int parse_argv(int argc, char *argv[], char ***ret_args) {
         assert(argc >= 0);
@@ -5340,7 +5340,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-pcrlock");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/portable/portablectl.c

@@ -1537,7 +1537,7 @@ static int dump_profiles(void) {
         return 0;
 }
 
-VERB_COMMON_HELP_AUTO_HIDDEN("portablectl");
+VERB_COMMON_HELP_AUTO_HIDDEN();
 
 static int parse_argv(int argc, char *argv[], char ***remaining_args) {
         assert(argc >= 0);
@@ -1551,7 +1551,7 @@ static int parse_argv(int argc, char *argv[], char ***remaining_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("portablectl");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/ptyfwd/ptyfwd-tool.c

@@ -46,7 +46,7 @@ static int parse_argv(int argc, char *argv[], char ***remaining_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-pty-forward");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/random-seed/random-seed-tool.c

@@ -322,7 +322,7 @@ static int parse_argv(int argc, char *argv[]) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-random-seed");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/repart/repart.c

@@ -10189,7 +10189,7 @@ static int parse_argv(int argc, char *argv[]) {
                 OPTION_GROUP("Options"): {}
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-repart");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/report/report-basic-server.c

@@ -53,7 +53,7 @@ static int parse_argv(int argc, char *argv[]) {
         FOREACH_OPTION_OR_RETURN(c, &opts)
                 switch (c) {
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-report-basic");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/report/report-cgroup-server.c

@@ -54,7 +54,7 @@ static int parse_argv(int argc, char *argv[]) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-report-cgroup");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/report/report-files-server.c

@@ -54,7 +54,7 @@ static int parse_argv(int argc, char *argv[]) {
         FOREACH_OPTION_OR_RETURN(c, &opts)
                 switch (c) {
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-report-files");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/report/report-sign-plain.c

@@ -354,7 +354,7 @@ static int parse_argv(int argc, char *argv[]) {
         FOREACH_OPTION_OR_RETURN(c, &opts)
                 switch (c) {
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-report-sign-plain");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/report/report-sign-tsm.c

@@ -117,7 +117,7 @@ static int parse_argv(int argc, char *argv[]) {
         FOREACH_OPTION_OR_RETURN(c, &opts)
                 switch (c) {
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-report-sign-tsm");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/report/report.c

@@ -924,7 +924,7 @@ static int vl_server(void) {
         return 0;
 }
 
-VERB_COMMON_HELP_AUTO_HIDDEN("systemd-report");
+VERB_COMMON_HELP_AUTO_HIDDEN();
 
 static int parse_argv(int argc, char *argv[], char ***ret_args) {
         int r;
@@ -937,7 +937,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
         FOREACH_OPTION_OR_RETURN(c, &opts)
                 switch (c) {
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-report");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/resolve/resolvconf-compat.c

@@ -181,7 +181,7 @@ int resolvconf_parse_argv(int argc, char *argv[]) {
                 OPTION_NAMESPACE("resolvconf"): {}
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("resolvconf");
+                        return command_print_help_full("resolvconf");
 
                 OPTION_COMMON_VERSION:
                         return version();

src/resolve/resolvectl.c

@@ -3229,7 +3229,7 @@ static void help_dns_classes(void) {
         DUMP_STRING_TABLE(dns_class, int, _DNS_CLASS_MAX);
 }
 
-VERB_COMMON_HELP_AUTO_HIDDEN("resolvectl");
+VERB_COMMON_HELP_AUTO_PROGRAM_HIDDEN("resolvectl");
 
 COMMAND(
         "systemd-resolve\0",
@@ -3498,7 +3498,7 @@ static int native_parse_argv(int argc, char *argv[], char ***remaining_args) {
                 OPTION_NAMESPACE("resolvectl"): {}
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("resolvectl");
+                        return command_print_help_full("resolvectl");
 
                 OPTION_COMMON_VERSION:
                         return version();

src/run/run.c

@@ -208,7 +208,7 @@ static int parse_argv(int argc, char *argv[]) {
                 OPTION_NAMESPACE("systemd-run"): {}
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-run");
+                        return command_print_help_full("systemd-run");
 
                 OPTION_COMMON_VERSION:
                         return version();
@@ -784,7 +784,7 @@ static int parse_argv_sudo_mode(int argc, char *argv[]) {
                 OPTION_NAMESPACE("run0"): {}
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("run0");
+                        return command_print_help_full("run0");
 
                 OPTION('V', "version", NULL, "Show package version"):
                         return version();

src/sbsign/sbsign.c

@@ -52,7 +52,7 @@ COMMAND(
         .man_pages = "systemd-sbsign.1\0",
 );
 
-VERB_COMMON_HELP_AUTO_HIDDEN("systemd-sbsign");
+VERB_COMMON_HELP_AUTO_HIDDEN();
 
 static int parse_argv(int argc, char *argv[], char ***ret_args) {
         assert(argc >= 0);
@@ -66,7 +66,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-sbsign");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/shared/verbs.c

@@ -229,14 +229,13 @@ static const Verb* verbs_get_command(const Verb verbs[], const Verb verbs_end[],
         assert(verbs_end > verbs);
         assert((uintptr_t) verbs % sizeof(void*) == 0);
         assert(FLAGS_SET(verbs[0].flags, VERB_COMMAND_MARKER) || verbs[0].verb);
-        assert(name);
 
         for (const Verb *verb = verbs; verb < verbs_end; verb++) {
                 if (!FLAGS_SET(verb->flags, VERB_COMMAND_MARKER))
                         continue;
 
                 const CommandDescription *cmd = (const CommandDescription*) ASSERT_PTR(verb->data);
-                if (nulstr_contains(cmd->names, name))
+                if (!name || nulstr_contains(cmd->names, name))
                         return verb;
         }
 
@@ -469,7 +468,7 @@ static int print_wrapped(const char *text, bool abstract) {
         return 0;
 }
 
-int _command_print_help(
+int _command_print_help_full(
                 const Verb verbs[],
                 const Verb verbs_end[],
                 const Option options[],

src/shared/verbs.h

@@ -131,26 +131,28 @@ int _verbs_get_help_table(
         VERB(verb_help, "help", NULL, VERB_ANY, VERB_ANY, 0, NULL);     \
         _VERB_COMMON_HELP_IMPL(impl)
 
-#define VERB_COMMON_HELP_AUTO(program)                                  \
-        VERB_FULL(verb_help_auto, "help", NULL, VERB_ANY, VERB_ANY, 0, (uintptr_t) program, "Show this help")
+#define VERB_COMMON_HELP_AUTO_FULL(program, help)                       \
+        VERB_FULL(verb_help_auto, "help", NULL, VERB_ANY, VERB_ANY, 0, /* dat= */ (uintptr_t) program, /* help= */ help)
+#define VERB_COMMON_HELP_AUTO_PROGRAM(program) VERB_COMMON_HELP_AUTO_FULL(program, "Show this help")
+#define VERB_COMMON_HELP_AUTO_PROGRAM_HIDDEN(program) VERB_COMMON_HELP_AUTO_FULL(program, /* help= */ NULL)
+#define VERB_COMMON_HELP_AUTO() VERB_COMMON_HELP_AUTO_PROGRAM(/* program= */ NULL)
+#define VERB_COMMON_HELP_AUTO_HIDDEN() VERB_COMMON_HELP_AUTO_PROGRAM_HIDDEN(/* program= */ NULL)
 
-#define VERB_COMMON_HELP_AUTO_HIDDEN(program)                           \
-        VERB_FULL(verb_help_auto, "help", NULL, VERB_ANY, VERB_ANY, 0, (uintptr_t) program, NULL)
-
-int _command_print_help(
+int _command_print_help_full(
                 const Verb verbs[],
                 const Verb verbs_end[],
                 const Option options[],
                 const Option options_end[],
                 const char *name);
-#define command_print_help(name)                                        \
-        _command_print_help(                                            \
+#define command_print_help_full(name)                                   \
+        _command_print_help_full(                                       \
                 __start_SYSTEMD_VERBS, __stop_SYSTEMD_VERBS,            \
                 __start_SYSTEMD_OPTIONS, __stop_SYSTEMD_OPTIONS,        \
                 name)
+#define command_print_help() command_print_help_full(/* name= */ NULL)
 
 static inline int verb_help_auto(int argc, char **argv, uintptr_t data, void *userdata) {
-        return command_print_help((const char*) ASSERT_PTR(data));
+        return command_print_help_full((const char*) data);
 }
 
 /* Print a machine-readable description of the program's commands, verbs, and options in the format

src/sleep/sleep.c

@@ -699,7 +699,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-sleep");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/socket-activate/socket-activate.c

@@ -339,7 +339,7 @@ static int parse_argv(int argc, char *argv[], char ***remaining_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-socket-activate");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/socket-proxy/socket-proxyd.c

@@ -506,7 +506,7 @@ static int parse_argv(int argc, char *argv[]) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-socket-proxyd");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/ssh-generator/ssh-issue.c

@@ -130,7 +130,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-ssh-issue");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/stdio-bridge/stdio-bridge.c

@@ -40,7 +40,7 @@ static int parse_argv(int argc, char *argv[]) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-stdio-bridge");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/storage/storage-block.c

@@ -395,7 +395,7 @@ static int parse_argv(int argc, char *argv[]) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-storage-block");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/storage/storage-fs.c

@@ -755,7 +755,7 @@ static int parse_argv(int argc, char *argv[]) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-storage-fs");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/storage/storagectl.c

@@ -53,7 +53,7 @@ COMMAND(
         .pager_flags = &arg_pager_flags,
 );
 
-VERB_COMMON_HELP_AUTO_HIDDEN("storagectl");
+VERB_COMMON_HELP_AUTO_HIDDEN();
 
 static const char *ro_color(int ro) {
         if (ro > 0)
@@ -391,7 +391,7 @@ static int parse_argv(int argc, char *argv[], char ***remaining_args) {
                 OPTION_NAMESPACE("storagectl"): {}
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("storagectl");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/storagetm/storagetm.c

@@ -67,7 +67,7 @@ static int parse_argv(int argc, char *argv[]) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-storagetm");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/sysctl/sysctl.c

@@ -338,7 +338,7 @@ static int parse_argv(int argc, char *argv[], char ***remaining_args) {
                 OPTION_GROUP("Commands"): {}
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-sysctl");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/sysinstall/sysinstall.c

@@ -174,7 +174,7 @@ static int parse_argv(int argc, char *argv[]) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-sysinstall");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/sysupdate/sysupdate.c

@@ -3306,7 +3306,7 @@ static int verb_enable_component(int argc, char *argv[], uintptr_t _data, void *
         return 0;
 }
 
-VERB_COMMON_HELP_AUTO_HIDDEN("systemd-sysupdate");
+VERB_COMMON_HELP_AUTO_HIDDEN();
 
 static int parse_argv(int argc, char *argv[], char ***remaining_args) {
         assert(argc >= 0);
@@ -3320,7 +3320,7 @@ static int parse_argv(int argc, char *argv[], char ***remaining_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-sysupdate");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/sysupdate/updatectl.c

@@ -1641,7 +1641,7 @@ static int verb_enable(int argc, char *argv[], uintptr_t _data, void *userdata)
         return 0;
 }
 
-VERB_COMMON_HELP_AUTO_HIDDEN("updatectl");
+VERB_COMMON_HELP_AUTO_HIDDEN();
 
 static int parse_argv(int argc, char *argv[], char ***ret_args) {
         assert(argc >= 0);
@@ -1653,7 +1653,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("updatectl");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/sysusers/sysusers.c

@@ -2124,7 +2124,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
                         break;
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-sysusers");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/timedate/timedatectl.c

@@ -899,7 +899,7 @@ static int verb_revert(int argc, char *argv[], uintptr_t _data, void *userdata)
         return 0;
 }
 
-VERB_COMMON_HELP_AUTO_HIDDEN("timedatectl");
+VERB_COMMON_HELP_AUTO_HIDDEN();
 
 static int parse_argv(int argc, char *argv[], char ***ret_args) {
         int r;
@@ -912,7 +912,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
         FOREACH_OPTION_OR_RETURN(c, &opts)
                 switch (c) {
                 OPTION_COMMON_HELP:
-                        return command_print_help("timedatectl");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/tmpfiles/tmpfiles.c

@@ -4963,7 +4963,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
                         break;
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-tmpfiles");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/tpm2-setup/tpm2-clear.c

@@ -31,7 +31,7 @@ static int parse_argv(int argc, char *argv[]) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-tpm2-clear");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/tpm2-setup/tpm2-setup.c

@@ -64,7 +64,7 @@ static int parse_argv(int argc, char *argv[]) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-tpm2-setup");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/tty-ask-password-agent/tty-ask-password-agent.c

@@ -459,7 +459,7 @@ static int parse_argv(int argc, char *argv[]) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-tty-ask-password-agent");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/udev/ata_id/ata_id.c

@@ -375,7 +375,7 @@ static int parse_argv(int argc, char *argv[]) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("ata_id");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/udev/cdrom_id/cdrom_id.c

@@ -916,7 +916,7 @@ static int parse_argv(int argc, char *argv[]) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("cdrom_id");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/udev/dmi_memory_id/dmi_memory_id.c

@@ -659,7 +659,7 @@ static int parse_argv(int argc, char *argv[]) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("dmi_memory_id");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION_WITH_HIDDEN_V:
                         return version();