From: Zbigniew Jędrzejewski-Szmek <zbyszek@amutable.com>
Date: Fri, 15 May 2026 19:37:04 +0000 (+0200)
Subject: tree-wide: get rid of old dispatch_verb
X-Git-Tag: v261-rc1~135^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=39a36475394fc88da405d435c6bc94db935948c5;p=thirdparty%2Fsystemd.git

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 759c5600ad2..67a91357675 100644
--- 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 3c2a601403f..7e296c9ffcb 100644
--- 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 3680dfdc188..43fb72cddb7 100644
--- 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 4bb9742a470..b5cca6d222c 100644
--- 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 9bf990d3dbf..edba5748e86 100644
--- 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 7bb1fd17521..3b31471ab4d 100644
--- 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 a4087fc2be6..77f7442ab57 100644
--- 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 fffecd35738..b6ee120e5ec 100644
--- 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 c21e84c2ef7..d3019396c3c 100644
--- 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 75339d93c83..ab81efbed6d 100644
--- 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 aaa81cc78a8..59bff32c443 100644
--- 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 ab21fcca1f0..282a16d83cb 100644
--- 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 5ad3bac3211..4d2d6fe8c48 100644
--- 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 ceac8a832e5..e66acd33e5e 100644
--- 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 8b64b9cad90..0b6d27b9ffa 100644
--- 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 cc6e14c995a..1e6d8beff27 100644
--- 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 9ddc4469c1f..18276fa72d2 100644
--- 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 0140d0f67de..58d996e8d74 100644
--- 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 ac9492f1775..09294bc6fc5 100644
--- 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 7126db6d66e..bdf1b25473b 100644
--- 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 27e1a7426e4..ff93a80c086 100644
--- 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 abdec1591d0..ab8e3eee982 100644
--- 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 f1f9ffbce0c..ff7afa6c841 100644
--- 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 39c048e7089..63eafdceb4a 100644
--- 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 c0f9fd51e07..b0efb6ec029 100644
--- 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 b8acd6d4b09..e7a3be6d643 100644
--- 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 b64c8b17fc7..bdf487bf2e8 100644
--- 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 f6d451612b7..8b5051ebd09 100644
--- 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 8315384b4d1..9ce991262e0 100644
--- 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 763acfc2586..9286a6fbb36 100644
--- 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 f573e84412f..514176ef5d8 100644
--- 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 4031d915431..9cb0e053e07 100644
--- 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 e8ae7c5412a..67be81195a8 100644
--- 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 9d163624a49..f845bcdf424 100644
--- 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 bd665fc7fa2..e9e78c5b729 100644
--- 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 a5d210c8931..2a9df84e0c3 100644
--- 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 53f306a8fae..24cd6321116 100644
--- 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 2028d3f9423..dd2b2370b4b 100644
--- 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 e33d00bb645..7e366c11a91 100644
--- 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 ff00196cc65..a3b1ba6221b 100644
--- 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 6ea4e50fb4a..99244de7674 100644
--- 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 c64c5a9b95f..425460a3191 100644
--- 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 a256dc19c8b..cf574a86e90 100644
--- 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 cfff6ec7284..56062b0bd6b 100644
--- 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 7607b1ac4b1..2c9ab9b6fd7 100644
--- 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 1efd4a5365e..a591ba40c0c 100644
--- 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 cdc10802749..9b7b09370a9 100644
--- 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 bd10f42ea5d..d27616c2cd3 100644
--- 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 dd6fc0f5c12..fd349b28267 100644
--- 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 fbd5e2499a5..94a4bc40b35 100644
--- 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 5f413cb83fc..e9ce2bdfecb 100644
--- 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);