shared/verbs: add helper to call command_print_help_full with name only
I didn't do this previously because I thought that there wouldn't be too many callers. But it turns out that there're quite a few.
This commit is contained in:
@@ -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();
|
||||
|
||||
@@ -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();
|
||||
|
||||
@@ -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();
|
||||
|
||||
@@ -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();
|
||||
|
||||
+2
-2
@@ -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();
|
||||
|
||||
+3
-2
@@ -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
|
||||
|
||||
+3
-6
@@ -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();
|
||||
|
||||
@@ -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();
|
||||
|
||||
Reference in New Issue
Block a user