shared/verbs: add VERB_DEFAULT_NOARG

diff --git a/src/bless-boot/bless-boot.c b/src/bless-boot/bless-boot.c
index e0afb3611c278fcb21a0bd1dcdbcb9cfeea60499..3680dfdc1883e793e3cc4726b934248e5cfaba82 100644 (file)
--- a/src/bless-boot/bless-boot.c
+++ b/src/bless-boot/bless-boot.c
@@ -339,7 +339,7 @@ static int make_bad(const char *prefix, uint64_t done, const char *suffix, char
         return 0;
 }
 
-VERB(verb_status, "status", NULL, VERB_ANY, 1, VERB_DEFAULT, "Show status of current boot loader entry");
+VERB_DEFAULT_NOARG(verb_status, "status", "Show status of current boot loader entry");
 static int verb_status(int argc, char *argv[], uintptr_t _data, void *userdata) {
         _cleanup_free_ char *path = NULL, *prefix = NULL, *suffix = NULL, *good = NULL, *bad = NULL;
         uint64_t left, done;

diff --git a/src/busctl/busctl.c b/src/busctl/busctl.c
index 79ee1c55e8ecd28b99179731c4c48e022ff573f9..9bf990d3dbfdd3af7f5478b241e4f0a0b7526752 100644 (file)
--- a/src/busctl/busctl.c
+++ b/src/busctl/busctl.c
@@ -176,8 +176,7 @@ static void notify_bus_error(const sd_bus_error *error) {
         (void) sd_notifyf(/* unset_environment= */ false, "BUSERROR=%s", error->name);
 }
 
-VERB(verb_list, "list", NULL, VERB_ANY, 1, VERB_DEFAULT,
-     "List bus names");
+VERB_DEFAULT_NOARG(verb_list, "list", "List bus names");
 static int verb_list(int argc, char *argv[], uintptr_t _data, void *userdata) {
         _cleanup_strv_free_ char **acquired = NULL, **activatable = NULL;
         _cleanup_(sd_bus_flush_close_unrefp) sd_bus *bus = NULL;

diff --git a/src/creds/creds.c b/src/creds/creds.c
index 95af91c120db71b4618d3f1f481e7f7b8cc77cfd..a4087fc2be6506fb890fcfff4ca60792145694a3 100644 (file)
--- a/src/creds/creds.c
+++ b/src/creds/creds.c
@@ -305,8 +305,7 @@ static int add_credentials_to_table(Table *t, bool encrypted) {
         return 1; /* Creds dir set */
 }
 
-VERB(verb_list, "list", NULL, VERB_ANY, 1, VERB_DEFAULT,
-     "Show list of passed credentials");
+VERB_DEFAULT_NOARG(verb_list, "list", "Show list of passed credentials");
 static int verb_list(int argc, char *argv[], uintptr_t _data, void *userdata) {
         _cleanup_(table_unrefp) Table *t = NULL;
         int r, q;

diff --git a/src/factory-reset/factory-reset-tool.c b/src/factory-reset/factory-reset-tool.c
index e26e948e9341629399a08986dc66defde8574c5e..c21e84c2ef7afa15751e662fe0c21ce078c3fb8e 100644 (file)
--- a/src/factory-reset/factory-reset-tool.c
+++ b/src/factory-reset/factory-reset-tool.c
@@ -99,7 +99,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
         return 1;
 }
 
-VERB(verb_status, "status", NULL, VERB_ANY, 1, VERB_DEFAULT, "Report current factory reset status");
+VERB_DEFAULT_NOARG(verb_status, "status", "Report current factory reset status");
 static int verb_status(int argc, char *argv[], uintptr_t _data, void *userdata) {
         static const int exit_status_table[_FACTORY_RESET_MODE_MAX] = {
                 /* Report current mode also as via exit status, but only return a subset of states */

diff --git a/src/hostname/hostnamectl.c b/src/hostname/hostnamectl.c
index 257b31fb88dda18cdec7c589f17ed7268d8da9ad..ab21fcca1f070a7463bf973047853d5b981eb6d4 100644 (file)
--- a/src/hostname/hostnamectl.c
+++ b/src/hostname/hostnamectl.c
@@ -545,7 +545,7 @@ static int get_hostname_based_on_flag(sd_bus *bus) {
         return get_one_name(bus, attr, NULL);
 }
 
-VERB(verb_show_status, "status", NULL, VERB_ANY, 1, VERB_DEFAULT, "Show current hostname settings");
+VERB_DEFAULT_NOARG(verb_show_status, "status", "Show current hostname settings");
 static int verb_show_status(int argc, char *argv[], uintptr_t _data, void *userdata) {
         sd_bus *bus = userdata;
         int r;

diff --git a/src/import/importctl.c b/src/import/importctl.c
index d4a6483f36d7cd44d500fd3f4f9dbd275cec582c..0140d0f67de48063ba5979f2daa906186bc59cc6 100644 (file)
--- a/src/import/importctl.c
+++ b/src/import/importctl.c
@@ -833,7 +833,7 @@ static int verb_export_raw(int argc, char *argv[], uintptr_t _data, void *userda
         return transfer_image_common(bus, m);
 }
 
-VERB(verb_list_transfers, "list-transfers", NULL, VERB_ANY, 1, VERB_DEFAULT, "Show list of transfers in progress");
+VERB_DEFAULT_NOARG(verb_list_transfers, "list-transfers", "Show list of transfers in progress");
 static int verb_list_transfers(int argc, char *argv[], uintptr_t _data, void *userdata) {
         _cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
         _cleanup_(sd_bus_message_unrefp) sd_bus_message *reply = NULL;

diff --git a/src/locale/localectl.c b/src/locale/localectl.c
index e20d5da9a0fc1b636839d687ed8b31b38d15f27f..f1f9ffbce0c054e828421a6867d9281d31dc372e 100644 (file)
--- a/src/locale/localectl.c
+++ b/src/locale/localectl.c
@@ -147,8 +147,7 @@ static int print_status_info(StatusInfo *i) {
         return table_print_or_warn(table);
 }
 
-VERB(verb_show_status, "status", NULL, VERB_ANY, 1, VERB_DEFAULT,
-     "Show current locale settings");
+VERB_DEFAULT_NOARG(verb_show_status, "status", "Show current locale settings");
 static int verb_show_status(int argc, char *argv[], uintptr_t _data, void *userdata) {
         _cleanup_(status_info_clear) StatusInfo info = {};
         static const struct bus_properties_map map[]  = {

diff --git a/src/login/loginctl.c b/src/login/loginctl.c
index 5647621ba54601534b4b890962e6cc89281a5ae6..39c048e70891c85fcf037617b9a28606278a97ee 100644 (file)
--- a/src/login/loginctl.c
+++ b/src/login/loginctl.c
@@ -269,8 +269,7 @@ static int list_sessions_table_add_fallback(Table *table, sd_bus_message *reply,
 
 VERB_GROUP("Session Commands");
 
-VERB(verb_list_sessions, "list-sessions", NULL, VERB_ANY, 1, VERB_DEFAULT,
-     "List sessions");
+VERB_DEFAULT_NOARG(verb_list_sessions, "list-sessions", "List sessions");
 static int verb_list_sessions(int argc, char *argv[], uintptr_t _data, void *userdata) {
         sd_bus *bus = ASSERT_PTR(userdata);
         _cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;

diff --git a/src/measure/measure-tool.c b/src/measure/measure-tool.c
index d5bb5bea2351cf2eb10e414ec7d16404f735b3aa..b8acd6d4b0922a00b46724998f60261a0e60ca53 100644 (file)
--- a/src/measure/measure-tool.c
+++ b/src/measure/measure-tool.c
@@ -416,8 +416,7 @@ static int validate_stub(void) {
         return 0;
 }
 
-VERB(verb_status, "status", NULL, VERB_ANY, 1, VERB_DEFAULT,
-     "Show current PCR values");
+VERB_DEFAULT_NOARG(verb_status, "status", "Show current PCR values");
 static int verb_status(int argc, char *argv[], uintptr_t _data, void *userdata) {
         _cleanup_(sd_json_variant_unrefp) sd_json_variant *v = NULL;
         int r;

diff --git a/src/oom/oomctl.c b/src/oom/oomctl.c
index 82ffe0e8379fdf972c60ddd14a366cfb74861e21..f6d451612b725eca0cb00e068fad94f7594b1dab 100644 (file)
--- a/src/oom/oomctl.c
+++ b/src/oom/oomctl.c
@@ -65,8 +65,7 @@ static int help(void) {
 
 VERB_COMMON_HELP_HIDDEN(help);
 
-VERB(verb_dump_state, "dump", NULL, VERB_ANY, 1, VERB_DEFAULT,
-     "Output the current state of systemd-oomd");
+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) {
         _cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
         _cleanup_(sd_bus_message_unrefp) sd_bus_message *reply = NULL;

diff --git a/src/pcrlock/pcrlock.c b/src/pcrlock/pcrlock.c
index 4ebe3f995bdd892010fc4a32a8979d428fe51071..8315384b4d10eb6a55b5041c22b28d57e26c0695 100644 (file)
--- a/src/pcrlock/pcrlock.c
+++ b/src/pcrlock/pcrlock.c
@@ -2500,7 +2500,7 @@ static int event_log_load_and_process(EventLog **ret) {
         return 0;
 }
 
-VERB(verb_show_log, "log", NULL, VERB_ANY, 1, VERB_DEFAULT,
+VERB_DEFAULT_NOARG(verb_show_log, "log",
      "Show measurement log");
 static int verb_show_log(int argc, char *argv[], uintptr_t _data, void *userdata) {
         _cleanup_(sd_json_variant_unrefp) sd_json_variant *log_table = NULL, *pcr_table = NULL;

diff --git a/src/portable/portablectl.c b/src/portable/portablectl.c
index c70d50634676a2a7cb0ad3a0383c2f8fda40329d..763acfc258656df26b8828b2794d953b82a4c7bb 100644 (file)
--- a/src/portable/portablectl.c
+++ b/src/portable/portablectl.c
@@ -253,7 +253,7 @@ static int maybe_reload(sd_bus **bus) {
         return bus_service_manager_reload(*bus);
 }
 
-VERB(verb_list_images, "list", NULL, VERB_ANY, 1, VERB_DEFAULT,
+VERB_DEFAULT_NOARG(verb_list_images, "list",
      "List available portable service images (default)");
 static int verb_list_images(int argc, char *argv[], uintptr_t _data, void *userdata) {
         _cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;

diff --git a/src/shared/verbs.h b/src/shared/verbs.h
index 4fb0486f7567d8475dc538f82f9131b013ff8639..e071cc5d89aa93df39e503c012a178461622f845 100644 (file)
--- a/src/shared/verbs.h
+++ b/src/shared/verbs.h
@@ -60,6 +60,8 @@ typedef struct {
         VERB_SCOPE(scope, d, v, /* a= */ NULL, /* amin= */ VERB_ANY, /* amax= */ 1, /* f= */ 0, h)
 #define VERB_NOARG(d, v, h)                                             \
         VERB_SCOPE_NOARG(static, d, v, h)
+#define VERB_DEFAULT_NOARG(d, v, h)                                     \
+        VERB_SCOPE(static, d, v, /* a= */ NULL, /* amin= */ VERB_ANY, /* amax= */ 1, /* f= */ VERB_DEFAULT, h)
 
 /* Magic entry in the table (which will not be returned) that designates the start of the group <gr>.
  * The macro works as a separator between groups and must be between other VERB* stanzas. */

diff --git a/src/sysext/sysext.c b/src/sysext/sysext.c
index 40d39b7654d2c42993e38a0f00757a3301016231..ff00196cc654d669d15ef5e23fb23073f0b68fe3 100644 (file)
--- a/src/sysext/sysext.c
+++ b/src/sysext/sysext.c
@@ -2305,7 +2305,7 @@ static int merge(ImageClass image_class,
         return 1;
 }
 
-VERB(verb_status, "status", NULL, VERB_ANY, 1, VERB_DEFAULT, "Show current merge status (default)");
+VERB_DEFAULT_NOARG(verb_status, "status", "Show current merge status (default)");
 static int verb_status(int argc, char *argv[], uintptr_t _data, void *userdata) {
         _cleanup_(table_unrefp) Table *t = NULL;
         int r, ret = 0;

diff --git a/src/timedate/timedatectl.c b/src/timedate/timedatectl.c
index c35b090035eac3841d07c885ddbb9354a4474994..7607b1ac4b1fe3b0e1c6a18229327b3bbc19cb20 100644 (file)
--- a/src/timedate/timedatectl.c
+++ b/src/timedate/timedatectl.c
@@ -180,7 +180,7 @@ static int print_status_info(const StatusInfo *i) {
         return 0;
 }
 
-VERB(verb_status, "status", NULL, VERB_ANY, 1, VERB_DEFAULT, "Show current time settings");
+VERB_DEFAULT_NOARG(verb_status, "status", "Show current time settings");
 static int verb_status(int argc, char *argv[], uintptr_t _data, void *userdata) {
         StatusInfo info = {};
         static const struct bus_properties_map map[]  = {