From a0f45f1f4785c762c95ebb551954fb29521e54e0 Mon Sep 17 00:00:00 2001 From: Kevin Day Date: Sun, 31 Oct 2021 00:06:23 -0500 Subject: [PATCH] Cleanup: Fix spelling of "interruptible" and "uninterruptible". --- level_3/controller/c/controller.c | 18 +++++++++--------- level_3/controller/c/controller.h | 16 ++++++++-------- level_3/controller/c/private-common.h | 4 ++-- level_3/controller/c/private-thread.c | 4 ++-- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/level_3/controller/c/controller.c b/level_3/controller/c/controller.c index fc74525..4a6a203 100644 --- a/level_3/controller/c/controller.c +++ b/level_3/controller/c/controller.c @@ -32,11 +32,11 @@ extern "C" { fll_program_print_help_option(main.output.to, main.context, controller_short_control_s, controller_long_control_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Specify a custom control group file path, such as '" F_control_group_path_system_prefix_s F_control_group_path_system_default_s "'."); fll_program_print_help_option(main.output.to, main.context, controller_short_daemon_s, controller_long_daemon_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Run in daemon only mode (do not process the entry)."); fll_program_print_help_option(main.output.to, main.context, controller_short_init_s, controller_long_init_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " The program will run as an init replacement."); - fll_program_print_help_option(main.output.to, main.context, controller_short_interruptable_s, controller_long_interruptable_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Designate that this program can be interrupted by a signal."); + fll_program_print_help_option(main.output.to, main.context, controller_short_interruptible_s, controller_long_interruptible_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Designate that this program can be interrupted by a signal."); fll_program_print_help_option(main.output.to, main.context, controller_short_pid_s, controller_long_pid_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Specify a custom pid file path, such as '" controller_path_pid_s CONTROLLER_default_s controller_path_suffix_s "'."); fll_program_print_help_option(main.output.to, main.context, controller_short_settings_s, controller_long_settings_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Specify a custom settings path, such as '" controller_path_settings_s "'."); fll_program_print_help_option(main.output.to, main.context, controller_short_simulate_s, controller_long_simulate_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Run as a simulation."); - fll_program_print_help_option(main.output.to, main.context, controller_short_uninterruptable_s, controller_long_uninterruptable_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, "Designate that this program cannot be interrupted by a signal."); + fll_program_print_help_option(main.output.to, main.context, controller_short_uninterruptible_s, controller_long_uninterruptible_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, "Designate that this program cannot be interrupted by a signal."); fll_program_print_help_option(main.output.to, main.context, controller_short_validate_s, controller_long_validate_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Validate the settings (entry and rules) without running (does not simulate)."); fll_program_print_help_usage(main.output.to, main.context, main.program_name, "entry"); @@ -44,7 +44,7 @@ extern "C" { fl_print_format(" When both the %[%s%s%] parameter and the", main.output.to.stream, main.context.set.notable, f_console_symbol_long_enable_s, controller_long_simulate_s, main.context.set.notable); fl_print_format(" %[%s%s%] parameter are specified, then additional information on each would be executed rule is printed but no simulation is performed.%c%c", main.output.to.stream, main.context.set.notable, f_console_symbol_long_enable_s, controller_long_validate_s, main.context.set.notable, f_string_eol_s[0], f_string_eol_s[0]); - fl_print_format(" The default interrupt behavior is to operate as if the %[%s%s%] parameter is passed.%c%c", main.output.to.stream, main.context.set.notable, f_console_symbol_long_enable_s, main.setting_default.used ? controller_long_uninterruptable_s : controller_long_interruptable_s, main.context.set.notable, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" The default interrupt behavior is to operate as if the %[%s%s%] parameter is passed.%c%c", main.output.to.stream, main.context.set.notable, f_console_symbol_long_enable_s, main.setting_default.used ? controller_long_uninterruptible_s : controller_long_interruptible_s, main.context.set.notable, f_string_eol_s[0], f_string_eol_s[0]); fl_print_format(" Specify an empty string for the %[%s%s%] parameter to disable pid file creation for this program.%c%c", main.output.to.stream, main.context.set.notable, f_console_symbol_long_enable_s, controller_long_pid_s, main.context.set.notable, f_string_eol_s[0], f_string_eol_s[0]); @@ -345,19 +345,19 @@ extern "C" { setting.entry.pid = controller_entry_pid_disable; setting.entry.show = controller_entry_show_init; - if (main->parameters[controller_parameter_interruptable].result == f_console_result_found) { - setting.interruptable = F_true; + if (main->parameters[controller_parameter_interruptible].result == f_console_result_found) { + setting.interruptible = F_true; } else { - setting.interruptable = F_false; + setting.interruptible = F_false; } } else { - if (main->parameters[controller_parameter_uninterruptable].result == f_console_result_found) { - setting.interruptable = F_false; + if (main->parameters[controller_parameter_uninterruptible].result == f_console_result_found) { + setting.interruptible = F_false; } else { - setting.interruptable = F_true; + setting.interruptible = F_true; } } diff --git a/level_3/controller/c/controller.h b/level_3/controller/c/controller.h index 8897ad3..ec535d5 100644 --- a/level_3/controller/c/controller.h +++ b/level_3/controller/c/controller.h @@ -151,21 +151,21 @@ extern "C" { #define controller_short_control_s "c" #define controller_short_daemon_s "d" #define controller_short_init_s "I" - #define controller_short_interruptable_s "i" + #define controller_short_interruptible_s "i" #define controller_short_pid_s "p" #define controller_short_settings_s "s" #define controller_short_simulate_s "S" - #define controller_short_uninterruptable_s "U" + #define controller_short_uninterruptible_s "U" #define controller_short_validate_s "v" #define controller_long_control_s "control" #define controller_long_daemon_s "daemon" #define controller_long_init_s "init" - #define controller_long_interruptable_s "interruptable" + #define controller_long_interruptible_s "interruptible" #define controller_long_pid_s "pid" #define controller_long_settings_s "settings" #define controller_long_simulate_s "simulate" - #define controller_long_uninterruptable_s "uninterruptable" + #define controller_long_uninterruptible_s "uninterruptible" #define controller_long_validate_s "validate" enum { @@ -182,11 +182,11 @@ extern "C" { controller_parameter_control, controller_parameter_daemon, controller_parameter_init, - controller_parameter_interruptable, + controller_parameter_interruptible, controller_parameter_pid, controller_parameter_settings, controller_parameter_simulate, - controller_parameter_uninterruptable, + controller_parameter_uninterruptible, controller_parameter_validate, }; @@ -204,11 +204,11 @@ extern "C" { f_console_parameter_t_initialize(controller_short_control_s, controller_long_control_s, 0, 1, f_console_type_normal), \ f_console_parameter_t_initialize(controller_short_daemon_s, controller_long_daemon_s, 0, 0, f_console_type_normal), \ f_console_parameter_t_initialize(controller_short_init_s, controller_long_init_s, 0, 0, f_console_type_normal), \ - f_console_parameter_t_initialize(controller_short_interruptable_s, controller_long_interruptable_s, 0, 0, f_console_type_normal), \ + f_console_parameter_t_initialize(controller_short_interruptible_s, controller_long_interruptible_s, 0, 0, f_console_type_normal), \ f_console_parameter_t_initialize(controller_short_pid_s, controller_long_pid_s, 0, 1, f_console_type_normal), \ f_console_parameter_t_initialize(controller_short_settings_s, controller_long_settings_s, 0, 1, f_console_type_normal), \ f_console_parameter_t_initialize(controller_short_simulate_s, controller_long_simulate_s, 0, 0, f_console_type_normal), \ - f_console_parameter_t_initialize(controller_short_uninterruptable_s, controller_long_uninterruptable_s, 0, 0, f_console_type_normal), \ + f_console_parameter_t_initialize(controller_short_uninterruptible_s, controller_long_uninterruptible_s, 0, 0, f_console_type_normal), \ f_console_parameter_t_initialize(controller_short_validate_s, controller_long_validate_s, 0, 0, f_console_type_normal), \ } diff --git a/level_3/controller/c/private-common.h b/level_3/controller/c/private-common.h index 0ed001a..e5d7a36 100644 --- a/level_3/controller/c/private-common.h +++ b/level_3/controller/c/private-common.h @@ -1445,7 +1445,7 @@ extern "C" { * - program: Run as a program, exiting when finished prrocess entry (and any respective exit). * - service: Run as a service, listening for requests after processing entry. * - * interruptable: TRUE if the program responds to interrupt signals, FALSE to block/ignore interrupt signals. + * interruptible: TRUE if the program responds to interrupt signals, FALSE to block/ignore interrupt signals. * ready: State representing if the settings are all loaded and is ready to run program operations. * failsafe_enabled: TRUE if failsafe execution is enabled, FALSE otherwise. * failsafe_item_id: The Entry Item ID to execute when failsafe execution is enabled. @@ -1471,7 +1471,7 @@ extern "C" { }; typedef struct { - bool interruptable; + bool interruptible; bool pid_created; uint8_t ready; uint8_t mode; diff --git a/level_3/controller/c/private-thread.c b/level_3/controller/c/private-thread.c index 10451d8..3812f51 100644 --- a/level_3/controller/c/private-thread.c +++ b/level_3/controller/c/private-thread.c @@ -354,7 +354,7 @@ extern "C" { controller_main_t *main = (controller_main_t *) process->main_data; controller_setting_t *setting = (controller_setting_t *) process->main_setting; - if (setting->interruptable) { + if (setting->interruptible) { f_signal_mask(SIG_UNBLOCK, &main->signal.set, 0); f_signal_close(&main->signal); } @@ -991,7 +991,7 @@ extern "C" { if (errno == EAGAIN) continue; } - if (global->setting->interruptable) { + if (global->setting->interruptible) { if (information.si_signo == F_signal_interrupt || information.si_signo == F_signal_abort || information.si_signo == F_signal_quit || information.si_signo == F_signal_termination) { global->thread->signal = information.si_signo; -- 1.8.3.1