diff --git a/src/kernel-install/kernel-install.c b/src/kernel-install/kernel-install.c index d35ff931b2..943640bd41 100644 --- a/src/kernel-install/kernel-install.c +++ b/src/kernel-install/kernel-install.c @@ -1624,7 +1624,7 @@ static int parse_argv(int argc, char *argv[], char ***remaining_args) { switch (c) { OPTION_COMMON_HELP: - return command_print_help_full("kernel-install", /* footer_ansi_seq= */ NULL); + return command_print_help_name("kernel-install"); OPTION_COMMON_VERSION: return version(); diff --git a/src/mount/mount-tool.c b/src/mount/mount-tool.c index 5ecd7c097a..5d989188c8 100644 --- a/src/mount/mount-tool.c +++ b/src/mount/mount-tool.c @@ -163,7 +163,7 @@ static int parse_argv(int argc, char *argv[], char ***remaining_args) { OPTION_GROUP("Common options"): {} OPTION_COMMON_HELP: - return command_print_help_full(cmd->names, /* footer_ansi_seq= */ NULL); + return command_print_help_name(cmd->names); OPTION_COMMON_VERSION: return version(); diff --git a/src/resolve/resolvconf-compat.c b/src/resolve/resolvconf-compat.c index 8a07124573..018908bcc0 100644 --- a/src/resolve/resolvconf-compat.c +++ b/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_full("resolvconf", /* footer_ansi_seq= */ NULL); + return command_print_help_name("resolvconf"); OPTION_COMMON_VERSION: return version(); diff --git a/src/resolve/resolvectl.c b/src/resolve/resolvectl.c index f2d5946ae6..c4f2c5a2d5 100644 --- a/src/resolve/resolvectl.c +++ b/src/resolve/resolvectl.c @@ -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_full("resolvectl", /* footer_ansi_seq= */ NULL); + return command_print_help_name("resolvectl"); OPTION_COMMON_VERSION: return version(); diff --git a/src/run/run.c b/src/run/run.c index 6aa58f8b5c..cdf15fb41f 100644 --- a/src/run/run.c +++ b/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_full("systemd-run", /* footer_ansi_seq= */ NULL); + return command_print_help_name("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_full("run0", /* footer_ansi_seq= */ NULL); + return command_print_help_name("run0"); OPTION('V', "version", NULL, "Show package version"): return version(); diff --git a/src/shared/verbs.h b/src/shared/verbs.h index 673ef5870b..72b6d70f4f 100644 --- a/src/shared/verbs.h +++ b/src/shared/verbs.h @@ -162,10 +162,11 @@ int _command_print_help_full( __start_SYSTEMD_VERBS, __stop_SYSTEMD_VERBS, \ __start_SYSTEMD_OPTIONS, __stop_SYSTEMD_OPTIONS, \ name, footer_ansi_seq) -#define command_print_help() command_print_help_full(/* name= */ NULL, /* footer_ansi_seq= */ NULL) +#define command_print_help_name(name) command_print_help_full(name, /* footer_ansi_seq= */ NULL) +#define command_print_help() command_print_help_name(/* name= */ NULL) static inline int verb_help_auto(int argc, char **argv, uintptr_t data, void *userdata) { - return command_print_help_full((const char*) data, /* footer_ansi_seq= */ NULL); + return command_print_help_name((const char*) data); } /* Print a machine-readable description of the program's commands, verbs, and options in the format diff --git a/src/sysext/sysext.c b/src/sysext/sysext.c index b0e668a38a..7722c458cb 100644 --- a/src/sysext/sysext.c +++ b/src/sysext/sysext.c @@ -3138,9 +3138,8 @@ static int vl_method_list(sd_varlink *link, sd_json_variant *parameters, sd_varl VERB_FULL(verb_help, "help", NULL, VERB_ANY, VERB_ANY, 0, /* dat= */ 0u, /* help= */ NULL); static int verb_help(int argc, char **argv, uintptr_t data, void *userdata) { - return command_print_help_full( - arg_image_class == IMAGE_SYSEXT ? "systemd-sysext" : "systemd-confext", - /* footer_ansi_seq= */ NULL); + return command_print_help_name( + arg_image_class == IMAGE_SYSEXT ? "systemd-sysext" : "systemd-confext"); } static int parse_argv(int argc, char *argv[], char ***ret_args) { @@ -3156,9 +3155,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) { switch (c) { OPTION_COMMON_HELP: - return command_print_help_full( - arg_image_class == IMAGE_SYSEXT ? "systemd-sysext" : "systemd-confext", - /* footer_ansi_seq= */ NULL); + return verb_help(argc, argv, /* data= */ 0u, /* userdata= */ NULL); OPTION_COMMON_VERSION: return version(); diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c index 6a36afc6d3..63fdfbc064 100644 --- a/src/systemctl/systemctl.c +++ b/src/systemctl/systemctl.c @@ -351,7 +351,7 @@ static int systemctl_parse_argv(int argc, char *argv[], int log_level_shift, cha OPTION_NAMESPACE("systemctl"): {} OPTION_COMMON_HELP: - return command_print_help_full("systemctl", /* footer_ansi_seq= */ NULL); + return command_print_help_name("systemctl"); OPTION_COMMON_VERSION: return version();