udevadm: call all verb functions verb_*

src/udev/udevadm-cat.c

@@ -92,7 +92,7 @@ static int parse_argv(int argc, char *argv[]) {
         return 1;
 }
 
-int cat_main(int argc, char *argv[], void *userdata) {
+int verb_cat_main(int argc, char *argv[], void *userdata) {
         int r;
 
         r = parse_argv(argc, argv);

src/udev/udevadm-control.c

@@ -331,7 +331,7 @@ static int send_control_commands(void) {
         return 0;
 }
 
-int control_main(int argc, char *argv[], void *userdata) {
+int verb_control_main(int argc, char *argv[], void *userdata) {
         int r;
 
         if (running_in_chroot() > 0) {

src/udev/udevadm-hwdb.c

@@ -78,7 +78,7 @@ static int parse_argv(int argc, char *argv[]) {
         return 1;
 }
 
-int hwdb_main(int argc, char *argv[], void *userdata) {
+int verb_hwdb_main(int argc, char *argv[], void *userdata) {
         int r;
 
         r = parse_argv(argc, argv);

src/udev/udevadm-info.c

@@ -1275,7 +1275,7 @@ static int parse_argv(int argc, char *argv[]) {
         return 1;
 }
 
-int info_main(int argc, char *argv[], void *userdata) {
+int verb_info_main(int argc, char *argv[], void *userdata) {
         int r;
 
         r = parse_argv(argc, argv);

src/udev/udevadm-lock.c

@@ -228,7 +228,7 @@ static int lock_device(
         return TAKE_FD(fd);
 }
 
-int lock_main(int argc, char *argv[], void *userdata) {
+int verb_lock_main(int argc, char *argv[], void *userdata) {
         _cleanup_fdset_free_ FDSet *fds = NULL;
         _cleanup_free_ dev_t *devnos = NULL;
         size_t n_devnos = 0;

src/udev/udevadm-monitor.c

@@ -187,7 +187,7 @@ static int parse_argv(int argc, char *argv[]) {
         return 1;
 }
 
-int monitor_main(int argc, char *argv[], void *userdata) {
+int verb_monitor_main(int argc, char *argv[], void *userdata) {
         _cleanup_(sd_device_monitor_unrefp) sd_device_monitor *kernel_monitor = NULL, *udev_monitor = NULL;
         _cleanup_(sd_event_unrefp) sd_event *event = NULL;
         int r;

src/udev/udevadm-settle.c

@@ -184,7 +184,7 @@ static int on_inotify(sd_event_source *s, const struct inotify_event *event, voi
         return 0;
 }
 
-int settle_main(int argc, char *argv[], void *userdata) {
+int verb_settle_main(int argc, char *argv[], void *userdata) {
         _cleanup_(sd_event_unrefp) sd_event *event = NULL;
         int r;
 

src/udev/udevadm-test-builtin.c

@@ -63,7 +63,7 @@ static int parse_argv(int argc, char *argv[]) {
         return 1;
 }
 
-int builtin_main(int argc, char *argv[], void *userdata) {
+int verb_builtin_main(int argc, char *argv[], void *userdata) {
         _cleanup_(udev_event_unrefp) UdevEvent *event = NULL;
         _cleanup_(sd_device_unrefp) sd_device *dev = NULL;
         UdevBuiltinCommand cmd;

src/udev/udevadm-test.c

@@ -129,7 +129,7 @@ static void maybe_insert_empty_line(void) {
         fputs("\n", stderr);
 }
 
-int test_main(int argc, char *argv[], void *userdata) {
+int verb_test_main(int argc, char *argv[], void *userdata) {
         _cleanup_(udev_rules_freep) UdevRules *rules = NULL;
         _cleanup_(udev_event_unrefp) UdevEvent *event = NULL;
         _cleanup_(sd_device_unrefp) sd_device *dev = NULL;

src/udev/udevadm-trigger.c

@@ -534,7 +534,7 @@ static int parse_argv(int argc, char *argv[]) {
         return 1;
 }
 
-int trigger_main(int argc, char *argv[], void *userdata) {
+int verb_trigger_main(int argc, char *argv[], void *userdata) {
         _cleanup_(sd_device_enumerator_unrefp) sd_device_enumerator *e = NULL;
         _cleanup_(sd_device_monitor_unrefp) sd_device_monitor *m = NULL;
         _cleanup_(sd_event_unrefp) sd_event *event = NULL;

src/udev/udevadm-verify.c

@@ -156,7 +156,7 @@ static int verify_rules(UdevRules *rules, ConfFile * const *files, size_t n_file
         return ret;
 }
 
-int verify_main(int argc, char *argv[], void *userdata) {
+int verb_verify_main(int argc, char *argv[], void *userdata) {
         _cleanup_(udev_rules_freep) UdevRules *rules = NULL;
         int r;
 

src/udev/udevadm-wait.c

@@ -376,7 +376,7 @@ static int parse_argv(int argc, char *argv[]) {
         return 1; /* work to do */
 }
 
-int wait_main(int argc, char *argv[], void *userdata) {
+int verb_wait_main(int argc, char *argv[], void *userdata) {
         _cleanup_(sd_device_monitor_unrefp) sd_device_monitor *udev_monitor = NULL, *kernel_monitor = NULL;
         _cleanup_(sd_event_unrefp) sd_event *event = NULL;
         int r;

src/udev/udevadm.c

@@ -91,30 +91,30 @@ int print_version(void) {
         return 0;
 }
 
-static int version_main(int argc, char *argv[], void *userdata) {
+static int verb_version_main(int argc, char *argv[], void *userdata) {
         return print_version();
 }
 
-static int help_main(int argc, char *argv[], void *userdata) {
+static int verb_help_main(int argc, char *argv[], void *userdata) {
         return help();
 }
 
 static int udevadm_main(int argc, char *argv[]) {
         static const Verb verbs[] = {
-                { "cat",          VERB_ANY, VERB_ANY, 0, cat_main     },
-                { "info",         VERB_ANY, VERB_ANY, 0, info_main    },
-                { "trigger",      VERB_ANY, VERB_ANY, 0, trigger_main },
-                { "settle",       VERB_ANY, VERB_ANY, 0, settle_main  },
-                { "control",      VERB_ANY, VERB_ANY, 0, control_main },
-                { "monitor",      VERB_ANY, VERB_ANY, 0, monitor_main },
-                { "hwdb",         VERB_ANY, VERB_ANY, 0, hwdb_main    },
-                { "test",         VERB_ANY, VERB_ANY, 0, test_main    },
-                { "test-builtin", VERB_ANY, VERB_ANY, 0, builtin_main },
-                { "wait",         VERB_ANY, VERB_ANY, 0, wait_main    },
-                { "lock",         VERB_ANY, VERB_ANY, 0, lock_main    },
-                { "verify",       VERB_ANY, VERB_ANY, 0, verify_main  },
-                { "version",      VERB_ANY, VERB_ANY, 0, version_main },
-                { "help",         VERB_ANY, VERB_ANY, 0, help_main    },
+                { "cat",          VERB_ANY, VERB_ANY, 0, verb_cat_main     },
+                { "info",         VERB_ANY, VERB_ANY, 0, verb_info_main    },
+                { "trigger",      VERB_ANY, VERB_ANY, 0, verb_trigger_main },
+                { "settle",       VERB_ANY, VERB_ANY, 0, verb_settle_main  },
+                { "control",      VERB_ANY, VERB_ANY, 0, verb_control_main },
+                { "monitor",      VERB_ANY, VERB_ANY, 0, verb_monitor_main },
+                { "hwdb",         VERB_ANY, VERB_ANY, 0, verb_hwdb_main    },
+                { "test",         VERB_ANY, VERB_ANY, 0, verb_test_main    },
+                { "test-builtin", VERB_ANY, VERB_ANY, 0, verb_builtin_main },
+                { "wait",         VERB_ANY, VERB_ANY, 0, verb_wait_main    },
+                { "lock",         VERB_ANY, VERB_ANY, 0, verb_lock_main    },
+                { "verify",       VERB_ANY, VERB_ANY, 0, verb_verify_main  },
+                { "version",      VERB_ANY, VERB_ANY, 0, verb_version_main },
+                { "help",         VERB_ANY, VERB_ANY, 0, verb_help_main    },
                 {}
         };
 

src/udev/udevadm.h

@@ -3,17 +3,17 @@
 
 #include "shared-forward.h"
 
-int cat_main(int argc, char *argv[], void *userdata);
-int info_main(int argc, char *argv[], void *userdata);
-int trigger_main(int argc, char *argv[], void *userdata);
-int settle_main(int argc, char *argv[], void *userdata);
-int control_main(int argc, char *argv[], void *userdata);
-int monitor_main(int argc, char *argv[], void *userdata);
-int hwdb_main(int argc, char *argv[], void *userdata);
-int test_main(int argc, char *argv[], void *userdata);
-int builtin_main(int argc, char *argv[], void *userdata);
-int verify_main(int argc, char *argv[], void *userdata);
-int wait_main(int argc, char *argv[], void *userdata);
-int lock_main(int argc, char *argv[], void *userdata);
+int verb_cat_main(int argc, char *argv[], void *userdata);
+int verb_info_main(int argc, char *argv[], void *userdata);
+int verb_trigger_main(int argc, char *argv[], void *userdata);
+int verb_settle_main(int argc, char *argv[], void *userdata);
+int verb_control_main(int argc, char *argv[], void *userdata);
+int verb_monitor_main(int argc, char *argv[], void *userdata);
+int verb_hwdb_main(int argc, char *argv[], void *userdata);
+int verb_test_main(int argc, char *argv[], void *userdata);
+int verb_builtin_main(int argc, char *argv[], void *userdata);
+int verb_verify_main(int argc, char *argv[], void *userdata);
+int verb_wait_main(int argc, char *argv[], void *userdata);
+int verb_lock_main(int argc, char *argv[], void *userdata);
 
 int print_version(void);