systemctl: systematically rename verb entrypoints verb_xyz()
Let's clean up our function naming a bit, and always name the verb_xyz(), where the xyz maps to the command line verb as closely as possible. No actual code changes, just an attempt to make the systemctl sources a bit more systematic, and less surprising.
This commit is contained in:
Lennart Poettering
+77
-77
@@ -1019,83 +1019,83 @@ int systemctl_dispatch_parse_argv(int argc, char *argv[]) {
|
||||
#ifndef FUZZ_SYSTEMCTL_PARSE_ARGV
|
||||
static int systemctl_main(int argc, char *argv[]) {
|
||||
static const Verb verbs[] = {
|
||||
{ "list-units", VERB_ANY, VERB_ANY, VERB_DEFAULT|VERB_ONLINE_ONLY, list_units },
|
||||
{ "list-unit-files", VERB_ANY, VERB_ANY, 0, list_unit_files },
|
||||
{ "list-sockets", VERB_ANY, VERB_ANY, VERB_ONLINE_ONLY, list_sockets },
|
||||
{ "list-timers", VERB_ANY, VERB_ANY, VERB_ONLINE_ONLY, list_timers },
|
||||
{ "list-jobs", VERB_ANY, VERB_ANY, VERB_ONLINE_ONLY, list_jobs },
|
||||
{ "list-machines", VERB_ANY, VERB_ANY, VERB_ONLINE_ONLY, list_machines },
|
||||
{ "clear-jobs", VERB_ANY, 1, VERB_ONLINE_ONLY, trivial_method },
|
||||
{ "cancel", VERB_ANY, VERB_ANY, VERB_ONLINE_ONLY, cancel_job },
|
||||
{ "start", 2, VERB_ANY, VERB_ONLINE_ONLY, start_unit },
|
||||
{ "stop", 2, VERB_ANY, VERB_ONLINE_ONLY, start_unit },
|
||||
{ "condstop", 2, VERB_ANY, VERB_ONLINE_ONLY, start_unit }, /* For compatibility with ALTLinux */
|
||||
{ "reload", 2, VERB_ANY, VERB_ONLINE_ONLY, start_unit },
|
||||
{ "restart", 2, VERB_ANY, VERB_ONLINE_ONLY, start_unit },
|
||||
{ "try-restart", 2, VERB_ANY, VERB_ONLINE_ONLY, start_unit },
|
||||
{ "reload-or-restart", VERB_ANY, VERB_ANY, VERB_ONLINE_ONLY, start_unit },
|
||||
{ "reload-or-try-restart", 2, VERB_ANY, VERB_ONLINE_ONLY, start_unit }, /* For compatibility with old systemctl <= 228 */
|
||||
{ "try-reload-or-restart", 2, VERB_ANY, VERB_ONLINE_ONLY, start_unit },
|
||||
{ "force-reload", 2, VERB_ANY, VERB_ONLINE_ONLY, start_unit }, /* For compatibility with SysV */
|
||||
{ "condreload", 2, VERB_ANY, VERB_ONLINE_ONLY, start_unit }, /* For compatibility with ALTLinux */
|
||||
{ "condrestart", 2, VERB_ANY, VERB_ONLINE_ONLY, start_unit }, /* For compatibility with RH */
|
||||
{ "isolate", 2, 2, VERB_ONLINE_ONLY, start_unit },
|
||||
{ "kill", 2, VERB_ANY, VERB_ONLINE_ONLY, kill_unit },
|
||||
{ "clean", 2, VERB_ANY, VERB_ONLINE_ONLY, clean_or_freeze_unit },
|
||||
{ "freeze", 2, VERB_ANY, VERB_ONLINE_ONLY, clean_or_freeze_unit },
|
||||
{ "thaw", 2, VERB_ANY, VERB_ONLINE_ONLY, clean_or_freeze_unit },
|
||||
{ "is-active", 2, VERB_ANY, VERB_ONLINE_ONLY, check_unit_active },
|
||||
{ "check", 2, VERB_ANY, VERB_ONLINE_ONLY, check_unit_active }, /* deprecated alias of is-active */
|
||||
{ "is-failed", 2, VERB_ANY, VERB_ONLINE_ONLY, check_unit_failed },
|
||||
{ "show", VERB_ANY, VERB_ANY, VERB_ONLINE_ONLY, show },
|
||||
{ "cat", 2, VERB_ANY, VERB_ONLINE_ONLY, cat },
|
||||
{ "status", VERB_ANY, VERB_ANY, VERB_ONLINE_ONLY, show },
|
||||
{ "help", VERB_ANY, VERB_ANY, VERB_ONLINE_ONLY, show },
|
||||
{ "daemon-reload", VERB_ANY, 1, VERB_ONLINE_ONLY, daemon_reload },
|
||||
{ "daemon-reexec", VERB_ANY, 1, VERB_ONLINE_ONLY, daemon_reload },
|
||||
{ "log-level", VERB_ANY, 2, VERB_ONLINE_ONLY, log_setting },
|
||||
{ "log-target", VERB_ANY, 2, VERB_ONLINE_ONLY, log_setting },
|
||||
{ "service-log-level", 2, 3, VERB_ONLINE_ONLY, service_log_setting },
|
||||
{ "service-log-target", 2, 3, VERB_ONLINE_ONLY, service_log_setting },
|
||||
{ "service-watchdogs", VERB_ANY, 2, VERB_ONLINE_ONLY, service_watchdogs },
|
||||
{ "show-environment", VERB_ANY, 1, VERB_ONLINE_ONLY, show_environment },
|
||||
{ "set-environment", 2, VERB_ANY, VERB_ONLINE_ONLY, set_environment },
|
||||
{ "unset-environment", 2, VERB_ANY, VERB_ONLINE_ONLY, set_environment },
|
||||
{ "import-environment", VERB_ANY, VERB_ANY, VERB_ONLINE_ONLY, import_environment },
|
||||
{ "halt", VERB_ANY, 1, VERB_ONLINE_ONLY, start_system_special },
|
||||
{ "poweroff", VERB_ANY, 1, VERB_ONLINE_ONLY, start_system_special },
|
||||
{ "reboot", VERB_ANY, 2, VERB_ONLINE_ONLY, start_system_special },
|
||||
{ "kexec", VERB_ANY, 1, VERB_ONLINE_ONLY, start_system_special },
|
||||
{ "suspend", VERB_ANY, 1, VERB_ONLINE_ONLY, start_system_special },
|
||||
{ "hibernate", VERB_ANY, 1, VERB_ONLINE_ONLY, start_system_special },
|
||||
{ "hybrid-sleep", VERB_ANY, 1, VERB_ONLINE_ONLY, start_system_special },
|
||||
{ "suspend-then-hibernate",VERB_ANY, 1, VERB_ONLINE_ONLY, start_system_special },
|
||||
{ "default", VERB_ANY, 1, VERB_ONLINE_ONLY, start_special },
|
||||
{ "rescue", VERB_ANY, 1, VERB_ONLINE_ONLY, start_system_special },
|
||||
{ "emergency", VERB_ANY, 1, VERB_ONLINE_ONLY, start_system_special },
|
||||
{ "exit", VERB_ANY, 2, VERB_ONLINE_ONLY, start_special },
|
||||
{ "reset-failed", VERB_ANY, VERB_ANY, VERB_ONLINE_ONLY, reset_failed },
|
||||
{ "enable", 2, VERB_ANY, 0, enable_unit },
|
||||
{ "disable", 2, VERB_ANY, 0, enable_unit },
|
||||
{ "is-enabled", 2, VERB_ANY, 0, unit_is_enabled },
|
||||
{ "reenable", 2, VERB_ANY, 0, enable_unit },
|
||||
{ "preset", 2, VERB_ANY, 0, enable_unit },
|
||||
{ "preset-all", VERB_ANY, 1, 0, preset_all },
|
||||
{ "mask", 2, VERB_ANY, 0, enable_unit },
|
||||
{ "unmask", 2, VERB_ANY, 0, enable_unit },
|
||||
{ "link", 2, VERB_ANY, 0, enable_unit },
|
||||
{ "revert", 2, VERB_ANY, 0, enable_unit },
|
||||
{ "switch-root", 2, VERB_ANY, VERB_ONLINE_ONLY, switch_root },
|
||||
{ "list-dependencies", VERB_ANY, VERB_ANY, VERB_ONLINE_ONLY, list_dependencies },
|
||||
{ "set-default", 2, 2, 0, set_default },
|
||||
{ "get-default", VERB_ANY, 1, 0, get_default },
|
||||
{ "set-property", 3, VERB_ANY, VERB_ONLINE_ONLY, set_property },
|
||||
{ "is-system-running", VERB_ANY, 1, 0, is_system_running },
|
||||
{ "add-wants", 3, VERB_ANY, 0, add_dependency },
|
||||
{ "add-requires", 3, VERB_ANY, 0, add_dependency },
|
||||
{ "edit", 2, VERB_ANY, VERB_ONLINE_ONLY, edit },
|
||||
{ "bind", 3, 4, VERB_ONLINE_ONLY, mount_bind },
|
||||
{ "mount-image", 4, 5, VERB_ONLINE_ONLY, mount_image },
|
||||
{ "list-units", VERB_ANY, VERB_ANY, VERB_DEFAULT|VERB_ONLINE_ONLY, verb_list_units },
|
||||
{ "list-unit-files", VERB_ANY, VERB_ANY, 0, verb_list_unit_files },
|
||||
{ "list-sockets", VERB_ANY, VERB_ANY, VERB_ONLINE_ONLY, verb_list_sockets },
|
||||
{ "list-timers", VERB_ANY, VERB_ANY, VERB_ONLINE_ONLY, verb_list_timers },
|
||||
{ "list-jobs", VERB_ANY, VERB_ANY, VERB_ONLINE_ONLY, verb_list_jobs },
|
||||
{ "list-machines", VERB_ANY, VERB_ANY, VERB_ONLINE_ONLY, verb_list_machines },
|
||||
{ "clear-jobs", VERB_ANY, 1, VERB_ONLINE_ONLY, verb_trivial_method },
|
||||
{ "cancel", VERB_ANY, VERB_ANY, VERB_ONLINE_ONLY, verb_cancel },
|
||||
{ "start", 2, VERB_ANY, VERB_ONLINE_ONLY, verb_start },
|
||||
{ "stop", 2, VERB_ANY, VERB_ONLINE_ONLY, verb_start },
|
||||
{ "condstop", 2, VERB_ANY, VERB_ONLINE_ONLY, verb_start }, /* For compatibility with ALTLinux */
|
||||
{ "reload", 2, VERB_ANY, VERB_ONLINE_ONLY, verb_start },
|
||||
{ "restart", 2, VERB_ANY, VERB_ONLINE_ONLY, verb_start },
|
||||
{ "try-restart", 2, VERB_ANY, VERB_ONLINE_ONLY, verb_start },
|
||||
{ "reload-or-restart", VERB_ANY, VERB_ANY, VERB_ONLINE_ONLY, verb_start },
|
||||
{ "reload-or-try-restart", 2, VERB_ANY, VERB_ONLINE_ONLY, verb_start }, /* For compatibility with old systemctl <= 228 */
|
||||
{ "try-reload-or-restart", 2, VERB_ANY, VERB_ONLINE_ONLY, verb_start },
|
||||
{ "force-reload", 2, VERB_ANY, VERB_ONLINE_ONLY, verb_start }, /* For compatibility with SysV */
|
||||
{ "condreload", 2, VERB_ANY, VERB_ONLINE_ONLY, verb_start }, /* For compatibility with ALTLinux */
|
||||
{ "condrestart", 2, VERB_ANY, VERB_ONLINE_ONLY, verb_start }, /* For compatibility with RH */
|
||||
{ "isolate", 2, 2, VERB_ONLINE_ONLY, verb_start },
|
||||
{ "kill", 2, VERB_ANY, VERB_ONLINE_ONLY, verb_kill },
|
||||
{ "clean", 2, VERB_ANY, VERB_ONLINE_ONLY, verb_clean_or_freeze },
|
||||
{ "freeze", 2, VERB_ANY, VERB_ONLINE_ONLY, verb_clean_or_freeze },
|
||||
{ "thaw", 2, VERB_ANY, VERB_ONLINE_ONLY, verb_clean_or_freeze },
|
||||
{ "is-active", 2, VERB_ANY, VERB_ONLINE_ONLY, verb_is_active },
|
||||
{ "check", 2, VERB_ANY, VERB_ONLINE_ONLY, verb_is_active }, /* deprecated alias of is-active */
|
||||
{ "is-failed", 2, VERB_ANY, VERB_ONLINE_ONLY, verb_is_failed },
|
||||
{ "show", VERB_ANY, VERB_ANY, VERB_ONLINE_ONLY, verb_show },
|
||||
{ "cat", 2, VERB_ANY, VERB_ONLINE_ONLY, verb_cat },
|
||||
{ "status", VERB_ANY, VERB_ANY, VERB_ONLINE_ONLY, verb_show },
|
||||
{ "help", VERB_ANY, VERB_ANY, VERB_ONLINE_ONLY, verb_show },
|
||||
{ "daemon-reload", VERB_ANY, 1, VERB_ONLINE_ONLY, verb_daemon_reload },
|
||||
{ "daemon-reexec", VERB_ANY, 1, VERB_ONLINE_ONLY, verb_daemon_reload },
|
||||
{ "log-level", VERB_ANY, 2, VERB_ONLINE_ONLY, verb_log_setting },
|
||||
{ "log-target", VERB_ANY, 2, VERB_ONLINE_ONLY, verb_log_setting },
|
||||
{ "service-log-level", 2, 3, VERB_ONLINE_ONLY, verb_service_log_setting },
|
||||
{ "service-log-target", 2, 3, VERB_ONLINE_ONLY, verb_service_log_setting },
|
||||
{ "service-watchdogs", VERB_ANY, 2, VERB_ONLINE_ONLY, verb_service_watchdogs },
|
||||
{ "show-environment", VERB_ANY, 1, VERB_ONLINE_ONLY, verb_show_environment },
|
||||
{ "set-environment", 2, VERB_ANY, VERB_ONLINE_ONLY, verb_set_environment },
|
||||
{ "unset-environment", 2, VERB_ANY, VERB_ONLINE_ONLY, verb_set_environment },
|
||||
{ "import-environment", VERB_ANY, VERB_ANY, VERB_ONLINE_ONLY, verb_import_environment },
|
||||
{ "halt", VERB_ANY, 1, VERB_ONLINE_ONLY, verb_start_system_special },
|
||||
{ "poweroff", VERB_ANY, 1, VERB_ONLINE_ONLY, verb_start_system_special },
|
||||
{ "reboot", VERB_ANY, 2, VERB_ONLINE_ONLY, verb_start_system_special },
|
||||
{ "kexec", VERB_ANY, 1, VERB_ONLINE_ONLY, verb_start_system_special },
|
||||
{ "suspend", VERB_ANY, 1, VERB_ONLINE_ONLY, verb_start_system_special },
|
||||
{ "hibernate", VERB_ANY, 1, VERB_ONLINE_ONLY, verb_start_system_special },
|
||||
{ "hybrid-sleep", VERB_ANY, 1, VERB_ONLINE_ONLY, verb_start_system_special },
|
||||
{ "suspend-then-hibernate",VERB_ANY, 1, VERB_ONLINE_ONLY, verb_start_system_special },
|
||||
{ "default", VERB_ANY, 1, VERB_ONLINE_ONLY, verb_start_special },
|
||||
{ "rescue", VERB_ANY, 1, VERB_ONLINE_ONLY, verb_start_system_special },
|
||||
{ "emergency", VERB_ANY, 1, VERB_ONLINE_ONLY, verb_start_system_special },
|
||||
{ "exit", VERB_ANY, 2, VERB_ONLINE_ONLY, verb_start_special },
|
||||
{ "reset-failed", VERB_ANY, VERB_ANY, VERB_ONLINE_ONLY, verb_reset_failed },
|
||||
{ "enable", 2, VERB_ANY, 0, verb_enable },
|
||||
{ "disable", 2, VERB_ANY, 0, verb_enable },
|
||||
{ "is-enabled", 2, VERB_ANY, 0, verb_is_enabled },
|
||||
{ "reenable", 2, VERB_ANY, 0, verb_enable },
|
||||
{ "preset", 2, VERB_ANY, 0, verb_enable },
|
||||
{ "preset-all", VERB_ANY, 1, 0, verb_preset_all },
|
||||
{ "mask", 2, VERB_ANY, 0, verb_enable },
|
||||
{ "unmask", 2, VERB_ANY, 0, verb_enable },
|
||||
{ "link", 2, VERB_ANY, 0, verb_enable },
|
||||
{ "revert", 2, VERB_ANY, 0, verb_enable },
|
||||
{ "switch-root", 2, VERB_ANY, VERB_ONLINE_ONLY, verb_switch_root },
|
||||
{ "list-dependencies", VERB_ANY, VERB_ANY, VERB_ONLINE_ONLY, verb_list_dependencies },
|
||||
{ "set-default", 2, 2, 0, verb_set_default },
|
||||
{ "get-default", VERB_ANY, 1, 0, verb_get_default },
|
||||
{ "set-property", 3, VERB_ANY, VERB_ONLINE_ONLY, verb_set_property },
|
||||
{ "is-system-running", VERB_ANY, 1, 0, verb_is_system_running },
|
||||
{ "add-wants", 3, VERB_ANY, 0, verb_add_dependency },
|
||||
{ "add-requires", 3, VERB_ANY, 0, verb_add_dependency },
|
||||
{ "edit", 2, VERB_ANY, VERB_ONLINE_ONLY, verb_edit },
|
||||
{ "bind", 3, 4, VERB_ONLINE_ONLY, verb_bind },
|
||||
{ "mount-image", 4, 5, VERB_ONLINE_ONLY, verb_mount_image },
|
||||
{}
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user