From: Kevin Day Date: Wed, 20 Nov 2019 02:21:26 +0000 (-0600) Subject: Cleanup: fix spelling of occurred. X-Git-Tag: 0.5.0~367 X-Git-Url: https://git.kevux.org/?a=commitdiff_plain;h=1f73f886e7ed6c50faf611366535e11804a99091;p=fll Cleanup: fix spelling of occurred. --- diff --git a/level_1/fl_fss/c/fss.h b/level_1/fl_fss/c/fss.h index 42bd3e1..04e027a 100644 --- a/level_1/fl_fss/c/fss.h +++ b/level_1/fl_fss/c/fss.h @@ -67,7 +67,7 @@ extern "C" { * * @return * fl_fss_no_header if no header is found. - * fl_fss_no_header (with error bit) if the an error occured prior to identifying a valid header. + * fl_fss_no_header (with error bit) if the an error occurred prior to identifying a valid header. * f_invalid_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_fl_fss_identify_ diff --git a/level_2/fll_program/c/program.c b/level_2/fll_program/c/program.c index 985581e..12b7491 100644 --- a/level_2/fll_program/c/program.c +++ b/level_2/fll_program/c/program.c @@ -126,7 +126,7 @@ extern "C" { else { fl_color_print(f_standard_error, context->error, context->reset, "INTERNAL ERROR: An unhandled error ("); fl_color_print(f_standard_error, context->notable, context->reset, "%u", status); - fl_color_print(f_standard_error, context->error, context->reset, ") has occured while calling "); + fl_color_print(f_standard_error, context->error, context->reset, ") has occurred while calling "); fl_color_print(f_standard_error, context->notable, context->reset, "f_console_parameter_process()"); fl_color_print_line(f_standard_error, context->error, context->reset, "."); } diff --git a/level_3/firewall/c/private-firewall.c b/level_3/firewall/c/private-firewall.c index 1f2a748..506e7b9 100644 --- a/level_3/firewall/c/private-firewall.c +++ b/level_3/firewall/c/private-firewall.c @@ -604,7 +604,7 @@ f_return_status firewall_perform_commands(const firewall_local_data local, const fl_color_print_line(f_standard_error, data.context.error, data.context.reset, "CRITICAL ERROR: Unable to allocate memory"); } else { - fl_color_print_line(f_standard_error, data.context.error, data.context.reset, "INTERNAL ERROR: An unhandled error (%u) has occured while calling f_file_open()", status); + fl_color_print_line(f_standard_error, data.context.error, data.context.reset, "INTERNAL ERROR: An unhandled error (%u) has occurred while calling f_file_open()", status); } if (status != f_file_not_found) { @@ -646,7 +646,7 @@ f_return_status firewall_perform_commands(const firewall_local_data local, const fl_color_print_line(f_standard_error, data.context.error, data.context.reset, "CRITICAL ERROR: Unable to allocate memory"); } else { - fl_color_print_line(f_standard_error, data.context.error, data.context.reset, "INTERNAL ERROR: An unhandled error (%u) has occured while calling fl_file_read()", status); + fl_color_print_line(f_standard_error, data.context.error, data.context.reset, "INTERNAL ERROR: An unhandled error (%u) has occurred while calling fl_file_read()", status); } status = f_status_set_error(status); @@ -673,7 +673,7 @@ f_return_status firewall_perform_commands(const firewall_local_data local, const fl_color_print_line(f_standard_error, data.context.error, data.context.reset, "CRITICAL ERROR: Unable to allocate memory"); } else { - fl_color_print_line(f_standard_error, data.context.error, data.context.reset, "INTERNAL ERROR: An unhandled error (%u) has occured while calling fll_fss_basic_read() for the file '%.*s'", status, file_path.used, file_path.string); + fl_color_print_line(f_standard_error, data.context.error, data.context.reset, "INTERNAL ERROR: An unhandled error (%u) has occurred while calling fll_fss_basic_read() for the file '%.*s'", status, file_path.used, file_path.string); } status = f_status_set_error(status); @@ -1117,7 +1117,7 @@ f_return_status firewall_create_custom_chains(firewall_reserved_chains *reserved fl_color_print_line(f_standard_error, data->context.error, data->context.reset, "INTERNAL ERROR: Invalid parameter when calling fll_execute_program()"); } else { - fl_color_print_line(f_standard_error, data->context.error, data->context.reset, "INTERNAL ERROR: An unhandled error (%u) has occured while calling fll_execute_program()", status); + fl_color_print_line(f_standard_error, data->context.error, data->context.reset, "INTERNAL ERROR: An unhandled error (%u) has occurred while calling fll_execute_program()", status); } f_macro_string_dynamics_delete(status2, arguments); @@ -1191,7 +1191,7 @@ f_return_status firewall_delete_chains(const firewall_data data) { fl_color_print_line(f_standard_error, data.context.error, data.context.reset, "INTERNAL ERROR: Invalid parameter when calling fll_execute_program()"); } else { - fl_color_print_line(f_standard_error, data.context.error, data.context.reset, "INTERNAL ERROR: An unhandled error (%u) has occured while calling fll_execute_program()", status); + fl_color_print_line(f_standard_error, data.context.error, data.context.reset, "INTERNAL ERROR: An unhandled error (%u) has occurred while calling fll_execute_program()", status); } return status; @@ -1249,7 +1249,7 @@ f_return_status firewall_delete_chains(const firewall_data data) { fl_color_print_line(f_standard_error, data.context.error, data.context.reset, "INTERNAL ERROR: Invalid parameter when calling fll_execute_program()"); } else { - fl_color_print_line(f_standard_error, data.context.error, data.context.reset, "INTERNAL ERROR: An unhandled error (%u) has occured while calling fll_execute_program()", status); + fl_color_print_line(f_standard_error, data.context.error, data.context.reset, "INTERNAL ERROR: An unhandled error (%u) has occurred while calling fll_execute_program()", status); } return status; @@ -1328,7 +1328,7 @@ f_return_status firewall_default_lock(const firewall_data data) { fl_color_print_line(f_standard_error, data.context.error, data.context.reset, "INTERNAL ERROR: Invalid parameter when calling fll_execute_program()"); } else { - fl_color_print_line(f_standard_error, data.context.error, data.context.reset, "INTERNAL ERROR: An unhandled error (%u) has occured while calling fll_execute_program()", status); + fl_color_print_line(f_standard_error, data.context.error, data.context.reset, "INTERNAL ERROR: An unhandled error (%u) has occurred while calling fll_execute_program()", status); } return status; @@ -1353,7 +1353,7 @@ f_return_status firewall_buffer_rules(const f_string filename, const bool option fl_color_print_line(f_standard_error, data->context.error, data->context.reset, "INTERNAL ERROR: Invalid parameter when calling f_file_open()."); } else if (status != f_file_not_found && status != f_file_error_open && status != f_file_error_descriptor) { - fl_color_print_line(f_standard_error, data->context.error, data->context.reset, "INTERNAL ERROR: An unhandled error (%u) has occured while calling f_file_open().", status); + fl_color_print_line(f_standard_error, data->context.error, data->context.reset, "INTERNAL ERROR: An unhandled error (%u) has occurred while calling f_file_open().", status); } } else { if (status == f_invalid_parameter) { @@ -1369,7 +1369,7 @@ f_return_status firewall_buffer_rules(const f_string filename, const bool option fl_color_print_line(f_standard_error, data->context.error, data->context.reset, "ERROR: File descriptor error while trying to open the file '%s'.", filename); } else { - fl_color_print_line(f_standard_error, data->context.error, data->context.reset, "INTERNAL ERROR: An unhandled error (%u) has occured while calling f_file_open().", status); + fl_color_print_line(f_standard_error, data->context.error, data->context.reset, "INTERNAL ERROR: An unhandled error (%u) has occurred while calling f_file_open().", status); } } @@ -1405,7 +1405,7 @@ f_return_status firewall_buffer_rules(const f_string filename, const bool option fl_color_print_line(f_standard_error, data->context.error, data->context.reset, "CRITICAL ERROR: Unable to allocate memory."); } else { - fl_color_print_line(f_standard_error, data->context.error, data->context.reset, "INTERNAL ERROR: An unhandled error (%u) has occured while calling fl_file_read().", status); + fl_color_print_line(f_standard_error, data->context.error, data->context.reset, "INTERNAL ERROR: An unhandled error (%u) has occurred while calling fl_file_read().", status); } return status; @@ -1431,7 +1431,7 @@ f_return_status firewall_buffer_rules(const f_string filename, const bool option fl_color_print_line(f_standard_error, data->context.error, data->context.reset, "CRITICAL ERROR: Unable to allocate memory."); } else { - fl_color_print_line(f_standard_error, data->context.error, data->context.reset, "INTERNAL ERROR: An unhandled error (%u) has occured while calling fll_fss_basic_list_read() for the file '%s'.", status, filename); + fl_color_print_line(f_standard_error, data->context.error, data->context.reset, "INTERNAL ERROR: An unhandled error (%u) has occurred while calling fll_fss_basic_list_read() for the file '%s'.", status, filename); } return status; @@ -1459,7 +1459,7 @@ f_return_status firewall_process_rules(f_string_location *input, firewall_local_ // the error message has already been displayed. } else { - fl_color_print_line(f_standard_error, data->context.error, data->context.reset, "INTERNAL ERROR: An unhandled error (%u) has occured while calling firewall_perform_commands().", status); + fl_color_print_line(f_standard_error, data->context.error, data->context.reset, "INTERNAL ERROR: An unhandled error (%u) has occurred while calling firewall_perform_commands().", status); } f_macro_fss_objects_delete(status2, local->rule_objects); diff --git a/level_3/init/c/private-init.c b/level_3/init/c/private-init.c index 4fb2d2c..61df077 100644 --- a/level_3/init/c/private-init.c +++ b/level_3/init/c/private-init.c @@ -19,7 +19,7 @@ if (status == f_invalid_parameter) { fl_color_print_line(f_standard_error, data.context.error, data.context.reset, "INTERNAL ERROR: Invalid parameter when calling f_file_open()."); } else if (status != f_file_not_found && status != f_file_error_open && status != f_file_error_descriptor) { - fl_color_print_line(f_standard_error, data.context.error, data.context.reset, "INTERNAL ERROR: An unhandled error (%u) has occured while calling f_file_open().", status); + fl_color_print_line(f_standard_error, data.context.error, data.context.reset, "INTERNAL ERROR: An unhandled error (%u) has occurred while calling f_file_open().", status); } } else { if (status == f_invalid_parameter) { @@ -31,7 +31,7 @@ } else if (status == f_file_error_descriptor) { fl_color_print_line(f_standard_error, data.context.error, data.context.reset, "ERROR: File descriptor error while trying to open the file '%s'.", filename); } else { - fl_color_print_line(f_standard_error, data.context.error, data.context.reset, "INTERNAL ERROR: An unhandled error (%u) has occured while calling f_file_open().", status); + fl_color_print_line(f_standard_error, data.context.error, data.context.reset, "INTERNAL ERROR: An unhandled error (%u) has occurred while calling f_file_open().", status); } } @@ -61,7 +61,7 @@ } else if (status == f_error_allocation || status == f_error_reallocation) { fl_color_print_line(f_standard_error, data.context.error, data.context.reset, "CRITICAL ERROR: Unable to allocate memory."); } else { - fl_color_print_line(f_standard_error, data.context.error, data.context.reset, "INTERNAL ERROR: An unhandled error (%u) has occured while calling fl_file_read().", status); + fl_color_print_line(f_standard_error, data.context.error, data.context.reset, "INTERNAL ERROR: An unhandled error (%u) has occurred while calling fl_file_read().", status); } return f_status_set_error(status); @@ -83,7 +83,7 @@ } else if (status == f_error_allocation || status == f_error_reallocation) { fl_color_print_line(f_standard_error, data.context.error, data.context.reset, "CRITICAL ERROR: Unable to allocate memory."); } else { - fl_color_print_line(f_standard_error, data.context.error, data.context.reset, "INTERNAL ERROR: An unhandled error (%u) has occured while calling fll_fss_basic_list_read() for the file '%s'.", status, filename); + fl_color_print_line(f_standard_error, data.context.error, data.context.reset, "INTERNAL ERROR: An unhandled error (%u) has occurred while calling fll_fss_basic_list_read() for the file '%s'.", status, filename); } return f_status_set_error(status); @@ -112,7 +112,7 @@ } else if (status == f_failure) { // the error message has already been displayed. } else { - fl_color_print_line(f_standard_error, data.context.error, data.context.reset, "INTERNAL ERROR: An unhandled error (%u) has occured while calling firewall_perform_commands().", status); + fl_color_print_line(f_standard_error, data.context.error, data.context.reset, "INTERNAL ERROR: An unhandled error (%u) has occurred while calling firewall_perform_commands().", status); } f_macro_fss_objects_delete(status2, local->rule_objects); @@ -502,7 +502,7 @@ } else if (status == f_error_allocation || status == f_error_reallocation) { fl_color_print_line(f_standard_error, data.context.error, data.context.reset, "CRITICAL ERROR: Unable to allocate memory."); } else { - fl_color_print_line(f_standard_error, data.context.error, data.context.reset, "INTERNAL ERROR: An unhandled error (%u) has occured while calling fll_fss_basic_list_read() for the file '%s'.", status, init_rule_core_file); + fl_color_print_line(f_standard_error, data.context.error, data.context.reset, "INTERNAL ERROR: An unhandled error (%u) has occurred while calling fll_fss_basic_list_read() for the file '%s'.", status, init_rule_core_file); } f_macro_string_dynamic_delete(buffer); @@ -530,7 +530,7 @@ fl_color_print_line(f_standard_error, data.context.error, data.context.reset, "CRITICAL ERROR: Unable to allocate memory."); } else { - fl_color_print_line(f_standard_error, data.context.error, data.context.reset, "INTERNAL ERROR: An unhandled error (%u) has occured while calling init_load_main_rule().", status); + fl_color_print_line(f_standard_error, data.context.error, data.context.reset, "INTERNAL ERROR: An unhandled error (%u) has occurred while calling init_load_main_rule().", status); } // @todo: init_delete_data((*data)); @@ -558,7 +558,7 @@ } else if (status == f_failure) { // the error message has already been displayed. } else { - fl_color_print_line(f_standard_error, data.context.error, data.context.reset, "INTERNAL ERROR: An unhandled error (%u) has occured while calling firewall_perform_commands().", status); + fl_color_print_line(f_standard_error, data.context.error, data.context.reset, "INTERNAL ERROR: An unhandled error (%u) has occurred while calling firewall_perform_commands().", status); } f_macro_fss_objects_delete(status2, (*rule_objects)); @@ -571,7 +571,7 @@ fl_color_print_line(f_standard_error, context.error, context.reset, "CRITICAL ERROR: Unable to allocate memory."); } else { - fl_color_print_line(f_standard_error, context.error, context.reset, "INTERNAL ERROR: An unhandled error (%u) has occured while calling init_load_main_rule().", status); + fl_color_print_line(f_standard_error, context.error, context.reset, "INTERNAL ERROR: An unhandled error (%u) has occurred while calling init_load_main_rule().", status); } }