tree-wide: get rid of old dispatch_verb

Also rename dispatch_verb_with_args to dispatch_verb.

diff --git a/src/analyze/analyze.c b/src/analyze/analyze.c
index 759c5600ad27662a1a371fe5e7cfe6422b492493..67a91357675034a94ad18375094357e37ae3de6a 100644 (file)
--- a/src/analyze/analyze.c
+++ b/src/analyze/analyze.c
@@ -716,7 +716,7 @@ static int run(int argc, char *argv[]) {
                         return log_oom();
         }
 
-        return dispatch_verb_with_args(args, NULL);
+        return dispatch_verb(args, NULL);
 }
 
 DEFINE_MAIN_FUNCTION_WITH_POSITIVE_FAILURE(run);

diff --git a/src/backlight/backlight.c b/src/backlight/backlight.c
index 3c2a601403fd98090ce1568b9409bb11f40fd873..7e296c9ffcb28b17a8785f4cbe57aaabde7e4032 100644 (file)
--- a/src/backlight/backlight.c
+++ b/src/backlight/backlight.c
@@ -656,7 +656,7 @@ static int run(int argc, char *argv[]) {
 
         umask(0022);
 
-        return dispatch_verb_with_args(strv_skip(argv, 1), /* userdata= */ NULL);
+        return dispatch_verb(strv_skip(argv, 1), /* userdata= */ NULL);
 }
 
 DEFINE_MAIN_FUNCTION(run);

diff --git a/src/bless-boot/bless-boot.c b/src/bless-boot/bless-boot.c
index 3680dfdc1883e793e3cc4726b934248e5cfaba82..43fb72cddb72b559661f3702edf3836f284cffcf 100644 (file)
--- a/src/bless-boot/bless-boot.c
+++ b/src/bless-boot/bless-boot.c
@@ -580,7 +580,7 @@ static int run(int argc, char *argv[]) {
                 return log_error_errno(SYNTHETIC_ERRNO(EOPNOTSUPP),
                                        "Marking a boot is only supported on EFI systems.");
 
-        return dispatch_verb_with_args(args, NULL);
+        return dispatch_verb(args, NULL);
 }
 
 DEFINE_MAIN_FUNCTION(run);

diff --git a/src/bootctl/bootctl.c b/src/bootctl/bootctl.c
index 4bb9742a4703d257a6cae2dfe92e36921ea42870..b5cca6d222c22fc5a1080ffb5c2a9de38157e11d 100644 (file)
--- a/src/bootctl/bootctl.c
+++ b/src/bootctl/bootctl.c
@@ -917,7 +917,7 @@ static int run(int argc, char *argv[]) {
                         return log_oom();
         }
 
-        return dispatch_verb_with_args(args, NULL);
+        return dispatch_verb(args, NULL);
 }
 
 DEFINE_MAIN_FUNCTION_WITH_POSITIVE_FAILURE(run);

diff --git a/src/busctl/busctl.c b/src/busctl/busctl.c
index 9bf990d3dbfdd3af7f5478b241e4f0a0b7526752..edba5748e86e241cd33549ba9ee031f2d38cb6e5 100644 (file)
--- a/src/busctl/busctl.c
+++ b/src/busctl/busctl.c
@@ -2324,7 +2324,7 @@ static int run(int argc, char *argv[]) {
         if (r <= 0)
                 return r;
 
-        return dispatch_verb_with_args(args, NULL);
+        return dispatch_verb(args, NULL);
 }
 
 DEFINE_MAIN_FUNCTION(run);

diff --git a/src/coredump/coredumpctl.c b/src/coredump/coredumpctl.c
index 7bb1fd175213c9b461a17372f47f541c91449695..3b31471ab4dc79b678298c429342996d2c1c51e8 100644 (file)
--- a/src/coredump/coredumpctl.c
+++ b/src/coredump/coredumpctl.c
@@ -1501,7 +1501,7 @@ static int run(int argc, char *argv[]) {
                         return log_oom();
         }
 
-        r = dispatch_verb_with_args(args, NULL);
+        r = dispatch_verb(args, NULL);
 
         if (units_active > 0)
                 printf("%s-- Notice: %d systemd-coredump@.service %s, output may be incomplete.%s\n",

diff --git a/src/creds/creds.c b/src/creds/creds.c
index a4087fc2be6506fb890fcfff4ca60792145694a3..77f7442ab57aae970cff7c645501b9c50e6f6dee 100644 (file)
--- a/src/creds/creds.c
+++ b/src/creds/creds.c
@@ -1478,7 +1478,7 @@ static int run(int argc, char *argv[]) {
         if (arg_varlink)
                 return vl_server();
 
-        return dispatch_verb_with_args(args, NULL);
+        return dispatch_verb(args, NULL);
 }
 
 DEFINE_MAIN_FUNCTION_WITH_POSITIVE_FAILURE(run);

diff --git a/src/cryptsetup/cryptsetup.c b/src/cryptsetup/cryptsetup.c
index fffecd35738cbc4df9b19172692305630a3c0811..b6ee120e5ec565fd5e551b50633da92ddaa8da87 100644 (file)
--- a/src/cryptsetup/cryptsetup.c
+++ b/src/cryptsetup/cryptsetup.c
@@ -2883,7 +2883,7 @@ static int run(int argc, char *argv[]) {
         if (r < 0)
                 return r;
 
-        return dispatch_verb_with_args(args, NULL);
+        return dispatch_verb(args, NULL);
 }
 
 DEFINE_MAIN_FUNCTION(run);

diff --git a/src/factory-reset/factory-reset-tool.c b/src/factory-reset/factory-reset-tool.c
index c21e84c2ef7afa15751e662fe0c21ce078c3fb8e..d3019396c3c1fac4409d0d157e3fda3e59ff21fc 100644 (file)
--- a/src/factory-reset/factory-reset-tool.c
+++ b/src/factory-reset/factory-reset-tool.c
@@ -365,7 +365,7 @@ static int run(int argc, char *argv[]) {
         if (arg_varlink)
                 return varlink_service();
 
-        return dispatch_verb_with_args(args, /* userdata= */ NULL);
+        return dispatch_verb(args, /* userdata= */ NULL);
 }
 
 DEFINE_MAIN_FUNCTION_WITH_POSITIVE_FAILURE(run);

diff --git a/src/home/homectl.c b/src/home/homectl.c
index 75339d93c8302db0cd8e5ec8dda50c4f14b31e56..ab81efbed6dd193a0860146eb70e534d3a423f5c 100644 (file)
--- a/src/home/homectl.c
+++ b/src/home/homectl.c
@@ -5165,7 +5165,7 @@ static int run(int argc, char *argv[]) {
         if (r <= 0)
                 return r;
 
-        return dispatch_verb_with_args(args, /* userdata= */ NULL);
+        return dispatch_verb(args, /* userdata= */ NULL);
 }
 
 DEFINE_MAIN_FUNCTION_WITH_POSITIVE_FAILURE(run);

diff --git a/src/home/test-homectl-prompts.c b/src/home/test-homectl-prompts.c
index aaa81cc78a89d1a5da7b198adbd73d7fca41fa9d..59bff32c443876fb94f87b73b84c9936142dd8a2 100644 (file)
--- a/src/home/test-homectl-prompts.c
+++ b/src/home/test-homectl-prompts.c
@@ -100,7 +100,7 @@ static int run(int argc, char **argv) {
         if (r <= 0)
                 return r;
 
-        return dispatch_verb_with_args(args, /* userdata= */ NULL);
+        return dispatch_verb(args, /* userdata= */ NULL);
 }
 
 DEFINE_MAIN_FUNCTION(run);

diff --git a/src/hostname/hostnamectl.c b/src/hostname/hostnamectl.c
index ab21fcca1f070a7463bf973047853d5b981eb6d4..282a16d83cb37a98f29dbe250c06a9b4c45d1737 100644 (file)
--- a/src/hostname/hostnamectl.c
+++ b/src/hostname/hostnamectl.c
@@ -833,7 +833,7 @@ static int run(int argc, char *argv[]) {
         if (r < 0)
                 return bus_log_connect_error(r, arg_transport, RUNTIME_SCOPE_SYSTEM);
 
-        return dispatch_verb_with_args(args, bus);
+        return dispatch_verb(args, bus);
 }
 
 DEFINE_MAIN_FUNCTION(run);

diff --git a/src/hwdb/hwdb.c b/src/hwdb/hwdb.c
index 5ad3bac3211ee81eea179b8bf3e5278434366903..4d2d6fe8c48d94479d4ed34d4d1f94305a24e2ad 100644 (file)
--- a/src/hwdb/hwdb.c
+++ b/src/hwdb/hwdb.c
@@ -125,7 +125,7 @@ static int run(int argc, char *argv[]) {
         if (r < 0)
                 return r;
 
-        return dispatch_verb_with_args(args, NULL);
+        return dispatch_verb(args, NULL);
 }
 
 DEFINE_MAIN_FUNCTION(run);

diff --git a/src/id128/id128.c b/src/id128/id128.c
index ceac8a832e5c1af80b260d7254e7424c7aba8c98..e66acd33e5eede65c9e39e97a7ead611530e2d0c 100644 (file)
--- a/src/id128/id128.c
+++ b/src/id128/id128.c
@@ -304,7 +304,7 @@ static int run(int argc, char *argv[]) {
         if (r <= 0)
                 return r;
 
-        return dispatch_verb_with_args(args, NULL);
+        return dispatch_verb(args, NULL);
 }
 
 DEFINE_MAIN_FUNCTION(run);

diff --git a/src/import/export.c b/src/import/export.c
index 8b64b9cad901eef7523c8a2f76f4e555e9c4ab08..0b6d27b9ffa8d1448cdfb6562b5b400183840b8b 100644 (file)
--- a/src/import/export.c
+++ b/src/import/export.c
@@ -292,7 +292,7 @@ static int run(int argc, char *argv[]) {
 
         (void) ignore_signals(SIGPIPE);
 
-        return dispatch_verb_with_args(args, NULL);
+        return dispatch_verb(args, NULL);
 }
 
 DEFINE_MAIN_FUNCTION(run);

diff --git a/src/import/import-fs.c b/src/import/import-fs.c
index cc6e14c995a8a9cf3dc2e66b3dd124addc376225..1e6d8beff274c99d4211bbb05e0f6c0c3b59c986 100644 (file)
--- a/src/import/import-fs.c
+++ b/src/import/import-fs.c
@@ -400,7 +400,7 @@ static int run(int argc, char *argv[]) {
         if (r <= 0)
                 return r;
 
-        return dispatch_verb_with_args(args, NULL);
+        return dispatch_verb(args, NULL);
 }
 
 DEFINE_MAIN_FUNCTION(run);

diff --git a/src/import/import.c b/src/import/import.c
index 9ddc4469c1fdada2ca2825c00ebfa100dafa92f7..18276fa72d24316807edd25ac95a23c0adbdbd4b 100644 (file)
--- a/src/import/import.c
+++ b/src/import/import.c
@@ -481,7 +481,7 @@ static int run(int argc, char *argv[]) {
 
         (void) ignore_signals(SIGPIPE);
 
-        return dispatch_verb_with_args(args, NULL);
+        return dispatch_verb(args, NULL);
 }
 
 DEFINE_MAIN_FUNCTION(run);

diff --git a/src/import/importctl.c b/src/import/importctl.c
index 0140d0f67de48063ba5979f2daa906186bc59cc6..58d996e8d74ef14d977efaa268b48f78035f4758 100644 (file)
--- a/src/import/importctl.c
+++ b/src/import/importctl.c
@@ -1260,7 +1260,7 @@ static int run(int argc, char *argv[]) {
 
         (void) sd_bus_set_allow_interactive_authorization(bus, arg_ask_password);
 
-        return dispatch_verb_with_args(args, bus);
+        return dispatch_verb(args, bus);
 }
 
 DEFINE_MAIN_FUNCTION(run);

diff --git a/src/import/pull.c b/src/import/pull.c
index ac9492f1775659c067440e041dc4adc1c84fbfcb..09294bc6fc57330a1ecff67968225142a109dc88 100644 (file)
--- a/src/import/pull.c
+++ b/src/import/pull.c
@@ -620,7 +620,7 @@ static int run(int argc, char *argv[]) {
 
         (void) ignore_signals(SIGPIPE);
 
-        return dispatch_verb_with_args(args, NULL);
+        return dispatch_verb(args, NULL);
 }
 
 DEFINE_MAIN_FUNCTION(run);

diff --git a/src/integritysetup/integritysetup.c b/src/integritysetup/integritysetup.c
index 7126db6d66e64d9ab4f4d0487161fa1cb7d99247..bdf1b25473bd4c08bb1087d6b892b38868b526bf 100644 (file)
--- a/src/integritysetup/integritysetup.c
+++ b/src/integritysetup/integritysetup.c
@@ -210,7 +210,7 @@ static int run(int argc, char *argv[]) {
 
         umask(0022);
 
-        return dispatch_verb_with_args(strv_skip(argv, 1), /* userdata= */ NULL);
+        return dispatch_verb(strv_skip(argv, 1), /* userdata= */ NULL);
 }
 
 DEFINE_MAIN_FUNCTION(run);

diff --git a/src/kernel-install/kernel-install.c b/src/kernel-install/kernel-install.c
index 27e1a7426e4d1d89fdd2003a854913135936c6b9..ff93a80c0867ac2570b365c9609d59539f78c60c 100644 (file)
--- a/src/kernel-install/kernel-install.c
+++ b/src/kernel-install/kernel-install.c
@@ -1719,7 +1719,7 @@ static int run(int argc, char* argv[]) {
         if (invoked_as(argv, "installkernel"))
                 return run_as_installkernel(args);
 
-        return dispatch_verb_with_args(args, /* userdata= */ NULL);
+        return dispatch_verb(args, /* userdata= */ NULL);
 }
 
 DEFINE_MAIN_FUNCTION_WITH_POSITIVE_FAILURE(run);

diff --git a/src/keyutil/keyutil.c b/src/keyutil/keyutil.c
index abdec1591d01c54f2b54ff28fa755b29da84c78b..ab8e3eee982335cd1a22213da8440dec5752edd6 100644 (file)
--- a/src/keyutil/keyutil.c
+++ b/src/keyutil/keyutil.c
@@ -415,7 +415,7 @@ static int run(int argc, char *argv[]) {
         if (r <= 0)
                 return r;
 
-        return dispatch_verb_with_args(args, NULL);
+        return dispatch_verb(args, NULL);
 }
 
 DEFINE_MAIN_FUNCTION(run);

diff --git a/src/locale/localectl.c b/src/locale/localectl.c
index f1f9ffbce0c054e828421a6867d9281d31dc372e..ff7afa6c841dd4ec0e1275e2b16aa67bff84ec48 100644 (file)
--- a/src/locale/localectl.c
+++ b/src/locale/localectl.c
@@ -519,7 +519,7 @@ static int run(int argc, char *argv[]) {
         if (r < 0)
                 return bus_log_connect_error(r, arg_transport, RUNTIME_SCOPE_SYSTEM);
 
-        return dispatch_verb_with_args(args, bus);
+        return dispatch_verb(args, bus);
 }
 
 DEFINE_MAIN_FUNCTION(run);

diff --git a/src/login/loginctl.c b/src/login/loginctl.c
index 39c048e70891c85fcf037617b9a28606278a97ee..63eafdceb4aedd7841ed7a47fa119a1a312d6d10 100644 (file)
--- a/src/login/loginctl.c
+++ b/src/login/loginctl.c
@@ -1680,7 +1680,7 @@ static int run(int argc, char *argv[]) {
 
         (void) sd_bus_set_allow_interactive_authorization(bus, arg_ask_password);
 
-        return dispatch_verb_with_args(args, bus);
+        return dispatch_verb(args, bus);
 }
 
 DEFINE_MAIN_FUNCTION(run);

diff --git a/src/machine/machinectl.c b/src/machine/machinectl.c
index c0f9fd51e07c512e9896c67f57b567f7edd8d6c0..b0efb6ec029cf1b69e1c4fae9ff0e72fd1f887b1 100644 (file)
--- a/src/machine/machinectl.c
+++ b/src/machine/machinectl.c
@@ -2656,7 +2656,7 @@ static int run(int argc, char *argv[]) {
 
         (void) sd_bus_set_allow_interactive_authorization(bus, arg_ask_password);
 
-        return dispatch_verb_with_args(args, bus);
+        return dispatch_verb(args, bus);
 }
 
 DEFINE_MAIN_FUNCTION(run);

diff --git a/src/measure/measure-tool.c b/src/measure/measure-tool.c
index b8acd6d4b0922a00b46724998f60261a0e60ca53..e7a3be6d643b1840009b25cfcd10bfdab53e7f3e 100644 (file)
--- a/src/measure/measure-tool.c
+++ b/src/measure/measure-tool.c
@@ -1126,7 +1126,7 @@ static int run(int argc, char *argv[]) {
         if (r < 0)
                 return r;
 
-        return dispatch_verb_with_args(args, NULL);
+        return dispatch_verb(args, NULL);
 }
 
 DEFINE_MAIN_FUNCTION(run);

diff --git a/src/network/networkctl.c b/src/network/networkctl.c
index b64c8b17fc7d06709025491c10e727233a6dd389..bdf487bf2e80305c5fae9406da8cdcc2b806ea2d 100644 (file)
--- a/src/network/networkctl.c
+++ b/src/network/networkctl.c
@@ -213,7 +213,7 @@ static int run(int argc, char* argv[]) {
 
         journal_browse_prepare();
 
-        return dispatch_verb_with_args(args, NULL);
+        return dispatch_verb(args, NULL);
 }
 
 DEFINE_MAIN_FUNCTION(run);

diff --git a/src/oom/oomctl.c b/src/oom/oomctl.c
index f6d451612b725eca0cb00e068fad94f7594b1dab..8b5051ebd09c2720e44155ad3999b177f50a75dd 100644 (file)
--- a/src/oom/oomctl.c
+++ b/src/oom/oomctl.c
@@ -120,7 +120,7 @@ static int run(int argc, char* argv[]) {
         if (r <= 0)
                 return r;
 
-        return dispatch_verb_with_args(args, NULL);
+        return dispatch_verb(args, NULL);
 }
 
 DEFINE_MAIN_FUNCTION(run);

diff --git a/src/pcrlock/pcrlock.c b/src/pcrlock/pcrlock.c
index 8315384b4d10eb6a55b5041c22b28d57e26c0695..9ce991262e0dbcf2164835c1acd942727fa437c6 100644 (file)
--- a/src/pcrlock/pcrlock.c
+++ b/src/pcrlock/pcrlock.c
@@ -5505,7 +5505,7 @@ static int run(int argc, char *argv[]) {
                 return EXIT_SUCCESS;
         }
 
-        return dispatch_verb_with_args(args, NULL);
+        return dispatch_verb(args, NULL);
 }
 
 DEFINE_MAIN_FUNCTION_WITH_POSITIVE_FAILURE(run);

diff --git a/src/portable/portablectl.c b/src/portable/portablectl.c
index 763acfc258656df26b8828b2794d953b82a4c7bb..9286a6fbb366413072d8bd5b363b017a1fde08da 100644 (file)
--- a/src/portable/portablectl.c
+++ b/src/portable/portablectl.c
@@ -1455,7 +1455,7 @@ static int run(int argc, char *argv[]) {
         if (r <= 0)
                 return r;
 
-        return dispatch_verb_with_args(args, NULL);
+        return dispatch_verb(args, NULL);
 }
 
 DEFINE_MAIN_FUNCTION(run);

diff --git a/src/random-seed/random-seed-tool.c b/src/random-seed/random-seed-tool.c
index f573e84412ffb0f5a4a2d670f5c9c101ebe95699..514176ef5d8ea2518cb55a6ca51b9134155d23d5 100644 (file)
--- a/src/random-seed/random-seed-tool.c
+++ b/src/random-seed/random-seed-tool.c
@@ -362,7 +362,7 @@ static int parse_argv(int argc, char *argv[]) {
                         return version();
                 }
 
-        r = dispatch_verb_with_args(option_parser_get_args(&opts), NULL);
+        r = dispatch_verb(option_parser_get_args(&opts), NULL);
         if (r < 0)
                 return r;
 

diff --git a/src/report/report.c b/src/report/report.c
index 4031d915431e3ca97bd42252fca7b586072f70bb..9cb0e053e0706b98ae29a0f3f873ef0493efff3d 100644 (file)
--- a/src/report/report.c
+++ b/src/report/report.c
@@ -886,7 +886,7 @@ static int run(int argc, char *argv[]) {
         if (r <= 0)
                 return r;
 
-        return dispatch_verb_with_args(args, NULL);
+        return dispatch_verb(args, NULL);
 }
 
 DEFINE_MAIN_FUNCTION(run);

diff --git a/src/resolve/resolvectl.c b/src/resolve/resolvectl.c
index e8ae7c5412acc724c61da143fb0490024f66c82e..67be81195a843aca6fcf6664e5b85c063fa843ed 100644 (file)
--- a/src/resolve/resolvectl.c
+++ b/src/resolve/resolvectl.c
@@ -3761,7 +3761,7 @@ static int translate(const char *verb, const char *single_arg, char **args) {
         STRV_FOREACH(a, args)
                 *p++ = *a;
 
-        return dispatch_verb_with_args(fake, /* userdata= */ NULL);
+        return dispatch_verb(fake, /* userdata= */ NULL);
 }
 
 static int compat_main(char **args) {
@@ -3883,7 +3883,7 @@ static int run(int argc, char **argv) {
         if (compat)
                 return compat_main(args);
 
-        return dispatch_verb_with_args(args, /* userdata= */ NULL);
+        return dispatch_verb(args, /* userdata= */ NULL);
 }
 
 DEFINE_MAIN_FUNCTION(run);

diff --git a/src/sbsign/sbsign.c b/src/sbsign/sbsign.c
index 9d163624a4997014d43600bc841edfa7f07293e4..f845bcdf424b7dd6a61abb888bfe86ca54a54210 100644 (file)
--- a/src/sbsign/sbsign.c
+++ b/src/sbsign/sbsign.c
@@ -730,7 +730,7 @@ static int run(int argc, char *argv[]) {
         if (r <= 0)
                 return r;
 
-        return dispatch_verb_with_args(args, NULL);
+        return dispatch_verb(args, NULL);
 }
 
 DEFINE_MAIN_FUNCTION(run);

diff --git a/src/shared/verbs.c b/src/shared/verbs.c
index bd665fc7fa2446e92a94f088506f758f21ce573f..e9e78c5b7293443b5e1bf35e313dde0ecc2ccb00 100644 (file)
--- a/src/shared/verbs.c
+++ b/src/shared/verbs.c
@@ -82,7 +82,7 @@ const Verb* verbs_find_verb(const char *name, const Verb verbs[], const Verb ver
         return NULL;
 }
 
-int _dispatch_verb_with_args(char **args, const Verb verbs[], const Verb verbs_end[], void *userdata) {
+int _dispatch_verb(char **args, const Verb verbs[], const Verb verbs_end[], void *userdata) {
         int r;
 
         assert(verbs);
@@ -150,22 +150,6 @@ int _dispatch_verb_with_args(char **args, const Verb verbs[], const Verb verbs_e
         return verb->dispatch(left, args, verb->data, userdata);
 }
 
-int dispatch_verb(int argc, char *argv[], const Verb verbs[], void *userdata) {
-        /* getopt wrapper for _dispatch_verb_with_args.
-         * TBD: remove this function when all programs with verbs have been converted. */
-
-        assert((uintptr_t) verbs % sizeof(void*) == 0);
-        assert(argc >= 0);
-        assert(argv);
-        assert(argc >= optind);
-
-        size_t n = 0;
-        while (verbs[n].verb)
-                n++;
-
-        return _dispatch_verb_with_args(strv_skip(argv, optind), verbs, verbs + n, userdata);
-}
-
 #define VERB_SYNOPSIS_WIDTH_SANE 25
 
 static const char* find_point_to_break(const char *s, size_t max_width) {

diff --git a/src/shared/verbs.h b/src/shared/verbs.h
index a5d210c89311f17ebbc6f1f24cfe940d1b05e44b..2a9df84e0c33bc628c284e175baf4013fc260e33 100644 (file)
--- a/src/shared/verbs.h
+++ b/src/shared/verbs.h
@@ -79,11 +79,9 @@ bool should_bypass(const char *env_prefix);
 
 const Verb* verbs_find_verb(const char *name, const Verb verbs[], const Verb verbs_end[]);
 
-int _dispatch_verb_with_args(char **args, const Verb verbs[], const Verb verbs_end[], void *userdata);
-#define dispatch_verb_with_args(args, userdata) \
-        _dispatch_verb_with_args(args, __start_SYSTEMD_VERBS, __stop_SYSTEMD_VERBS, userdata)
-
-int dispatch_verb(int argc, char *argv[], const Verb verbs[], void *userdata);
+int _dispatch_verb(char **args, const Verb verbs[], const Verb verbs_end[], void *userdata);
+#define dispatch_verb(args, userdata) \
+        _dispatch_verb(args, __start_SYSTEMD_VERBS, __stop_SYSTEMD_VERBS, userdata)
 
 int _verbs_get_help_table(
                 const Verb verbs[],

diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c
index 53f306a8faefc4336f7947a9a04a32d4ffc2e064..24cd632111696fec94afb66f0612af1b98ff1586 100644 (file)
--- a/src/sleep/sleep.c
+++ b/src/sleep/sleep.c
@@ -760,7 +760,7 @@ static int run(int argc, char *argv[]) {
         if (r < 0)
                 return r;
 
-        return dispatch_verb_with_args(args, sleep_config);
+        return dispatch_verb(args, sleep_config);
 }
 
 DEFINE_MAIN_FUNCTION(run);

diff --git a/src/ssh-generator/ssh-issue.c b/src/ssh-generator/ssh-issue.c
index 2028d3f942393cdea117c2a6d85f8f44e3131bb7..dd2b2370b4b7f2c50cea8c6d8fa956c61715a334 100644 (file)
--- a/src/ssh-generator/ssh-issue.c
+++ b/src/ssh-generator/ssh-issue.c
@@ -224,7 +224,7 @@ static int run(int argc, char* argv[]) {
         if (r <= 0)
                 return r;
 
-        return dispatch_verb_with_args(args, NULL);
+        return dispatch_verb(args, NULL);
 }
 
 DEFINE_MAIN_FUNCTION(run);

diff --git a/src/storage/storagectl.c b/src/storage/storagectl.c
index e33d00bb645c87cc94316ee60c14a55e6d799bc2..7e366c11a912b819e1350fd5b85d2910f0a810fb 100644 (file)
--- a/src/storage/storagectl.c
+++ b/src/storage/storagectl.c
@@ -740,7 +740,7 @@ static int run(int argc, char *argv[]) {
         if (r <= 0)
                 return r;
 
-        return dispatch_verb_with_args(args, /* userdata= */ NULL);
+        return dispatch_verb(args, /* userdata= */ NULL);
 }
 
 DEFINE_MAIN_FUNCTION(run);

diff --git a/src/sysext/sysext.c b/src/sysext/sysext.c
index ff00196cc654d669d15ef5e23fb23073f0b68fe3..a3b1ba6221b66913d6f7d8157ca2ab97e640472b 100644 (file)
--- a/src/sysext/sysext.c
+++ b/src/sysext/sysext.c
@@ -3048,7 +3048,7 @@ static int run(int argc, char *argv[]) {
                 return EXIT_SUCCESS;
         }
 
-        return dispatch_verb_with_args(args, NULL);
+        return dispatch_verb(args, NULL);
 }
 
 DEFINE_MAIN_FUNCTION(run);

diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index 6ea4e50fb4a80381f6dfc2174e5b6622dd5ff562..99244de7674c2eb5a5403aef33ca467aaa174cfb 100644 (file)
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -1120,5 +1120,5 @@ int systemctl_main(char **args) {
                                        "Verb '%s' cannot be used with --root= or --image=.",
                                        args[0] ?: verb->verb);
 
-        return dispatch_verb_with_args(args, NULL);
+        return dispatch_verb(args, NULL);
 }

diff --git a/src/sysupdate/sysupdate.c b/src/sysupdate/sysupdate.c
index c64c5a9b95f764a59f091045a2fb4ad6b0123fae..425460a319192e48839b5d1065e9a2c7f0803f4f 100644 (file)
--- a/src/sysupdate/sysupdate.c
+++ b/src/sysupdate/sysupdate.c
@@ -2010,7 +2010,7 @@ static int run(int argc, char *argv[]) {
         if (r <= 0)
                 return r;
 
-        return dispatch_verb_with_args(args, NULL);
+        return dispatch_verb(args, NULL);
 }
 
 DEFINE_MAIN_FUNCTION_WITH_POSITIVE_FAILURE(run);

diff --git a/src/sysupdate/updatectl.c b/src/sysupdate/updatectl.c
index a256dc19c8b688163f8ab9246507d4212c584f7a..cf574a86e9063b65f0748957b871b590f709834b 100644 (file)
--- a/src/sysupdate/updatectl.c
+++ b/src/sysupdate/updatectl.c
@@ -1757,7 +1757,7 @@ static int run(int argc, char *argv[]) {
 
         (void) sd_bus_set_allow_interactive_authorization(bus, true);
 
-        return dispatch_verb_with_args(args, bus);
+        return dispatch_verb(args, bus);
 }
 
 DEFINE_MAIN_FUNCTION_WITH_POSITIVE_FAILURE(run);

diff --git a/src/test/test-verbs.c b/src/test/test-verbs.c
index cfff6ec728490c99f5615cb04077e986c7b7ba47..56062b0bd6bdc95ea8984537c91ae9aec71ed66a 100644 (file)
--- a/src/test/test-verbs.c
+++ b/src/test/test-verbs.c
@@ -9,7 +9,7 @@ static int noop_dispatcher(int argc, char *argv[], uintptr_t _data, void *userda
 }
 
 #define test_dispatch_one(argv, verbs, expected) \
-        assert_se(_dispatch_verb_with_args(argv, verbs, verbs + ELEMENTSOF(verbs) - 1, NULL) == expected);
+        assert_se(_dispatch_verb(argv, verbs, verbs + ELEMENTSOF(verbs) - 1, NULL) == expected);
 
 TEST(verbs) {
         static const Verb verbs[] = {

diff --git a/src/timedate/timedatectl.c b/src/timedate/timedatectl.c
index 7607b1ac4b1fe3b0e1c6a18229327b3bbc19cb20..2c9ab9b6fd77755236158c053d91f4d9f64ebd04 100644 (file)
--- a/src/timedate/timedatectl.c
+++ b/src/timedate/timedatectl.c
@@ -1028,7 +1028,7 @@ static int run(int argc, char *argv[]) {
 
         (void) sd_bus_set_allow_interactive_authorization(bus, arg_ask_password);
 
-        return dispatch_verb_with_args(args, bus);
+        return dispatch_verb(args, bus);
 }
 
 DEFINE_MAIN_FUNCTION(run);

diff --git a/src/udev/iocost/iocost.c b/src/udev/iocost/iocost.c
index 1efd4a5365e1bb8012eb529e720256a60b5aa694..a591ba40c0cca45edaed159f89ada980d5eaef46 100644 (file)
--- a/src/udev/iocost/iocost.c
+++ b/src/udev/iocost/iocost.c
@@ -308,7 +308,7 @@ static int run(int argc, char *argv[]) {
         if (r < 0)
                 return r;
 
-        return dispatch_verb_with_args(args, NULL);
+        return dispatch_verb(args, NULL);
 }
 
 DEFINE_MAIN_FUNCTION(run);

diff --git a/src/udev/udevadm.c b/src/udev/udevadm.c
index cdc10802749eadfd84225fa63f2cacedfdacedc7..9b7b09370a97f79c6382f7cdb327b7f95a1b711d 100644 (file)
--- a/src/udev/udevadm.c
+++ b/src/udev/udevadm.c
@@ -115,7 +115,7 @@ static int run(int argc, char *argv[]) {
         if (r < 0)
                 return r;
 
-        return dispatch_verb_with_args(args, NULL);
+        return dispatch_verb(args, NULL);
 }
 
 DEFINE_MAIN_FUNCTION_WITH_POSITIVE_FAILURE(run);

diff --git a/src/update-utmp/update-utmp.c b/src/update-utmp/update-utmp.c
index bd10f42ea5d8598f45f8df9e07e225cc648cf44f..d27616c2cd37e324aa1197396d1c3e769d795c9b 100644 (file)
--- a/src/update-utmp/update-utmp.c
+++ b/src/update-utmp/update-utmp.c
@@ -115,7 +115,7 @@ static int run(int argc, char *argv[]) {
 
         c.audit_fd = open_audit_fd_or_warn();
 
-        return dispatch_verb_with_args(strv_skip(argv, 1), &c);
+        return dispatch_verb(strv_skip(argv, 1), &c);
 }
 
 DEFINE_MAIN_FUNCTION(run);

diff --git a/src/userdb/userdbctl.c b/src/userdb/userdbctl.c
index dd6fc0f5c12f170f0f4b663b28292789c161824f..fd349b282677b83a155586c447004346c8edf1a0 100644 (file)
--- a/src/userdb/userdbctl.c
+++ b/src/userdb/userdbctl.c
@@ -1874,7 +1874,7 @@ static int run(int argc, char *argv[]) {
         } else
                 assert_se(unsetenv("SYSTEMD_ONLY_USERDB") == 0);
 
-        return dispatch_verb_with_args(args, NULL);
+        return dispatch_verb(args, NULL);
 }
 
 DEFINE_MAIN_FUNCTION(run);

diff --git a/src/varlinkctl/varlinkctl.c b/src/varlinkctl/varlinkctl.c
index fbd5e2499a5d5615160918b4058693b4586cdadb..94a4bc40b35c718efca07f8e5f783c95f8ef9280 100644 (file)
--- a/src/varlinkctl/varlinkctl.c
+++ b/src/varlinkctl/varlinkctl.c
@@ -1318,7 +1318,7 @@ static int run(int argc, char *argv[]) {
         if (r <= 0)
                 return r;
 
-        return dispatch_verb_with_args(args, NULL);
+        return dispatch_verb(args, NULL);
 }
 
 DEFINE_MAIN_FUNCTION(run);

diff --git a/src/veritysetup/veritysetup.c b/src/veritysetup/veritysetup.c
index 5f413cb83fc6bc8d333edf7ee49f23018518ad49..e9ce2bdfecb695d694c191a5e66c09ac56ccd102 100644 (file)
--- a/src/veritysetup/veritysetup.c
+++ b/src/veritysetup/veritysetup.c
@@ -497,7 +497,7 @@ static int run(int argc, char *argv[]) {
 
         umask(0022);
 
-        return dispatch_verb_with_args(strv_skip(argv, 1), /* userdata= */ NULL);
+        return dispatch_verb(strv_skip(argv, 1), /* userdata= */ NULL);
 }
 
 DEFINE_MAIN_FUNCTION(run);