From 26956d8fd3b07e90b34daf8b2874646c572ddf16 Mon Sep 17 00:00:00 2001 From: Kevin Day Date: Sat, 2 May 2020 11:07:19 -0500 Subject: [PATCH] Update: at f_array_too_large status and don't include terminating NULL in string lengths Just like f_string_too_large, there needs to be a generic f_array_too_large to report that the array is larger than can be supported. Also provide an f_array_max_size #define just like f_string_max_size. The #define string lengths shouldn't include the terminating NULL. This will prevent having to remove the NULL when converting to/from null-agnostic to null-aware designs. --- level_0/f_status/c/status.h | 4 + level_0/f_type/c/type.h | 6 +- level_1/fl_status/c/status.c | 6 + level_1/fl_status/c/status.h | 451 +++++++++++++++++++++-------------------- level_2/fll_fss/c/fss_status.h | 28 +-- level_2/fll_status/c/status.c | 7 + 6 files changed, 263 insertions(+), 239 deletions(-) diff --git a/level_0/f_status/c/status.h b/level_0/f_status/c/status.h index e3b57d4..bca64ac 100644 --- a/level_0/f_status/c/status.h +++ b/level_0/f_status/c/status.h @@ -328,6 +328,10 @@ extern "C" { f_access_denied_write, #endif // _di_f_status_access_denied_ + #ifndef _di_f_status_array_ + f_array_too_large, + #endif // _di_f_status_array_ + // Required. f_status_code_last }; // enum diff --git a/level_0/f_type/c/type.h b/level_0/f_type/c/type.h index 2cbf88c..6a253ea 100644 --- a/level_0/f_type/c/type.h +++ b/level_0/f_type/c/type.h @@ -186,9 +186,11 @@ extern "C" { /** * Defines a variable to be used by arrays. */ -#ifndef _di_f_array_length_ +#ifndef _di_f_array_ typedef f_number_unsigned f_array_length; -#endif // _di_f_array_length_ + + #define f_array_max_size f_type_number_size_unsigned +#endif // _di_f_array_ /** * GCC-specific features. diff --git a/level_1/fl_status/c/status.c b/level_1/fl_status/c/status.c index 5aef397..a457912 100644 --- a/level_1/fl_status/c/status.c +++ b/level_1/fl_status/c/status.c @@ -722,6 +722,12 @@ extern "C" { break; #endif // _di_fl_status_access_denied_ + #ifndef _di_fl_status_array_ + case f_array_too_large: + *string = fl_status_string_array_too_large; + break; + #endif // _di_fl_status_array_ + case f_status_code_last: *string = fl_status_string_status_code_last; break; diff --git a/level_1/fl_status/c/status.h b/level_1/fl_status/c/status.h index 0772713..232ffeb 100644 --- a/level_1/fl_status/c/status.h +++ b/level_1/fl_status/c/status.h @@ -23,702 +23,707 @@ extern "C" { #ifndef _di_fl_status_string_ #ifndef _di_fl_status_booleans_ #define fl_status_string_false "f_false" - #define fl_status_string_false_length 8 + #define fl_status_string_false_length 7 #define fl_status_string_true "f_true" - #define fl_status_string_true_length 7 + #define fl_status_string_true_length 6 #endif // _di_fl_status_booleans_ #ifndef _di_fl_status_signals_ #define fl_status_string_signal_hangup "f_signal_hangup" - #define fl_status_string_signal_hangup_length 16 + #define fl_status_string_signal_hangup_length 15 #define fl_status_string_signal_interrupt "f_signal_interrupt" - #define fl_status_string_signal_interrupt_length 19 + #define fl_status_string_signal_interrupt_length 18 #define fl_status_string_signal_quit "f_signal_quit" - #define fl_status_string_signal_quit_length 14 + #define fl_status_string_signal_quit_length 13 #define fl_status_string_signal_illegal "f_signal_illegal" - #define fl_status_string_signal_illegal_length 17 + #define fl_status_string_signal_illegal_length 16 #define fl_status_string_signal_trap "f_signal_trap" - #define fl_status_string_signal_trap_length 14 + #define fl_status_string_signal_trap_length 13 #define fl_status_string_signal_abort "f_signal_abort" - #define fl_status_string_signal_abort_length 15 + #define fl_status_string_signal_abort_length 14 #define fl_status_string_signal_bus_error "f_signal_bus_error" - #define fl_status_string_signal_bus_error_length 18 + #define fl_status_string_signal_bus_error_length 17 #define fl_status_string_signal_floating_point_exception "f_signal_floating_point_exception" - #define fl_status_string_signal_floating_point_exception_length 34 + #define fl_status_string_signal_floating_point_exception_length 33 #define fl_status_string_signal_kill "f_signal_kill" - #define fl_status_string_signal_kill_length 14 + #define fl_status_string_signal_kill_length 13 #define fl_status_string_signal_user_1 "f_signal_user_1" - #define fl_status_string_signal_user_1_length 16 + #define fl_status_string_signal_user_1_length 15 #define fl_status_string_signal_segmentation_fault "f_signal_segmentation_fault" - #define fl_status_string_signal_segmentation_fault_length 28 + #define fl_status_string_signal_segmentation_fault_length 27 #define fl_status_string_signal_user_2 "f_signal_user_2" - #define fl_status_string_signal_user_2_length 16 + #define fl_status_string_signal_user_2_length 15 #define fl_status_string_signal_broken_pipe "f_signal_broken_pipe" - #define fl_status_string_signal_broken_pipe_length 21 + #define fl_status_string_signal_broken_pipe_length 20 #define fl_status_string_signal_alarm_clock "f_signal_alarm_clock" - #define fl_status_string_signal_alarm_clock_length 21 + #define fl_status_string_signal_alarm_clock_length 20 #define fl_status_string_signal_termination "f_signal_termination" - #define fl_status_string_signal_termination_length 21 + #define fl_status_string_signal_termination_length 20 #define fl_status_string_signal_stack_fault "f_signal_stack_fault" - #define fl_status_string_signal_stack_fault_length 21 + #define fl_status_string_signal_stack_fault_length 20 #define fl_status_string_signal_child "f_signal_child" - #define fl_status_string_signal_child_length 15 + #define fl_status_string_signal_child_length 14 #define fl_status_string_signal_continue "f_signal_continue" - #define fl_status_string_signal_continue_length 18 + #define fl_status_string_signal_continue_length 17 #define fl_status_string_signal_stop "f_signal_stop" - #define fl_status_string_signal_stop_length 14 + #define fl_status_string_signal_stop_length 13 #define fl_status_string_signal_keyboard_stop "f_signal_keyboard_stop" - #define fl_status_string_signal_keyboard_stop_length 23 + #define fl_status_string_signal_keyboard_stop_length 22 #define fl_status_string_signal_tty_in "f_signal_tty_in" - #define fl_status_string_signal_tty_in_length 16 + #define fl_status_string_signal_tty_in_length 15 #define fl_status_string_signal_tty_out "f_signal_tty_out" - #define fl_status_string_signal_tty_out_length 17 + #define fl_status_string_signal_tty_out_length 16 #define fl_status_string_signal_urgent "f_signal_urgent" - #define fl_status_string_signal_urgent_length 16 + #define fl_status_string_signal_urgent_length 15 #define fl_status_string_signal_cpu_limit "f_signal_cpu_limit" - #define fl_status_string_signal_cpu_limit_length 19 + #define fl_status_string_signal_cpu_limit_length 18 #define fl_status_string_signal_file_size_limit "f_signal_file_size_limit" - #define fl_status_string_signal_file_size_limit_length 25 + #define fl_status_string_signal_file_size_limit_length 24 #define fl_status_string_signal_virtual_alarm_clock "f_signal_virtual_alarm_clock" - #define fl_status_string_signal_virtual_alarm_clock_length 29 + #define fl_status_string_signal_virtual_alarm_clock_length 28 #define fl_status_string_signal_profile_alarm_clock "f_signal_profile_alarm_clock" - #define fl_status_string_signal_profile_alarm_clock_length 29 + #define fl_status_string_signal_profile_alarm_clock_length 28 #define fl_status_string_signal_window_size_change "f_signal_window_size_change" - #define fl_status_string_signal_window_size_change_length 28 + #define fl_status_string_signal_window_size_change_length 27 #define fl_status_string_signal_pollable_event "f_signal_pollable_event" - #define fl_status_string_signal_pollable_event_length 24 + #define fl_status_string_signal_pollable_event_length 23 #define fl_status_string_signal_power_failure "f_signal_power_failure" - #define fl_status_string_signal_power_failure_length 23 + #define fl_status_string_signal_power_failure_length 22 #define fl_status_string_signal_bad_system_call "f_signal_bad_system_call" - #define fl_status_string_signal_bad_system_call_length 25 + #define fl_status_string_signal_bad_system_call_length 24 #define fl_status_string_signal_reserved_32 "f_signal_reserved_32" - #define fl_status_string_signal_reserved_32_length 21 + #define fl_status_string_signal_reserved_32_length 20 #define fl_status_string_signal_reserved_33 "f_signal_reserved_33" - #define fl_status_string_signal_reserved_33_length 21 + #define fl_status_string_signal_reserved_33_length 20 #define fl_status_string_signal_reserved_34 "f_signal_reserved_34" - #define fl_status_string_signal_reserved_34_length 21 + #define fl_status_string_signal_reserved_34_length 20 #define fl_status_string_signal_reserved_35 "f_signal_reserved_35" - #define fl_status_string_signal_reserved_35_length 21 + #define fl_status_string_signal_reserved_35_length 20 #define fl_status_string_signal_reserved_36 "f_signal_reserved_36" - #define fl_status_string_signal_reserved_36_length 21 + #define fl_status_string_signal_reserved_36_length 20 #define fl_status_string_signal_reserved_37 "f_signal_reserved_37" - #define fl_status_string_signal_reserved_37_length 21 + #define fl_status_string_signal_reserved_37_length 20 #define fl_status_string_signal_reserved_38 "f_signal_reserved_38" - #define fl_status_string_signal_reserved_38_length 21 + #define fl_status_string_signal_reserved_38_length 20 #define fl_status_string_signal_reserved_39 "f_signal_reserved_39" - #define fl_status_string_signal_reserved_39_length 21 + #define fl_status_string_signal_reserved_39_length 20 #define fl_status_string_signal_reserved_40 "f_signal_reserved_40" - #define fl_status_string_signal_reserved_40_length 21 + #define fl_status_string_signal_reserved_40_length 20 #define fl_status_string_signal_reserved_41 "f_signal_reserved_41" - #define fl_status_string_signal_reserved_41_length 21 + #define fl_status_string_signal_reserved_41_length 20 #define fl_status_string_signal_reserved_42 "f_signal_reserved_42" - #define fl_status_string_signal_reserved_42_length 21 + #define fl_status_string_signal_reserved_42_length 20 #define fl_status_string_signal_reserved_43 "f_signal_reserved_43" - #define fl_status_string_signal_reserved_43_length 21 + #define fl_status_string_signal_reserved_43_length 20 #define fl_status_string_signal_reserved_44 "f_signal_reserved_44" - #define fl_status_string_signal_reserved_44_length 21 + #define fl_status_string_signal_reserved_44_length 20 #define fl_status_string_signal_reserved_45 "f_signal_reserved_45" - #define fl_status_string_signal_reserved_45_length 21 + #define fl_status_string_signal_reserved_45_length 20 #define fl_status_string_signal_reserved_46 "f_signal_reserved_46" - #define fl_status_string_signal_reserved_46_length 21 + #define fl_status_string_signal_reserved_46_length 20 #define fl_status_string_signal_reserved_47 "f_signal_reserved_47" - #define fl_status_string_signal_reserved_47_length 21 + #define fl_status_string_signal_reserved_47_length 20 #define fl_status_string_signal_reserved_48 "f_signal_reserved_48" - #define fl_status_string_signal_reserved_48_length 21 + #define fl_status_string_signal_reserved_48_length 20 #define fl_status_string_signal_reserved_49 "f_signal_reserved_49" - #define fl_status_string_signal_reserved_49_length 21 + #define fl_status_string_signal_reserved_49_length 20 #define fl_status_string_signal_reserved_50 "f_signal_reserved_50" - #define fl_status_string_signal_reserved_50_length 21 + #define fl_status_string_signal_reserved_50_length 20 #define fl_status_string_signal_reserved_51 "f_signal_reserved_51" - #define fl_status_string_signal_reserved_51_length 21 + #define fl_status_string_signal_reserved_51_length 20 #define fl_status_string_signal_reserved_52 "f_signal_reserved_52" - #define fl_status_string_signal_reserved_52_length 21 + #define fl_status_string_signal_reserved_52_length 20 #define fl_status_string_signal_reserved_53 "f_signal_reserved_53" - #define fl_status_string_signal_reserved_53_length 21 + #define fl_status_string_signal_reserved_53_length 20 #define fl_status_string_signal_reserved_54 "f_signal_reserved_54" - #define fl_status_string_signal_reserved_54_length 21 + #define fl_status_string_signal_reserved_54_length 20 #define fl_status_string_signal_reserved_55 "f_signal_reserved_55" - #define fl_status_string_signal_reserved_55_length 21 + #define fl_status_string_signal_reserved_55_length 20 #define fl_status_string_signal_reserved_56 "f_signal_reserved_56" - #define fl_status_string_signal_reserved_56_length 21 + #define fl_status_string_signal_reserved_56_length 20 #define fl_status_string_signal_reserved_57 "f_signal_reserved_57" - #define fl_status_string_signal_reserved_57_length 21 + #define fl_status_string_signal_reserved_57_length 20 #define fl_status_string_signal_reserved_58 "f_signal_reserved_58" - #define fl_status_string_signal_reserved_58_length 21 + #define fl_status_string_signal_reserved_58_length 20 #define fl_status_string_signal_reserved_59 "f_signal_reserved_59" - #define fl_status_string_signal_reserved_59_length 21 + #define fl_status_string_signal_reserved_59_length 20 #define fl_status_string_signal_reserved_60 "f_signal_reserved_60" - #define fl_status_string_signal_reserved_60_length 21 + #define fl_status_string_signal_reserved_60_length 20 #define fl_status_string_signal_reserved_61 "f_signal_reserved_61" - #define fl_status_string_signal_reserved_61_length 21 + #define fl_status_string_signal_reserved_61_length 20 #define fl_status_string_signal_reserved_62 "f_signal_reserved_62" - #define fl_status_string_signal_reserved_62_length 21 + #define fl_status_string_signal_reserved_62_length 20 #define fl_status_string_signal_reserved_63 "f_signal_reserved_63" - #define fl_status_string_signal_reserved_63_length 21 + #define fl_status_string_signal_reserved_63_length 20 #define fl_status_string_signal_reserved_64 "f_signal_reserved_64" - #define fl_status_string_signal_reserved_64_length 21 + #define fl_status_string_signal_reserved_64_length 20 #endif // _di_fl_status_signals_ #ifndef _di_fl_status_basic_ #define fl_status_string_none "f_none" - #define fl_status_string_none_length 7 + #define fl_status_string_none_length 6 #define fl_status_string_maybe "f_maybe" - #define fl_status_string_maybe_length 8 + #define fl_status_string_maybe_length 7 #define fl_status_string_dummy "f_dummy" - #define fl_status_string_dummy_length 8 + #define fl_status_string_dummy_length 7 #define fl_status_string_warn "f_warn" - #define fl_status_string_warn_length 7 + #define fl_status_string_warn_length 6 #define fl_status_string_critical "f_critical" - #define fl_status_string_critical_length 11 + #define fl_status_string_critical_length 10 #define fl_status_string_unknown "f_unknown" - #define fl_status_string_unknown_length 10 + #define fl_status_string_unknown_length 9 #define fl_status_string_unsupported "f_unsupported" - #define fl_status_string_unsupported_length 14 + #define fl_status_string_unsupported_length 13 #define fl_status_string_no_data "f_no_data" - #define fl_status_string_no_data_length 10 + #define fl_status_string_no_data_length 9 #define fl_status_string_out_of_memory "f_out_of_memory" - #define fl_status_string_out_of_memory_length 16 + #define fl_status_string_out_of_memory_length 15 #define fl_status_string_input_error "f_error_input" - #define fl_status_string_input_error_length 14 + #define fl_status_string_input_error_length 13 #define fl_status_string_output_error "f_error_output" - #define fl_status_string_output_error_length 15 + #define fl_status_string_output_error_length 14 #define fl_status_string_input_output_error "f_error_input_output" - #define fl_status_string_input_output_error_length 21 + #define fl_status_string_input_output_error_length 20 #define fl_status_string_does_not_exist "f_does_not_exist" - #define fl_status_string_does_not_exist_length 17 + #define fl_status_string_does_not_exist_length 16 #define fl_status_string_not_connected "f_not_connected" - #define fl_status_string_not_connected_length 16 + #define fl_status_string_not_connected_length 15 #define fl_status_string_failure "f_failure" - #define fl_status_string_failure_length 10 + #define fl_status_string_failure_length 9 #define fl_status_string_interrupted "f_interrupted" - #define fl_status_string_interrupted_length 14 + #define fl_status_string_interrupted_length 13 #define fl_status_string_loop "f_loop" - #define fl_status_string_loop_length 7 + #define fl_status_string_loop_length 6 #define fl_status_string_incomplete "f_incomplete" - #define fl_status_string_incomplete_length 13 + #define fl_status_string_incomplete_length 12 #endif // _di_fl_status_basic_ #ifndef _di_fl_status_invalid_ #define fl_status_string_invalid "f_invalid" - #define fl_status_string_invalid_length 10 + #define fl_status_string_invalid_length 9 #define fl_status_string_invalid_name "f_invalid_name" - #define fl_status_string_invalid_name_length 15 + #define fl_status_string_invalid_name_length 14 #define fl_status_string_invalid_parameter "f_invalid_parameter" - #define fl_status_string_invalid_parameter_length 20 + #define fl_status_string_invalid_parameter_length 19 #define fl_status_string_invalid_syntax "f_invalid_syntax" - #define fl_status_string_invalid_syntax_length 17 + #define fl_status_string_invalid_syntax_length 16 #define fl_status_string_invalid_data "f_invalid_data" - #define fl_status_string_invalid_data_length 15 + #define fl_status_string_invalid_data_length 14 #define fl_status_string_invalid_file "f_invalid_file" - #define fl_status_string_invalid_file_length 15 + #define fl_status_string_invalid_file_length 14 #define fl_status_string_invalid_directory "f_invalid_directory" - #define fl_status_string_invalid_directory_length 20 + #define fl_status_string_invalid_directory_length 19 #define fl_status_string_invalid_descriptor "f_invalid_descriptor" - #define fl_status_string_invalid_descriptor_length 21 + #define fl_status_string_invalid_descriptor_length 20 #define fl_status_string_invalid_socket "f_invalid_socket" - #define fl_status_string_invalid_socket_length 17 + #define fl_status_string_invalid_socket_length 16 #define fl_status_string_invalid_device "f_invalid_device" - #define fl_status_string_invalid_device_length 17 + #define fl_status_string_invalid_device_length 16 #define fl_status_string_invalid_link "f_invalid_link" - #define fl_status_string_invalid_link_length 15 + #define fl_status_string_invalid_link_length 14 #define fl_status_string_invalid_pipe "f_invalid_pipe" - #define fl_status_string_invalid_pipe_length 15 + #define fl_status_string_invalid_pipe_length 14 #define fl_status_string_invalid_address "f_invalid_address" - #define fl_status_string_invalid_address_length 18 + #define fl_status_string_invalid_address_length 17 #define fl_status_string_invalid_port "f_invalid_port" - #define fl_status_string_invalid_port_length 15 + #define fl_status_string_invalid_port_length 14 #define fl_status_string_invalid_value "f_invalid_value" - #define fl_status_string_invalid_value_length 16 + #define fl_status_string_invalid_value_length 15 #define fl_status_string_invalid_buffer "f_invalid_buffer" - #define fl_status_string_invalid_buffer_length 17 + #define fl_status_string_invalid_buffer_length 16 #define fl_status_string_invalid_process "f_invalid_process" - #define fl_status_string_invalid_process_length 18 + #define fl_status_string_invalid_process_length 17 #define fl_status_string_invalid_utf "f_invalid_utf" - #define fl_status_string_invalid_utf_length 14 + #define fl_status_string_invalid_utf_length 13 #define fl_status_string_invalid_on_eof "f_invalid_on_eof" - #define fl_status_string_invalid_on_eof_length 17 + #define fl_status_string_invalid_on_eof_length 16 #define fl_status_string_invalid_on_eol "f_invalid_on_eol" - #define fl_status_string_invalid_on_eol_length 17 + #define fl_status_string_invalid_on_eol_length 16 #define fl_status_string_invalid_on_eos "f_invalid_on_eos" - #define fl_status_string_invalid_on_eos_length 17 + #define fl_status_string_invalid_on_eos_length 16 #define fl_status_string_invalid_on_stop "f_invalid_on_stop" - #define fl_status_string_invalid_on_stop_length 18 + #define fl_status_string_invalid_on_stop_length 17 #endif // _di_fl_status_invalid_ #ifndef _di_fl_status_busy_ #define fl_status_string_busy "f_busy" - #define fl_status_string_busy_length 7 + #define fl_status_string_busy_length 6 #define fl_status_string_busy_address "f_busy_address" - #define fl_status_string_busy_address_length 15 + #define fl_status_string_busy_address_length 14 #define fl_status_string_busy_port "f_busy_port" - #define fl_status_string_busy_port_length 12 + #define fl_status_string_busy_port_length 11 #define fl_status_string_busy_socket "f_busy_socket" - #define fl_status_string_busy_socket_length 14 + #define fl_status_string_busy_socket_length 13 #define fl_status_string_busy_device "f_busy_device" - #define fl_status_string_busy_device_length 14 + #define fl_status_string_busy_device_length 13 #define fl_status_string_busy_pipe "f_busy_pipe" - #define fl_status_string_busy_pipe_length 12 + #define fl_status_string_busy_pipe_length 11 #define fl_status_string_busy_buffer "f_busy_buffer" - #define fl_status_string_busy_buffer_length 14 + #define fl_status_string_busy_buffer_length 13 #define fl_status_string_busy_process "f_busy_process" - #define fl_status_string_busy_process_length 15 + #define fl_status_string_busy_process_length 14 #endif // _di_fl_status_busy_ #ifndef _di_fl_status_unavailable_ #define fl_status_string_unavailable "f_unavailable" - #define fl_status_string_unavailable_length 14 + #define fl_status_string_unavailable_length 13 #define fl_status_string_unavailable_address "f_unavailable_address" - #define fl_status_string_unavailable_address_length 22 + #define fl_status_string_unavailable_address_length 21 #define fl_status_string_unavailable_port "f_unavailable_port" - #define fl_status_string_unavailable_port_length 19 + #define fl_status_string_unavailable_port_length 18 #define fl_status_string_unavailable_socket "f_unavailable_socket" - #define fl_status_string_unavailable_socket_length 21 + #define fl_status_string_unavailable_socket_length 20 #define fl_status_string_unavailable_device "f_unavailable_device" - #define fl_status_string_unavailable_device_length 21 + #define fl_status_string_unavailable_device_length 20 #define fl_status_string_unavailable_pipe "f_unavailable_pipe" - #define fl_status_string_unavailable_pipe_length 19 + #define fl_status_string_unavailable_pipe_length 18 #define fl_status_string_unavailable_buffer "f_unavailable_buffer" - #define fl_status_string_unavailable_buffer_length 21 + #define fl_status_string_unavailable_buffer_length 20 #define fl_status_string_unavailable_process "f_unavailable_process" - #define fl_status_string_unavailable_process_length 22 + #define fl_status_string_unavailable_process_length 21 #endif // _di_fl_status_unavailable_ #ifndef _di_fl_status_digits_ #define fl_status_string_underflow "f_number_underflow" - #define fl_status_string_underflow_length 19 + #define fl_status_string_underflow_length 18 #define fl_status_string_overflow "f_number_overflow" - #define fl_status_string_overflow_length 18 + #define fl_status_string_overflow_length 17 #define fl_status_string_divide_by_zero "f_number_divide_by_zero" - #define fl_status_string_divide_by_zero_length 24 + #define fl_status_string_divide_by_zero_length 23 #define fl_status_string_negative_number "f_number_negative" - #define fl_status_string_negative_number_length 18 + #define fl_status_string_negative_number_length 17 #define fl_status_string_positive_number "f_number_positive" - #define fl_status_string_positive_number_length 18 + #define fl_status_string_positive_number_length 17 #define fl_status_string_zero_number "f_number_zero" - #define fl_status_string_zero_number_length 14 + #define fl_status_string_zero_number_length 13 #define fl_status_string_decimal_number "f_number_decimal" - #define fl_status_string_decimal_number_length 17 + #define fl_status_string_decimal_number_length 16 #define fl_status_string_whole_number "f_number_whole" - #define fl_status_string_whole_number_length 15 + #define fl_status_string_whole_number_length 14 #define fl_status_string_invalid_number "f_number_invalid" - #define fl_status_string_invalid_number_length 17 + #define fl_status_string_invalid_number_length 16 #endif // _di_fl_status_digits_ #ifndef _di_fl_status_buffers_ #define fl_status_string_no_data_on_eof "f_no_data_on_eof" - #define fl_status_string_no_data_on_eof_length 17 + #define fl_status_string_no_data_on_eof_length 16 #define fl_status_string_no_data_on_eol "f_no_data_on_eol" - #define fl_status_string_no_data_on_eol_length 17 + #define fl_status_string_no_data_on_eol_length 16 #define fl_status_string_no_data_on_eos "f_no_data_on_eos" - #define fl_status_string_no_data_on_eos_length 17 + #define fl_status_string_no_data_on_eos_length 16 #define fl_status_string_none_on_eof "f_none_on_eof" - #define fl_status_string_none_on_eof_length 14 + #define fl_status_string_none_on_eof_length 13 #define fl_status_string_no_data_on_stop "f_no_data_on_stop" - #define fl_status_string_no_data_on_stop_length 18 + #define fl_status_string_no_data_on_stop_length 17 #define fl_status_string_none_on_eol "f_none_on_eol" - #define fl_status_string_none_on_eol_length 14 + #define fl_status_string_none_on_eol_length 13 #define fl_status_string_none_on_eos "f_none_on_eos" - #define fl_status_string_none_on_eos_length 14 + #define fl_status_string_none_on_eos_length 13 #define fl_status_string_none_on_stop "f_none_on_stop" - #define fl_status_string_none_on_stop_length 15 + #define fl_status_string_none_on_stop_length 14 #define fl_status_string_error_on_eof "f_error_on_eof" - #define fl_status_string_error_on_eof_length 15 + #define fl_status_string_error_on_eof_length 14 #define fl_status_string_error_on_eol "f_error_on_eol" - #define fl_status_string_error_on_eol_length 15 + #define fl_status_string_error_on_eol_length 14 #define fl_status_string_error_on_eos "f_error_on_eos" - #define fl_status_string_error_on_eos_length 15 + #define fl_status_string_error_on_eos_length 14 #define fl_status_string_error_on_stop "f_error_on_stop" - #define fl_status_string_error_on_stop_length 16 + #define fl_status_string_error_on_stop_length 15 #define fl_status_string_buffer_too_small "f_buffer_too_small" - #define fl_status_string_buffer_too_small_length 19 + #define fl_status_string_buffer_too_small_length 18 #define fl_status_string_buffer_too_large "f_buffer_too_large" - #define fl_status_string_buffer_too_large_length 19 + #define fl_status_string_buffer_too_large_length 18 #define fl_status_string_string_too_small "f_string_too_small" - #define fl_status_string_string_too_small_length 19 + #define fl_status_string_string_too_small_length 18 #define fl_status_string_string_too_large "f_string_too_large" - #define fl_status_string_string_too_large_length 19 + #define fl_status_string_string_too_large_length 18 #define fl_status_string_unterminated "f_unterminated" - #define fl_status_string_unterminated_length 15 + #define fl_status_string_unterminated_length 14 #define fl_status_string_unterminated_on_eof "f_unterminated_on_eof" - #define fl_status_string_unterminated_on_eof_length 22 + #define fl_status_string_unterminated_on_eof_length 21 #define fl_status_string_unterminated_on_eol "f_unterminated_on_eol" - #define fl_status_string_unterminated_on_eol_length 22 + #define fl_status_string_unterminated_on_eol_length 21 #define fl_status_string_unterminated_on_eos "f_unterminated_on_eos" - #define fl_status_string_unterminated_on_eos_length 22 + #define fl_status_string_unterminated_on_eos_length 21 #define fl_status_string_unterminated_on_stop "f_unterminated_on_stop" - #define fl_status_string_unterminated_on_stop_length 23 + #define fl_status_string_unterminated_on_stop_length 22 #define fl_status_string_unterminated_group "f_unterminated_group" - #define fl_status_string_unterminated_group_length 21 + #define fl_status_string_unterminated_group_length 20 #define fl_status_string_unterminated_group_on_eof "f_unterminated_group_on_eof" - #define fl_status_string_unterminated_group_on_eof_length 28 + #define fl_status_string_unterminated_group_on_eof_length 27 #define fl_status_string_unterminated_group_on_eol "f_unterminated_group_on_eol" - #define fl_status_string_unterminated_group_on_eol_length 28 + #define fl_status_string_unterminated_group_on_eol_length 27 #define fl_status_string_unterminated_group_on_eos "f_unterminated_group_on_eos" - #define fl_status_string_unterminated_group_on_eos_length 28 + #define fl_status_string_unterminated_group_on_eos_length 27 #define fl_status_string_unterminated_group_on_stop "f_unterminated_group_on_stop" - #define fl_status_string_unterminated_group_on_stop_length 29 + #define fl_status_string_unterminated_group_on_stop_length 28 #define fl_status_string_unterminated_nest "f_unterminated_nest" - #define fl_status_string_unterminated_nest_length 20 + #define fl_status_string_unterminated_nest_length 19 #define fl_status_string_unterminated_nest_on_eof "f_unterminated_nest_on_eof" - #define fl_status_string_unterminated_nest_on_eof_length 27 + #define fl_status_string_unterminated_nest_on_eof_length 26 #define fl_status_string_unterminated_nest_on_eol "f_unterminated_nest_on_eol" - #define fl_status_string_unterminated_nest_on_eol_length 27 + #define fl_status_string_unterminated_nest_on_eol_length 26 #define fl_status_string_unterminated_nest_on_eos "f_unterminated_nest_on_eos" - #define fl_status_string_unterminated_nest_on_eos_length 27 + #define fl_status_string_unterminated_nest_on_eos_length 26 #define fl_status_string_unterminated_nest_on_stop "f_unterminated_nest_on_stop" - #define fl_status_string_unterminated_nest_on_stop_length 28 + #define fl_status_string_unterminated_nest_on_stop_length 27 #define fl_status_string_incomplete_utf "f_incomplete_utf" - #define fl_status_string_incomplete_utf_length 17 + #define fl_status_string_incomplete_utf_length 16 #define fl_status_string_incomplete_utf_on_eof "f_incomplete_utf_on_eof" - #define fl_status_string_incomplete_utf_on_eof_length 24 + #define fl_status_string_incomplete_utf_on_eof_length 23 #define fl_status_string_incomplete_utf_on_eol "f_incomplete_utf_on_eol" - #define fl_status_string_incomplete_utf_on_eol_length 24 + #define fl_status_string_incomplete_utf_on_eol_length 23 #define fl_status_string_incomplete_utf_on_eos "f_incomplete_utf_on_eos" - #define fl_status_string_incomplete_utf_on_eos_length 24 + #define fl_status_string_incomplete_utf_on_eos_length 23 #define fl_status_string_incomplete_utf_on_stop "f_incomplete_utf_on_stop" - #define fl_status_string_incomplete_utf_on_stop_length 25 + #define fl_status_string_incomplete_utf_on_stop_length 24 #endif // _di_fl_status_buffers_ #ifndef _di_fl_status_allocation_ #define fl_status_string_allocation_error "f_error_allocation" - #define fl_status_string_allocation_error_length 19 + #define fl_status_string_allocation_error_length 18 #define fl_status_string_reallocation_error "f_error_reallocation" - #define fl_status_string_reallocation_error_length 21 + #define fl_status_string_reallocation_error_length 20 #define fl_status_string_deallocation_error "f_error_deallocation" - #define fl_status_string_deallocation_error_length 21 + #define fl_status_string_deallocation_error_length 20 #endif // _di_fl_status_allocation_ #ifndef _di_fl_status_fork_ #define fl_status_string_fork_failed "f_fork_failed" - #define fl_status_string_fork_failed_length 14 + #define fl_status_string_fork_failed_length 13 #define fl_status_string_too_many_processes "f_too_many_processes" - #define fl_status_string_too_many_processes_length 21 + #define fl_status_string_too_many_processes_length 20 #endif // _di_fl_status_fork_ #ifndef _di_fl_status_file_ #define fl_status_string_file_seek_error "f_file_error_seek" - #define fl_status_string_file_seek_error_length 18 + #define fl_status_string_file_seek_error_length 17 #define fl_status_string_file_read_error "f_file_error_read" - #define fl_status_string_file_read_error_length 18 + #define fl_status_string_file_read_error_length 17 #define fl_status_string_file_write_error "f_file_error_write" - #define fl_status_string_file_write_error_length 19 + #define fl_status_string_file_write_error_length 18 #define fl_status_string_file_flush_error "f_file_error_flush" - #define fl_status_string_file_flush_error_length 19 + #define fl_status_string_file_flush_error_length 18 #define fl_status_string_file_purge_error "f_file_error_purge" - #define fl_status_string_file_purge_error_length 19 + #define fl_status_string_file_purge_error_length 18 #define fl_status_string_file_open_error "f_file_error_open" - #define fl_status_string_file_open_error_length 18 + #define fl_status_string_file_open_error_length 17 #define fl_status_string_file_close_error "f_file_error_close" - #define fl_status_string_file_close_error_length 19 + #define fl_status_string_file_close_error_length 18 #define fl_status_string_file_synchronize_error "f_file_error_synchronize" - #define fl_status_string_file_synchronize_error_length 25 + #define fl_status_string_file_synchronize_error_length 24 #define fl_status_string_file_descriptor_error "f_file_error_descriptor" - #define fl_status_string_file_descriptor_error_length 24 + #define fl_status_string_file_descriptor_error_length 23 #define fl_status_string_file_not_found "f_file_not_found" - #define fl_status_string_file_not_found_length 17 + #define fl_status_string_file_not_found_length 16 #define fl_status_string_file_found "f_file_found" - #define fl_status_string_file_found_length 13 + #define fl_status_string_file_found_length 12 #define fl_status_string_file_is_empty "f_file_is_empty" - #define fl_status_string_file_is_empty_length 16 + #define fl_status_string_file_is_empty_length 15 #define fl_status_string_file_not_open "f_file_not_open" - #define fl_status_string_file_not_open_length 16 + #define fl_status_string_file_not_open_length 15 #define fl_status_string_file_allocation_error "f_file_error_allocation" - #define fl_status_string_file_allocation_error_length 24 + #define fl_status_string_file_allocation_error_length 23 #define fl_status_string_file_reallocation_error "f_file_error_reallocation" - #define fl_status_string_file_reallocation_error_length 26 + #define fl_status_string_file_reallocation_error_length 25 #define fl_status_string_file_deallocation_error "f_file_error_deallocation" - #define fl_status_string_file_deallocation_error_length 26 + #define fl_status_string_file_deallocation_error_length 25 #define fl_status_string_file_stat_error "f_file_error_stat" - #define fl_status_string_file_stat_error_length 18 + #define fl_status_string_file_stat_error_length 17 #define fl_status_string_file_error "f_file_error" - #define fl_status_string_file_error_length 13 + #define fl_status_string_file_error_length 12 #define fl_status_string_file_not_utf "f_file_not_utf" - #define fl_status_string_file_not_utf_length 15 + #define fl_status_string_file_not_utf_length 14 #endif // _di_fl_status_file_ #ifndef _di_fl_status_directory_ #define fl_status_string_directory_read_error "f_directory_error_read" - #define fl_status_string_directory_read_error_length 23 + #define fl_status_string_directory_read_error_length 22 #define fl_status_string_directory_write_error "f_directory_error_write" - #define fl_status_string_directory_write_error_length 24 + #define fl_status_string_directory_write_error_length 23 #define fl_status_string_directory_flush_error "f_directory_error_flush" - #define fl_status_string_directory_flush_error_length 24 + #define fl_status_string_directory_flush_error_length 23 #define fl_status_string_directory_purge_error "f_directory_error_purge" - #define fl_status_string_directory_purge_error_length 24 + #define fl_status_string_directory_purge_error_length 23 #define fl_status_string_directory_open_error "f_directory_error_open" - #define fl_status_string_directory_open_error_length 23 + #define fl_status_string_directory_open_error_length 22 #define fl_status_string_directory_close_error "f_directory_error_close" - #define fl_status_string_directory_close_error_length 24 + #define fl_status_string_directory_close_error_length 23 #define fl_status_string_directory_synchronize_error "f_directory_error_synchronize" - #define fl_status_string_directory_synchronize_error_length 30 + #define fl_status_string_directory_synchronize_error_length 29 #define fl_status_string_directory_descriptor_error "f_directory_error_descriptor" - #define fl_status_string_directory_descriptor_error_length 29 + #define fl_status_string_directory_descriptor_error_length 28 #define fl_status_string_directory_not_found "f_directory_not_found" - #define fl_status_string_directory_not_found_length 22 + #define fl_status_string_directory_not_found_length 21 #define fl_status_string_directory_is_empty "f_directory_is_empty" - #define fl_status_string_directory_is_empty_length 21 + #define fl_status_string_directory_is_empty_length 20 #define fl_status_string_directory_not_open "f_directory_not_open" - #define fl_status_string_directory_not_open_length 21 + #define fl_status_string_directory_not_open_length 20 #define fl_status_string_directory_allocation_error "f_directory_error_allocation" - #define fl_status_string_directory_allocation_error_length 29 + #define fl_status_string_directory_allocation_error_length 28 #define fl_status_string_directory_reallocation_error "f_directory_error_reallocation" - #define fl_status_string_directory_reallocation_error_length 31 + #define fl_status_string_directory_reallocation_error_length 30 #define fl_status_string_directory_error "f_directory_error" - #define fl_status_string_directory_error_length 18 + #define fl_status_string_directory_error_length 17 #define fl_status_string_directory_not_utf "f_directory_not_utf" - #define fl_status_string_directory_not_utf_length 20 + #define fl_status_string_directory_not_utf_length 19 #endif // _di_fl_status_directory_ #ifndef _di_fl_status_socket_ #define fl_status_string_socket_connection_client_error "f_socket_error_connection_client" - #define fl_status_string_socket_connection_client_error_length 33 + #define fl_status_string_socket_connection_client_error_length 32 #define fl_status_string_socket_connection_target_error "f_socket_error_connection_target" - #define fl_status_string_socket_connection_target_error_length 33 + #define fl_status_string_socket_connection_target_error_length 32 #define fl_status_string_socket_receive_error "f_socket_error_receive" - #define fl_status_string_socket_receive_error_length 23 + #define fl_status_string_socket_receive_error_length 22 #define fl_status_string_socket_send_error "f_socket_error_send" - #define fl_status_string_socket_send_error_length 20 + #define fl_status_string_socket_send_error_length 19 #endif // _di_fl_status_socket_ #ifndef _di_fl_status_non_ #define fl_status_string_less_than "f_less_than" - #define fl_status_string_less_than_length 12 + #define fl_status_string_less_than_length 11 #define fl_status_string_equal_to "f_equal_to" - #define fl_status_string_equal_to_length 11 + #define fl_status_string_equal_to_length 10 #define fl_status_string_not_equal_to "f_not_equal_to" - #define fl_status_string_not_equal_to_length 15 + #define fl_status_string_not_equal_to_length 14 #define fl_status_string_greater_than "f_greater_than" - #define fl_status_string_greater_than_length 15 + #define fl_status_string_greater_than_length 14 #endif // _di_fl_status_non_ #ifndef _di_fl_status_access_denied_ #define fl_status_string_access_denied "f_access_denied" - #define fl_status_string_access_denied_length 16 + #define fl_status_string_access_denied_length 15 #define fl_status_string_access_denied_user "f_access_denied_user" - #define fl_status_string_access_denied_user_length 21 + #define fl_status_string_access_denied_user_length 20 #define fl_status_string_access_denied_group "f_access_denied_group" - #define fl_status_string_access_denied_group_length 22 + #define fl_status_string_access_denied_group_length 21 #define fl_status_string_access_denied_world "f_access_denied_world" - #define fl_status_string_access_denied_world_length 22 + #define fl_status_string_access_denied_world_length 21 #define fl_status_string_access_denied_read "f_access_denied_read" - #define fl_status_string_access_denied_read_length 21 + #define fl_status_string_access_denied_read_length 20 #define fl_status_string_access_denied_write "f_access_denied_write" - #define fl_status_string_access_denied_write_length 22 + #define fl_status_string_access_denied_write_length 21 #define fl_status_string_access_denied_execute "f_access_denied_execute" - #define fl_status_string_access_denied_execute_length 24 + #define fl_status_string_access_denied_execute_length 23 #define fl_status_string_access_denied_super "f_access_denied_super" - #define fl_status_string_access_denied_super_length 22 + #define fl_status_string_access_denied_super_length 21 #endif // _di_fl_status_access_denied_ + #ifndef _di_fl_status_array_ + #define fl_status_string_array_too_large "f_array_too_large" + #define fl_status_string_array_too_large_length 17 + #endif // _di_fl_status_array_ + #define fl_status_string_status_code_last "f_status_code_last" - #define fl_status_string_status_code_last_length 18 + #define fl_status_string_status_code_last_length 17 #endif // _di_fl_status_string_ /** diff --git a/level_2/fll_fss/c/fss_status.h b/level_2/fll_fss/c/fss_status.h index 5063ba8..8a8bc74 100644 --- a/level_2/fll_fss/c/fss_status.h +++ b/level_2/fll_fss/c/fss_status.h @@ -33,53 +33,53 @@ extern "C" { #ifndef _di_fll_fss_status_string_ #ifndef _di_fll_fss_status_error_ #define fll_fss_status_string_invalid_format "fl_fss_invalid_format" - #define fll_fss_status_string_invalid_format_length 22 + #define fll_fss_status_string_invalid_format_length 21 #define fll_fss_status_string_invalid_format_eos "fl_fss_invalid_format_eos" - #define fll_fss_status_string_invalid_format_eos_length 26 + #define fll_fss_status_string_invalid_format_eos_length 25 #endif // _di_fll_fss_status_error_ #ifndef _di_fll_fss_status_warning_ #define fll_fss_status_string_no_header "fl_fss_no_header" - #define fll_fss_status_string_no_header_length 17 + #define fll_fss_status_string_no_header_length 16 #define fll_fss_status_string_accepted_but_invalid "fl_fss_invalid_but_accepted" - #define fll_fss_status_string_accepted_but_invalid_length 28 + #define fll_fss_status_string_accepted_but_invalid_length 27 #define fll_fss_status_string_no_header_eos "fl_fss_no_header_eos" - #define fll_fss_status_string_no_header_eos_length 21 + #define fll_fss_status_string_no_header_eos_length 20 #define fll_fss_status_string_accepted_but_invalid_eos "fl_fss_invalid_but_accepted_eos" - #define fll_fss_status_string_accepted_but_invalid_eos_length 32 + #define fll_fss_status_string_accepted_but_invalid_eos_length 31 #endif // _di_fll_fss_status_warning_ #ifndef _di_fll_fss_status_success_ #define fll_fss_status_string_found_object "fl_fss_found_object" - #define fll_fss_status_string_found_object_length 20 + #define fll_fss_status_string_found_object_length 19 #define fll_fss_status_string_found_content "fl_fss_found_content" - #define fll_fss_status_string_found_content_length 21 + #define fll_fss_status_string_found_content_length 20 #define fll_fss_status_string_found_no_object "fl_fss_found_no_object" - #define fll_fss_status_string_found_no_object_length 23 + #define fll_fss_status_string_found_no_object_length 22 #define fll_fss_status_string_found_no_content "fl_fss_found_no_content" - #define fll_fss_status_string_found_no_content_length 24 + #define fll_fss_status_string_found_no_content_length 23 #define fll_fss_status_string_found_object_no_content "fl_fss_found_object_no_content" - #define fll_fss_status_string_found_object_no_content_length 31 + #define fll_fss_status_string_found_object_no_content_length 30 #endif // _di_fll_fss_status_success_ #ifndef _di_fll_fss_status_codes_ #define fll_fss_status_string_found_comment "fl_fss_found_comment" - #define fll_fss_status_string_found_comment_length 15 + #define fll_fss_status_string_found_comment_length 14 #endif // _di_fll_fss_status_codes_ #define fll_fss_status_string_status_code_first "fl_fss_status_code_first" - #define fll_fss_status_string_status_code_first_length 25 + #define fll_fss_status_string_status_code_first_length 24 #define fll_fss_status_string_status_code_last "fl_fss_status_code_last" - #define fll_fss_status_string_status_code_last_length 23 + #define fll_fss_status_string_status_code_last_length 22 #endif // _di_fll_fss_status_string_ /** diff --git a/level_2/fll_status/c/status.c b/level_2/fll_status/c/status.c index 2a7b8e9..c18c28e 100644 --- a/level_2/fll_status/c/status.c +++ b/level_2/fll_status/c/status.c @@ -1166,6 +1166,13 @@ extern "C" { } #endif // _di_fll_status_access_denied_ + #ifndef _di_fll_status_array_ + if (fl_string_compare(string, fl_status_string_array_too_large, length, fl_status_string_array_too_large_length) == f_equal_to) { + *code = f_array_too_large; + return f_none; + } + #endif // _di_fll_status_array_ + if (fl_string_compare(string, fl_status_string_status_code_last, length, fl_status_string_status_code_last_length) == f_equal_to) { *code = f_status_code_last; return f_none; -- 1.8.3.1