tree-wide: get rid of old dispatch_verb

Also rename dispatch_verb_with_args to dispatch_verb.

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);

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);

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);

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);

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);

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",

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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;
 

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);

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);

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);

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) {

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[],

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);

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);

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);

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);

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);
 }

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);

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);

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[] = {

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);

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);

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);

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);

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);

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);

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);