From d326c1159cadec156cbe87872662ffe0ea11508a Mon Sep 17 00:00:00 2001 From: Kevin Day Date: Thu, 8 Dec 2022 20:37:42 -0600 Subject: [PATCH] Update: Improve define structure, wrapping global static data in individual ifndef blocks. Make the example "build/disable" defines scripts more precise to avoid getting defines used from other projects from being loaded in the wrong file. Use per variable wrapping ifndef defines to have better fine-tuned control over the compiled code. Fix any problems observed with syntax and naming. --- build/disable/about.txt | 6 +- build/disable/level_0/f_color.h | 49 +- build/disable/level_0/f_console.h | 34 ++ build/disable/level_0/f_control_group.h | 4 + build/disable/level_0/f_conversion.h | 5 +- build/disable/level_0/f_directory.h | 6 +- build/disable/level_0/f_file.h | 58 ++ build/disable/level_0/f_fss.h | 11 +- build/disable/level_0/f_iki.h | 21 +- build/disable/level_0/f_path.h | 56 ++ build/disable/level_0/f_print.h | 36 ++ build/disable/level_0/f_serialize.h | 3 + build/disable/level_0/f_socket.h | 2 +- build/disable/level_0/f_status_string.h | 21 - build/disable/level_0/f_string.h | 1 - build/disable/level_0/f_type.h | 20 - build/disable/level_0/f_type_array.h | 270 ---------- build/disable/level_0/f_utf.h | 30 +- build/disable/level_1/fl_control_group.h | 1 + build/disable/level_1/fl_conversion.h | 10 +- build/disable/level_1/fl_directory.h | 2 + build/disable/level_1/fl_environment.h | 1 + build/disable/level_1/fl_execute.h | 1 + build/disable/level_1/fl_fss.h | 6 + build/disable/level_1/fl_iki.h | 1 + build/disable/level_1/fl_print.h | 4 + build/disable/level_1/fl_signal.h | 1 + build/disable/level_1/fl_string.h | 1 + build/disable/level_1/fl_utf.h | 1 + build/disable/level_1/fl_utf_file.h | 2 + build/disable/level_2/fll_error.h | 6 + build/disable/level_2/fll_execute.h | 2 + build/disable/level_2/fll_file.h | 1 + build/disable/level_2/fll_fss.h | 1 + build/disable/level_2/fll_fss_status_string.h | 1 + build/disable/level_2/fll_iki.h | 1 + build/disable/level_2/fll_path.h | 1 + build/disable/level_2/fll_program.h | 4 + build/disable/level_2/fll_status_string.h | 21 + level_0/f_color/c/color/common.c | 218 ++++++-- level_0/f_color/c/color/common.h | 659 ++++++++++++++--------- level_0/f_console/c/console/common.c | 158 ++++-- level_0/f_console/c/console/common.h | 200 +++++-- level_0/f_control_group/c/control_group/common.c | 14 +- level_0/f_control_group/c/control_group/common.h | 21 +- level_0/f_directory/c/directory/common.c | 9 +- level_0/f_directory/c/directory/common.h | 9 +- level_0/f_environment/c/environment.c | 2 +- level_0/f_environment/c/environment/common.h | 2 +- level_0/f_file/c/file/common.c | 282 ++++++++-- level_0/f_file/c/file/common.h | 282 ++++++++-- level_0/f_fss/c/fss/common.c | 9 +- level_0/f_fss/c/fss/common.h | 19 +- level_0/f_iki/c/iki/common.c | 92 +++- level_0/f_iki/c/iki/common.h | 120 +++-- level_0/f_path/c/path/common.c | 264 +++++++-- level_0/f_path/c/path/common.h | 276 +++++++--- level_0/f_print/c/print/common.c | 179 ++++-- level_0/f_print/c/print/common.h | 185 +++++-- level_0/f_serialize/c/serialize/common.c | 14 +- level_0/f_serialize/c/serialize/common.h | 14 +- level_0/f_utf/c/utf/common.c | 135 +++-- level_0/f_utf/c/utf/common.h | 149 +++-- level_0/f_utf/c/utf/dynamic.c | 4 +- level_0/f_utf/c/utf/string.c | 4 +- level_1/fl_conversion/c/conversion/common.c | 34 +- level_1/fl_conversion/c/conversion/common.h | 37 +- level_1/fl_execute/c/execute/common.h | 35 +- level_1/fl_print/c/print/common.c | 14 +- level_1/fl_print/c/print/common.h | 14 +- level_1/fl_utf/c/utf.c | 12 +- level_2/fll_error/c/error/common.c | 24 +- level_2/fll_error/c/error/common.h | 24 +- level_2/fll_fss/c/fss/payload.c | 8 +- level_2/fll_program/c/program/common.c | 9 +- level_2/fll_program/c/program/common.h | 9 +- level_3/control/c/private-control.c | 22 +- level_3/fake/c/private-build-load.c | 2 +- level_3/fss_payload_read/c/print.c | 4 +- level_3/fss_payload_read/c/private-read.c | 10 +- level_3/fss_write/c/payload/fss_write.c | 2 +- 81 files changed, 3024 insertions(+), 1258 deletions(-) diff --git a/build/disable/about.txt b/build/disable/about.txt index 8d3716a..aeab674 100644 --- a/build/disable/about.txt +++ b/build/disable/about.txt @@ -6,14 +6,14 @@ These files are generated like the following: # cd fll/ # cd level_0; -# for i in * ; do grep -hor '#ifndef _di_f_.*\>' $i | sed -e 's|^#ifndef |#define |g' | sort | uniq > ../build/disable/level_0/$i.h ; done +# for i in * ; do grep -hor "#ifndef _di_$i.*\>" $i | sed -e 's|^#ifndef |#define |g' | sort | uniq > ../build/disable/level_0/$i.h ; done # cd .. # cd level_1; -# for i in * ; do grep -hor '#ifndef _di_fl_.*\>' $i | sed -e 's|^#ifndef |#define |g' | sort | uniq > ../build/disable/level_1/$i.h ; done +# for i in * ; do grep -hor "#ifndef _di_$i_.*\>" $i | sed -e 's|^#ifndef |#define |g' | sort | uniq > ../build/disable/level_1/$i.h ; done # cd .. # cd level_2; -# for i in * ; do grep -hor '#ifndef _di_fll_.*\>' $i | sed -e 's|^#ifndef |#define |g' | sort | uniq > ../build/disable/level_2/$i.h ; done +# for i in * ; do grep -hor "#ifndef _di_$i_.*\>" $i | sed -e 's|^#ifndef |#define |g' | sort | uniq > ../build/disable/level_2/$i.h ; done diff --git a/build/disable/level_0/f_color.h b/build/disable/level_0/f_color.h index 77453da..e181e45 100644 --- a/build/disable/level_0/f_color.h +++ b/build/disable/level_0/f_color.h @@ -1,11 +1,54 @@ +#define _di_f_color_begin_s_ +#define _di_f_color_code_black_bg_s_ +#define _di_f_color_code_black_s_ +#define _di_f_color_code_blink_s_ +#define _di_f_color_code_blue_bg_s_ +#define _di_f_color_code_blue_s_ +#define _di_f_color_code_bold_s_ +#define _di_f_color_code_bright_black_bg_s_ +#define _di_f_color_code_bright_black_s_ +#define _di_f_color_code_bright_blue_bg_s_ +#define _di_f_color_code_bright_blue_s_ +#define _di_f_color_code_bright_green_bg_s_ +#define _di_f_color_code_bright_green_s_ +#define _di_f_color_code_bright_purple_bg_s_ +#define _di_f_color_code_bright_purple_s_ +#define _di_f_color_code_bright_red_bg_s_ +#define _di_f_color_code_bright_red_s_ +#define _di_f_color_code_bright_teal_bg_s_ +#define _di_f_color_code_bright_teal_s_ +#define _di_f_color_code_bright_white_bg_s_ +#define _di_f_color_code_bright_white_s_ +#define _di_f_color_code_bright_yellow_bg_s_ +#define _di_f_color_code_bright_yellow_s_ +#define _di_f_color_code_conceal_s_ +#define _di_f_color_code_e_ +#define _di_f_color_code_green_bg_s_ +#define _di_f_color_code_green_s_ +#define _di_f_color_code_purple_bg_s_ +#define _di_f_color_code_purple_s_ +#define _di_f_color_code_red_bg_s_ +#define _di_f_color_code_red_s_ +#define _di_f_color_code_reset_s_ +#define _di_f_color_code_reverse_s_ #define _di_f_color_code_t_ +#define _di_f_color_code_teal_bg_s_ +#define _di_f_color_code_teal_s_ +#define _di_f_color_code_underline_s_ +#define _di_f_color_code_white_bg_s_ +#define _di_f_color_code_white_s_ +#define _di_f_color_code_yellow_bg_s_ +#define _di_f_color_code_yellow_s_ #define _di_f_color_context_delete_ #define _di_f_color_context_destroy_ #define _di_f_color_context_t_ +#define _di_f_color_end_s_ #define _di_f_color_format_t_ #define _di_f_color_load_context_ #define _di_f_color_max_size_d_ -#define _di_f_color_mode_t_ +#define _di_f_color_medium_s_ +#define _di_f_color_mode_e_ +#define _di_f_color_s_ #define _di_f_color_save_1_ #define _di_f_color_save_2_ #define _di_f_color_save_3_ @@ -14,7 +57,7 @@ #define _di_f_color_set_context_t_ #define _di_f_color_set_string_empty_s_ #define _di_f_color_set_t_ -#define _di_f_color_s_ -#define _di_f_color_strings_s_ #define _di_f_color_t_ +#define _di_f_color_terminal_name_s_ #define _di_f_color_terminal_s_ +#define _di_f_color_terminal_value_linux_s_ diff --git a/build/disable/level_0/f_console.h b/build/disable/level_0/f_console.h index 769c15c..42d4f16 100644 --- a/build/disable/level_0/f_console.h +++ b/build/disable/level_0/f_console.h @@ -1,5 +1,6 @@ #define _di_f_console_arguments_t_ #define _di_f_console_environment_process_ +#define _di_f_console_flag_e_ #define _di_f_console_flag_t_ #define _di_f_console_identify_ #define _di_f_console_length_size_ @@ -10,7 +11,40 @@ #define _di_f_console_parameters_destroy_ #define _di_f_console_parameters_t_ #define _di_f_console_parameter_t_ +#define _di_f_console_result_e_ #define _di_f_console_result_t_ +#define _di_f_console_standard_long_dark_s_ +#define _di_f_console_standard_long_debug_s_ +#define _di_f_console_standard_long_error_s_ +#define _di_f_console_standard_long_help_s_ +#define _di_f_console_standard_long_light_s_ +#define _di_f_console_standard_long_line_first_no_s_ +#define _di_f_console_standard_long_line_last_no_s_ +#define _di_f_console_standard_long_no_color_s_ +#define _di_f_console_standard_long_normal_s_ +#define _di_f_console_standard_long_quiet_s_ +#define _di_f_console_standard_long_status_in_s_ +#define _di_f_console_standard_long_status_out_s_ +#define _di_f_console_standard_long_verbose_s_ +#define _di_f_console_standard_long_version_s_ #define _di_f_console_standard_s_ +#define _di_f_console_standard_short_dark_s_ +#define _di_f_console_standard_short_debug_s_ +#define _di_f_console_standard_short_error_s_ +#define _di_f_console_standard_short_help_s_ +#define _di_f_console_standard_short_light_s_ +#define _di_f_console_standard_short_line_first_no_s_ +#define _di_f_console_standard_short_line_last_no_s_ +#define _di_f_console_standard_short_no_color_s_ +#define _di_f_console_standard_short_normal_s_ +#define _di_f_console_standard_short_quiet_s_ +#define _di_f_console_standard_short_status_in_s_ +#define _di_f_console_standard_short_status_out_s_ +#define _di_f_console_standard_short_verbose_s_ +#define _di_f_console_standard_short_version_s_ +#define _di_f_console_symbol_long_inverse_s_ +#define _di_f_console_symbol_long_normal_s_ #define _di_f_console_symbol_s_ +#define _di_f_console_symbol_short_inverse_s_ +#define _di_f_console_symbol_short_normal_s_ #define _di_f_console_verbosity_ diff --git a/build/disable/level_0/f_control_group.h b/build/disable/level_0/f_control_group.h index a2b2139..fefbcbf 100644 --- a/build/disable/level_0/f_control_group.h +++ b/build/disable/level_0/f_control_group.h @@ -1,3 +1,7 @@ #define _di_f_control_group_copy_ +#define _di_f_control_group_d_ +#define _di_f_control_group_path_system_default_s_ +#define _di_f_control_group_path_system_prefix_s_ +#define _di_f_control_group_path_system_suffix_s_ #define _di_f_control_group_s_ #define _di_f_control_group_t_ diff --git a/build/disable/level_0/f_conversion.h b/build/disable/level_0/f_conversion.h index 51c9f32..94c7cd7 100644 --- a/build/disable/level_0/f_conversion.h +++ b/build/disable/level_0/f_conversion.h @@ -8,12 +8,11 @@ #define _di_f_conversion_character_to_duodecimal_ #define _di_f_conversion_character_to_hexidecimal_ #define _di_f_conversion_character_to_octal_ +#define _di_f_conversion_d_ +#define _di_f_conversion_data_c_ #define _di_f_conversion_data_flag_d_ #define _di_f_conversion_data_t_ -#define _di_f_conversion_data_c_ -#define _di_f_conversion_d_ #define _di_f_conversion_number_signed_print_ #define _di_f_conversion_number_signed_to_string_ #define _di_f_conversion_number_unsigned_print_ #define _di_f_conversion_number_unsigned_to_string_ -#define _di_f_type_number_64_t_ diff --git a/build/disable/level_0/f_directory.h b/build/disable/level_0/f_directory.h index a313cdf..5ea2e1e 100644 --- a/build/disable/level_0/f_directory.h +++ b/build/disable/level_0/f_directory.h @@ -1,20 +1,22 @@ #define _di_f_directory_at_d_ +#define _di_f_directory_back_s_ #define _di_f_directory_create_ #define _di_f_directory_create_at_ +#define _di_f_directory_current_s_ +#define _di_f_directory_d_ #define _di_f_directory_exists_ #define _di_f_directory_exists_at_ #define _di_f_directory_flag_d_ #define _di_f_directory_is_ #define _di_f_directory_is_at_ -#define _di_f_directory_d_ #define _di_f_directory_list_ #define _di_f_directory_listing_t_ #define _di_f_directory_open_ #define _di_f_directory_open_at_ #define _di_f_directory_remove_ #define _di_f_directory_remove_custom_ +#define _di_f_directory_s_ #define _di_f_directory_statuss_t_ #define _di_f_directory_status_t_ -#define _di_f_directory_s_ #define _di_f_directory_touch_ #define _di_f_directory_touch_at_ diff --git a/build/disable/level_0/f_file.h b/build/disable/level_0/f_file.h index 64bf090..85a8026 100644 --- a/build/disable/level_0/f_file.h +++ b/build/disable/level_0/f_file.h @@ -39,8 +39,58 @@ #define _di_f_file_name_directory_ #define _di_f_file_open_ #define _di_f_file_open_at_ +#define _di_f_file_open_mode_append_s_ +#define _di_f_file_open_mode_read_append_s_ +#define _di_f_file_open_mode_read_s_ +#define _di_f_file_open_mode_read_truncate_s_ +#define _di_f_file_open_mode_read_write_s_ #define _di_f_file_open_mode_s_ +#define _di_f_file_open_mode_truncate_s_ +#define _di_f_file_operation_access_s_ +#define _di_f_file_operation_analyze_s_ +#define _di_f_file_operation_append_s_ +#define _di_f_file_operation_change_group_s_ +#define _di_f_file_operation_change_mode_s_ +#define _di_f_file_operation_change_owner_s_ +#define _di_f_file_operation_change_type_s_ +#define _di_f_file_operation_clone_s_ +#define _di_f_file_operation_close_s_ +#define _di_f_file_operation_concatenate_s_ +#define _di_f_file_operation_connect_s_ +#define _di_f_file_operation_copy_s_ +#define _di_f_file_operation_create_s_ +#define _di_f_file_operation_decrypt_s_ +#define _di_f_file_operation_delete_s_ +#define _di_f_file_operation_disconnect_s_ +#define _di_f_file_operation_encrypt_s_ +#define _di_f_file_operation_find_s_ +#define _di_f_file_operation_from_s_ +#define _di_f_file_operation_get_group_s_ +#define _di_f_file_operation_get_mode_s_ +#define _di_f_file_operation_get_owner_s_ +#define _di_f_file_operation_get_type_s_ +#define _di_f_file_operation_identify_s_ +#define _di_f_file_operation_link_s_ +#define _di_f_file_operation_list_s_ +#define _di_f_file_operation_move_s_ +#define _di_f_file_operation_open_s_ +#define _di_f_file_operation_pipe_s_ +#define _di_f_file_operation_process_s_ +#define _di_f_file_operation_read_s_ +#define _di_f_file_operation_receive_s_ +#define _di_f_file_operation_rename_s_ +#define _di_f_file_operation__s_ #define _di_f_file_operation_s_ +#define _di_f_file_operation_send_s_ +#define _di_f_file_operation_shred_s_ +#define _di_f_file_operation_stat_s_ +#define _di_f_file_operation_to_s_ +#define _di_f_file_operation_touch_s_ +#define _di_f_file_operation_truncate_s_ +#define _di_f_file_operation_unlink_s_ +#define _di_f_file_operation_verify_s_ +#define _di_f_file_operation_wipe_s_ +#define _di_f_file_operation_write_s_ #define _di_f_file_owner_read_ #define _di_f_file_read_ #define _di_f_file_read_block_ @@ -80,6 +130,14 @@ #define _di_f_file_type_ #define _di_f_file_type_at_ #define _di_f_file_type_d_ +#define _di_f_file_type_name_block_s_ +#define _di_f_file_type_name_character_s_ +#define _di_f_file_type_name_directory_s_ +#define _di_f_file_type_name_fifo_s_ +#define _di_f_file_type_name_link_s_ +#define _di_f_file_type_name_regular_s_ +#define _di_f_file_type_name_socket_s_ +#define _di_f_file_type_s_ #define _di_f_file_umask_get_ #define _di_f_file_umask_set_ #define _di_f_file_write_ diff --git a/build/disable/level_0/f_fss.h b/build/disable/level_0/f_fss.h index 81b8e9d..16f308f 100644 --- a/build/disable/level_0/f_fss.h +++ b/build/disable/level_0/f_fss.h @@ -1,6 +1,5 @@ #define _di_f_fss_apply_delimit_ #define _di_f_fss_apply_delimit_range_ -#define _di_f_fss_e_ #define _di_f_fss_commentss_t_ #define _di_f_fss_comments_t_ #define _di_f_fss_comment_t_ @@ -10,13 +9,13 @@ #define _di_f_fss_count_lines_ #define _di_f_fss_count_lines_range_ #define _di_f_fss_default_d_ -#define _di_f_fss_default_d_ -#define _di_f_fss_placeholder_s_ #define _di_f_fss_delimitss_t_ #define _di_f_fss_delimits_t_ #define _di_f_fss_delimit_t_ +#define _di_f_fss_e_ #define _di_f_fss_fail_utf_ #define _di_f_fss_fail_utf_to_false_ +#define _di_f_fss_header_s_ #define _di_f_fss_is_combining_ #define _di_f_fss_is_graph_ #define _di_f_fss_is_space_ @@ -59,7 +58,10 @@ #define _di_f_fss_nest_t_ #define _di_f_fss_objects_t_ #define _di_f_fss_object_t_ +#define _di_f_fss_payload_s_ +#define _di_f_fss_placeholder_s_ #define _di_f_fss_quote_type_ +#define _di_f_fss_s_ #define _di_f_fss_seek_to_eol_ #define _di_f_fss_set_adjust_ #define _di_f_fss_set_decimate_by_ @@ -96,5 +98,4 @@ #define _di_f_fss_status_error_e_ #define _di_f_fss_status_success_e_ #define _di_f_fss_status_warning_e_ -#define _di_f_fss_s_ -#define _di_f_fss_s_ +#define _di_f_fss_type_s_ diff --git a/build/disable/level_0/f_iki.h b/build/disable/level_0/f_iki.h index 91f9694..6e29abe 100644 --- a/build/disable/level_0/f_iki.h +++ b/build/disable/level_0/f_iki.h @@ -26,8 +26,25 @@ #define _di_f_iki_object_partial_is_ #define _di_f_iki_read_ #define _di_f_iki_state_flag_e_ +#define _di_f_iki_syntax_placeholder_s_ +#define _di_f_iki_syntax_quote_backtick_s_ +#define _di_f_iki_syntax_quote_double_s_ +#define _di_f_iki_syntax_quote_single_s_ #define _di_f_iki_syntax_s_ +#define _di_f_iki_syntax_separator_s_ +#define _di_f_iki_syntax_slash_s_ +#define _di_f_iki_vocabulary_0001_address_s_ +#define _di_f_iki_vocabulary_0001_code_s_ +#define _di_f_iki_vocabulary_0001_email_s_ +#define _di_f_iki_vocabulary_0001_name_s_ +#define _di_f_iki_vocabulary_0001_phone_s_ +#define _di_f_iki_vocabulary_0001_quote_s_ #define _di_f_iki_vocabulary_0001_s_ -#define _di_f_iki_vocabulary_0001_s_ -#define _di_f_iki_vocabulary_0002_s_ +#define _di_f_iki_vocabulary_0001_uri_s_ +#define _di_f_iki_vocabulary_0001_url_s_ +#define _di_f_iki_vocabulary_0001_urn_s_ +#define _di_f_iki_vocabulary_0001_variable_s_ +#define _di_f_iki_vocabulary_0002_context_s_ +#define _di_f_iki_vocabulary_0002_define_s_ +#define _di_f_iki_vocabulary_0002_parameter_s_ #define _di_f_iki_vocabulary_0002_s_ diff --git a/build/disable/level_0/f_path.h b/build/disable/level_0/f_path.h index 7cc6dc5..f71f26d 100644 --- a/build/disable/level_0/f_path.h +++ b/build/disable/level_0/f_path.h @@ -2,10 +2,66 @@ #define _di_f_path_change_at_ #define _di_f_path_current_ #define _di_f_path_d_ +#define _di_f_path_environment_s_ +#define _di_f_path_extension_separator_s_ +#define _di_f_path_home_wildcard_s_ #define _di_f_path_is_ #define _di_f_path_is_absolute_ #define _di_f_path_is_relative_ #define _di_f_path_is_relative_current_ +#define _di_f_path_present_working_old_s_ +#define _di_f_path_present_working_s_ #define _di_f_path_real_ +#define _di_f_path_s_ +#define _di_f_path_separator_current_s_ +#define _di_f_path_separator_s_ +#define _di_f_path_separator_variable_s_ +#define _di_f_path_tree_binary_s_ +#define _di_f_path_tree_boot_s_ +#define _di_f_path_tree_devices_s_ +#define _di_f_path_tree_external_s_ +#define _di_f_path_tree_hardware_s_ #define _di_f_path_tree_hierarchy_standard_d_ +#define _di_f_path_tree_home_s_ +#define _di_f_path_tree_home_services_s_ +#define _di_f_path_tree_home_share_s_ +#define _di_f_path_tree_home_users_s_ +#define _di_f_path_tree_home_websites_s_ #define _di_f_path_tree_kevux_standard_d_ +#define _di_f_path_tree_libraries_boot_s_ +#define _di_f_path_tree_libraries_public_s_ +#define _di_f_path_tree_libraries_remote_s_ +#define _di_f_path_tree_libraries_s_ +#define _di_f_path_tree_libraries_services_s_ +#define _di_f_path_tree_libraries_system_s_ +#define _di_f_path_tree_libraries_toolchain_s_ +#define _di_f_path_tree_libraries_users_s_ +#define _di_f_path_tree_processes_s_ +#define _di_f_path_tree_programs_boot_s_ +#define _di_f_path_tree_programs_public_s_ +#define _di_f_path_tree_programs_remote_s_ +#define _di_f_path_tree_programs_s_ +#define _di_f_path_tree_programs_sboot_s_ +#define _di_f_path_tree_programs_services_s_ +#define _di_f_path_tree_programs_susers_s_ +#define _di_f_path_tree_programs_system_s_ +#define _di_f_path_tree_programs_toolchain_s_ +#define _di_f_path_tree_programs_users_s_ +#define _di_f_path_tree_run_s_ +#define _di_f_path_tree_system_data_s_ +#define _di_f_path_tree_system_logs_s_ +#define _di_f_path_tree_system_s_ +#define _di_f_path_tree_system_settings_s_ +#define _di_f_path_tree_system_variables_s_ +#define _di_f_path_tree_temporary_public_s_ +#define _di_f_path_tree_temporary_s_ +#define _di_f_path_tree_temporary_services_s_ +#define _di_f_path_tree_temporary_users_s_ +#define _di_f_path_tree_temporary_variables_s_ +#define _di_f_path_user_data_s_ +#define _di_f_path_user_desktop_s_ +#define _di_f_path_user_downloads_s_ +#define _di_f_path_user_private_s_ +#define _di_f_path_user_settings_s_ +#define _di_f_path_user_shared_s_ +#define _di_f_path_user_temporary_s_ diff --git a/build/disable/level_0/f_print.h b/build/disable/level_0/f_print.h index 8ff8e76..0a065a6 100644 --- a/build/disable/level_0/f_print.h +++ b/build/disable/level_0/f_print.h @@ -46,8 +46,44 @@ #define _di_f_print_safely_ #define _di_f_print_safely_get_ #define _di_f_print_safely_terminated_ +#define _di_f_print_sequence_acknowledge_negative_s_ +#define _di_f_print_sequence_acknowledge_s_ +#define _di_f_print_sequence_backspace_s_ +#define _di_f_print_sequence_bell_s_ +#define _di_f_print_sequence_cancel_s_ +#define _di_f_print_sequence_carriage_return_s_ +#define _di_f_print_sequence_data_link_escape_s_ +#define _di_f_print_sequence_delete_s_ +#define _di_f_print_sequence_device_control_1_s_ +#define _di_f_print_sequence_device_control_2_s_ +#define _di_f_print_sequence_device_control_3_s_ +#define _di_f_print_sequence_device_control_4_s_ +#define _di_f_print_sequence_end_of_medium_s_ +#define _di_f_print_sequence_end_of_text_s_ +#define _di_f_print_sequence_end_of_transmission_block_s_ +#define _di_f_print_sequence_end_of_transmission_s_ +#define _di_f_print_sequence_enquiry_s_ +#define _di_f_print_sequence_escape_s_ +#define _di_f_print_sequence_form_feed_s_ +#define _di_f_print_sequence_line_feed_s_ +#define _di_f_print_sequence_line_new_s_ +#define _di_f_print_sequence_null_s_ #define _di_f_print_sequence_s_ +#define _di_f_print_sequence_separator_file_s_ +#define _di_f_print_sequence_separator_group_s_ +#define _di_f_print_sequence_separator_record_s_ +#define _di_f_print_sequence_separator_unit_s_ +#define _di_f_print_sequence_shift_in_s_ +#define _di_f_print_sequence_shift_out_s_ +#define _di_f_print_sequence_space_s_ #define _di_f_print_sequences_set_control_s_ +#define _di_f_print_sequence_start_of_header_s_ +#define _di_f_print_sequence_start_of_text_s_ +#define _di_f_print_sequence_substitute_s_ +#define _di_f_print_sequence_synchronous_idle_s_ +#define _di_f_print_sequence_tab_s_ +#define _di_f_print_sequence_tab_vertical_s_ +#define _di_f_print_sequence_unknown_s_ #define _di_f_print_terminated_ #define _di_f_print_to_ #define _di_f_print_to_character_ diff --git a/build/disable/level_0/f_serialize.h b/build/disable/level_0/f_serialize.h index 8bf1b10..20d44ca 100644 --- a/build/disable/level_0/f_serialize.h +++ b/build/disable/level_0/f_serialize.h @@ -1,6 +1,9 @@ +#define _di_f_serialize_delimited_delimiter_s_ +#define _di_f_serialize_delimited_splitter_s_ #define _di_f_serialize_from_simple_ #define _di_f_serialize_from_simple_get_ #define _di_f_serialize_from_simple_range_ #define _di_f_serialize_from_simple_select_ #define _di_f_serialize_splitter_s_ #define _di_f_serialize_to_simple_ +#define _di_f_serialize_to_simple_splitter_s_ diff --git a/build/disable/level_0/f_socket.h b/build/disable/level_0/f_socket.h index f30ed47..cb3bf0a 100644 --- a/build/disable/level_0/f_socket.h +++ b/build/disable/level_0/f_socket.h @@ -11,8 +11,8 @@ #define _di_f_socket_flag_d_ #define _di_f_socket_listen_ #define _di_f_socket_message_flag_d_ -#define _di_f_socket_option_get_ #define _di_f_socket_option_d_ +#define _di_f_socket_option_get_ #define _di_f_socket_option_set_ #define _di_f_socket_read_ #define _di_f_socket_read_message_ diff --git a/build/disable/level_0/f_status_string.h b/build/disable/level_0/f_status_string.h index c4984fc..2558472 100644 --- a/build/disable/level_0/f_status_string.h +++ b/build/disable/level_0/f_status_string.h @@ -1,23 +1,2 @@ -#define _di_f_error_compare_ -#define _di_f_status_access_ -#define _di_f_status_array_ -#define _di_f_status_available_ -#define _di_f_status_basic_ -#define _di_f_status_boolean_ -#define _di_f_status_buffer_ -#define _di_f_status_buffers_ -#define _di_f_status_busy_ -#define _di_f_status_compare_ -#define _di_f_status_directory_ -#define _di_f_status_end_ -#define _di_f_status_file_ -#define _di_f_status_filesystem_ -#define _di_f_status_network_ -#define _di_f_status_number_ -#define _di_f_status_process_ -#define _di_f_status_return_ -#define _di_f_status_signal_ -#define _di_f_status_socket_ #define _di_f_status_string_ #define _di_f_status_string_to_ -#define _di_f_status_terminal_ diff --git a/build/disable/level_0/f_string.h b/build/disable/level_0/f_string.h index ebe0e41..af6aeab 100644 --- a/build/disable/level_0/f_string.h +++ b/build/disable/level_0/f_string.h @@ -1,4 +1,3 @@ -#define _di_f_char_t_ #define _di_f_string_append_ #define _di_f_string_append_assure_ #define _di_f_string_append_assure_nulless_ diff --git a/build/disable/level_0/f_type.h b/build/disable/level_0/f_type.h index 2adab4f..eae2cb0 100644 --- a/build/disable/level_0/f_type.h +++ b/build/disable/level_0/f_type.h @@ -1,23 +1,3 @@ -#define _di_f_array_lengthss_t_ -#define _di_f_array_lengths_t_ -#define _di_f_array_t_ -#define _di_f_cellss_t_ -#define _di_f_cells_t_ -#define _di_f_cell_t_ -#define _di_f_date_t_ -#define _di_f_file_t_ -#define _di_f_fll_idss_t_ -#define _di_f_fll_ids_t_ -#define _di_f_fll_id_t_ -#define _di_f_int_128_t_ -#define _di_f_mode_t_ -#define _di_f_statess_t_ -#define _di_f_states_t_ -#define _di_f_statusss_t_ -#define _di_f_statuss_t_ -#define _di_f_status_t_ -#define _di_f_time_spec_t_ -#define _di_f_time_t_ #define _di_f_type_file_defaults_ #define _di_f_type_input_output_ #define _di_f_type_number_64_t_ diff --git a/build/disable/level_0/f_type_array.h b/build/disable/level_0/f_type_array.h index 7a07292..e69de29 100644 --- a/build/disable/level_0/f_type_array.h +++ b/build/disable/level_0/f_type_array.h @@ -1,270 +0,0 @@ -#define _di_f_array_lengths_adjust_ -#define _di_f_array_lengths_append_ -#define _di_f_array_lengths_append_all_ -#define _di_f_array_lengths_decimate_by_ -#define _di_f_array_lengths_decrease_by_ -#define _di_f_array_lengths_increase_ -#define _di_f_array_lengths_increase_by_ -#define _di_f_array_lengths_resize_ -#define _di_f_array_lengthss_adjust_ -#define _di_f_array_lengthss_append_ -#define _di_f_array_lengthss_append_all_ -#define _di_f_array_lengthss_decimate_by_ -#define _di_f_array_lengthss_decrease_by_ -#define _di_f_array_lengthss_increase_ -#define _di_f_array_lengthss_increase_by_ -#define _di_f_array_lengthss_resize_ -#define _di_f_array_lengthss_t_ -#define _di_f_array_lengths_t_ -#define _di_f_cells_adjust_ -#define _di_f_cells_append_ -#define _di_f_cells_append_all_ -#define _di_f_cells_decimate_by_ -#define _di_f_cells_decrease_by_ -#define _di_f_cells_increase_ -#define _di_f_cells_increase_by_ -#define _di_f_cells_resize_ -#define _di_f_cellss_adjust_ -#define _di_f_cellss_append_ -#define _di_f_cellss_append_all_ -#define _di_f_cellss_decimate_by_ -#define _di_f_cellss_decrease_by_ -#define _di_f_cellss_increase_ -#define _di_f_cellss_increase_by_ -#define _di_f_cellss_resize_ -#define _di_f_cellss_t_ -#define _di_f_cells_t_ -#define _di_f_fll_ids_adjust_ -#define _di_f_fll_ids_append_ -#define _di_f_fll_ids_append_all_ -#define _di_f_fll_ids_decimate_by_ -#define _di_f_fll_ids_decrease_by_ -#define _di_f_fll_ids_increase_ -#define _di_f_fll_ids_increase_by_ -#define _di_f_fll_ids_resize_ -#define _di_f_fll_idss_adjust_ -#define _di_f_fll_idss_append_ -#define _di_f_fll_idss_append_all_ -#define _di_f_fll_idss_decimate_by_ -#define _di_f_fll_idss_decrease_by_ -#define _di_f_fll_idss_increase_ -#define _di_f_fll_idss_increase_by_ -#define _di_f_fll_idss_resize_ -#define _di_f_fll_idss_t_ -#define _di_f_fll_ids_t_ -#define _di_f_int128s_adjust_ -#define _di_f_int128s_append_ -#define _di_f_int128s_append_all_ -#define _di_f_int128s_decimate_by_ -#define _di_f_int128s_decrease_by_ -#define _di_f_int128s_increase_ -#define _di_f_int128s_increase_by_ -#define _di_f_int128s_resize_ -#define _di_f_int128ss_adjust_ -#define _di_f_int128ss_append_ -#define _di_f_int128ss_append_all_ -#define _di_f_int128ss_decimate_by_ -#define _di_f_int128ss_decrease_by_ -#define _di_f_int128ss_increase_ -#define _di_f_int128ss_increase_by_ -#define _di_f_int128ss_resize_ -#define _di_f_int128ss_t_ -#define _di_f_int128s_t_ -#define _di_f_int16s_adjust_ -#define _di_f_int16s_append_ -#define _di_f_int16s_append_all_ -#define _di_f_int16s_decimate_by_ -#define _di_f_int16s_decrease_by_ -#define _di_f_int16s_increase_ -#define _di_f_int16s_increase_by_ -#define _di_f_int16s_resize_ -#define _di_f_int16ss_adjust_ -#define _di_f_int16ss_append_ -#define _di_f_int16ss_append_all_ -#define _di_f_int16ss_decimate_by_ -#define _di_f_int16ss_decrease_by_ -#define _di_f_int16ss_increase_ -#define _di_f_int16ss_increase_by_ -#define _di_f_int16ss_resize_ -#define _di_f_int16ss_t_ -#define _di_f_int16s_t_ -#define _di_f_int32s_adjust_ -#define _di_f_int32s_append_ -#define _di_f_int32s_append_all_ -#define _di_f_int32s_decimate_by_ -#define _di_f_int32s_decrease_by_ -#define _di_f_int32s_increase_ -#define _di_f_int32s_increase_by_ -#define _di_f_int32s_resize_ -#define _di_f_int32ss_adjust_ -#define _di_f_int32ss_append_ -#define _di_f_int32ss_append_all_ -#define _di_f_int32ss_decimate_by_ -#define _di_f_int32ss_decrease_by_ -#define _di_f_int32ss_increase_ -#define _di_f_int32ss_increase_by_ -#define _di_f_int32ss_resize_ -#define _di_f_int32ss_t_ -#define _di_f_int32s_t_ -#define _di_f_int64s_adjust_ -#define _di_f_int64s_append_ -#define _di_f_int64s_append_all_ -#define _di_f_int64s_decimate_by_ -#define _di_f_int64s_decrease_by_ -#define _di_f_int64s_increase_ -#define _di_f_int64s_increase_by_ -#define _di_f_int64s_resize_ -#define _di_f_int64ss_adjust_ -#define _di_f_int64ss_append_ -#define _di_f_int64ss_append_all_ -#define _di_f_int64ss_decimate_by_ -#define _di_f_int64ss_decrease_by_ -#define _di_f_int64ss_increase_ -#define _di_f_int64ss_increase_by_ -#define _di_f_int64ss_resize_ -#define _di_f_int64ss_t_ -#define _di_f_int64s_t_ -#define _di_f_int8s_adjust_ -#define _di_f_int8s_append_ -#define _di_f_int8s_append_all_ -#define _di_f_int8s_decimate_by_ -#define _di_f_int8s_decrease_by_ -#define _di_f_int8s_increase_ -#define _di_f_int8s_increase_by_ -#define _di_f_int8s_resize_ -#define _di_f_int8ss_adjust_ -#define _di_f_int8ss_append_ -#define _di_f_int8ss_append_all_ -#define _di_f_int8ss_decimate_by_ -#define _di_f_int8ss_decrease_by_ -#define _di_f_int8ss_increase_ -#define _di_f_int8ss_increase_by_ -#define _di_f_int8ss_resize_ -#define _di_f_int8ss_t_ -#define _di_f_int8_t_ -#define _di_f_states_adjust_ -#define _di_f_states_append_ -#define _di_f_states_append_all_ -#define _di_f_states_decimate_by_ -#define _di_f_states_decrease_by_ -#define _di_f_states_increase_ -#define _di_f_states_increase_by_ -#define _di_f_states_resize_ -#define _di_f_statess_adjust_ -#define _di_f_statess_append_ -#define _di_f_statess_append_all_ -#define _di_f_statess_decimate_by_ -#define _di_f_statess_decrease_by_ -#define _di_f_statess_increase_ -#define _di_f_statess_increase_by_ -#define _di_f_statess_resize_ -#define _di_f_statess_t_ -#define _di_f_states_t_ -#define _di_f_statuss_adjust_ -#define _di_f_statuss_append_ -#define _di_f_statuss_append_all_ -#define _di_f_statuss_decimate_by_ -#define _di_f_statuss_decrease_by_ -#define _di_f_statuss_increase_ -#define _di_f_statuss_increase_by_ -#define _di_f_statuss_resize_ -#define _di_f_statusss_adjust_ -#define _di_f_statusss_append_ -#define _di_f_statusss_append_all_ -#define _di_f_statusss_decimate_by_ -#define _di_f_statusss_decrease_by_ -#define _di_f_statusss_increase_ -#define _di_f_statusss_increase_by_ -#define _di_f_statusss_resize_ -#define _di_f_statusss_t_ -#define _di_f_statuss_t_ -#define _di_f_uint128s_adjust_ -#define _di_f_uint128s_append_ -#define _di_f_uint128s_append_all_ -#define _di_f_uint128s_decimate_by_ -#define _di_f_uint128s_decrease_by_ -#define _di_f_uint128s_increase_ -#define _di_f_uint128s_increase_by_ -#define _di_f_uint128s_resize_ -#define _di_f_uint128ss_adjust_ -#define _di_f_uint128ss_append_ -#define _di_f_uint128ss_append_all_ -#define _di_f_uint128ss_decimate_by_ -#define _di_f_uint128ss_decrease_by_ -#define _di_f_uint128ss_increase_ -#define _di_f_uint128ss_increase_by_ -#define _di_f_uint128ss_resize_ -#define _di_f_uint128ss_t_ -#define _di_f_uint128s_t_ -#define _di_f_uint16s_adjust_ -#define _di_f_uint16s_append_ -#define _di_f_uint16s_append_all_ -#define _di_f_uint16s_decimate_by_ -#define _di_f_uint16s_decrease_by_ -#define _di_f_uint16s_increase_ -#define _di_f_uint16s_increase_by_ -#define _di_f_uint16s_resize_ -#define _di_f_uint16ss_adjust_ -#define _di_f_uint16ss_append_ -#define _di_f_uint16ss_append_all_ -#define _di_f_uint16ss_decimate_by_ -#define _di_f_uint16ss_decrease_by_ -#define _di_f_uint16ss_increase_ -#define _di_f_uint16ss_increase_by_ -#define _di_f_uint16ss_resize_ -#define _di_f_uint16ss_t_ -#define _di_f_uint16s_t_ -#define _di_f_uint32s_adjust_ -#define _di_f_uint32s_append_ -#define _di_f_uint32s_append_all_ -#define _di_f_uint32s_decimate_by_ -#define _di_f_uint32s_decrease_by_ -#define _di_f_uint32s_increase_ -#define _di_f_uint32s_increase_by_ -#define _di_f_uint32s_resize_ -#define _di_f_uint32ss_adjust_ -#define _di_f_uint32ss_append_ -#define _di_f_uint32ss_append_all_ -#define _di_f_uint32ss_decimate_by_ -#define _di_f_uint32ss_decrease_by_ -#define _di_f_uint32ss_increase_ -#define _di_f_uint32ss_increase_by_ -#define _di_f_uint32ss_resize_ -#define _di_f_uint32ss_t_ -#define _di_f_uint32s_t_ -#define _di_f_uint64s_adjust_ -#define _di_f_uint64s_append_ -#define _di_f_uint64s_append_all_ -#define _di_f_uint64s_decimate_by_ -#define _di_f_uint64s_decrease_by_ -#define _di_f_uint64s_increase_ -#define _di_f_uint64s_increase_by_ -#define _di_f_uint64s_resize_ -#define _di_f_uint64ss_adjust_ -#define _di_f_uint64ss_append_ -#define _di_f_uint64ss_append_all_ -#define _di_f_uint64ss_decimate_by_ -#define _di_f_uint64ss_decrease_by_ -#define _di_f_uint64ss_increase_ -#define _di_f_uint64ss_increase_by_ -#define _di_f_uint64ss_resize_ -#define _di_f_uint64ss_t_ -#define _di_f_uint64s_t_ -#define _di_f_uint8s_adjust_ -#define _di_f_uint8s_append_ -#define _di_f_uint8s_append_all_ -#define _di_f_uint8s_decimate_by_ -#define _di_f_uint8s_decrease_by_ -#define _di_f_uint8s_increase_ -#define _di_f_uint8s_increase_by_ -#define _di_f_uint8s_resize_ -#define _di_f_uint8ss_adjust_ -#define _di_f_uint8ss_append_ -#define _di_f_uint8ss_append_all_ -#define _di_f_uint8ss_decimate_by_ -#define _di_f_uint8ss_decrease_by_ -#define _di_f_uint8ss_increase_ -#define _di_f_uint8ss_increase_by_ -#define _di_f_uint8ss_resize_ -#define _di_f_uint8ss_t_ -#define _di_f_uint8s_t_ diff --git a/build/disable/level_0/f_utf.h b/build/disable/level_0/f_utf.h index 9cb6880..4211a61 100644 --- a/build/disable/level_0/f_utf.h +++ b/build/disable/level_0/f_utf.h @@ -36,8 +36,11 @@ #define _di_f_utf_character_unicode_from_ #define _di_f_utf_character_unicode_string_to_ #define _di_f_utf_character_unicode_to_ -#define _di_f_utf_char_t_ +#define _di_f_utf_char_eol_s_ +#define _di_f_utf_char_eos_s_ +#define _di_f_utf_char_placeholder_s_ #define _di_f_utf_char_s_ +#define _di_f_utf_char_t_ #define _di_f_utf_char_to_char_ #define _di_f_utf_char_to_character_ #define _di_f_utf_is_ @@ -72,7 +75,27 @@ #define _di_f_utf_is_word_dash_ #define _di_f_utf_is_word_dash_plus_ #define _di_f_utf_is_zero_width_ +#define _di_f_utf_space_em_per_four_s_ +#define _di_f_utf_space_em_per_six_s_ +#define _di_f_utf_space_em_per_three_s_ +#define _di_f_utf_space_em_quad_s_ +#define _di_f_utf_space_em_s_ +#define _di_f_utf_space_en_quad_s_ +#define _di_f_utf_space_en_s_ +#define _di_f_utf_space_figure_s_ +#define _di_f_utf_space_hair_s_ +#define _di_f_utf_space_ideographic_s_ +#define _di_f_utf_space_line_feed_reverse_s_ +#define _di_f_utf_space_line_next_s_ +#define _di_f_utf_space_medium_mathematical_s_ +#define _di_f_utf_space_no_break_narrow_s_ +#define _di_f_utf_space_no_break_s_ +#define _di_f_utf_space_ogham_s_ +#define _di_f_utf_space_punctuation_s_ #define _di_f_utf_space_s_ +#define _di_f_utf_space_separator_line_s_ +#define _di_f_utf_space_separator_paragraph_s_ +#define _di_f_utf_space_thin_s_ #define _di_f_utf_string_append_ #define _di_f_utf_string_append_assure_ #define _di_f_utf_string_append_assure_nulless_ @@ -204,7 +227,12 @@ #define _di_f_utf_string_tripless_t_ #define _di_f_utf_string_triples_t_ #define _di_f_utf_string_triple_t_ +#define _di_f_utf_substitute_middle_dot_s_ +#define _di_f_utf_substitute_open_box_s_ +#define _di_f_utf_substitute_open_box_shouldered_s_ #define _di_f_utf_substitute_s_ +#define _di_f_utf_substitute_symbol_blank_s_ +#define _di_f_utf_substitute_symbol_space_s_ #define _di_f_utf_unicode_from_ #define _di_f_utf_unicode_string_to_ #define _di_f_utf_unicode_to_ diff --git a/build/disable/level_1/fl_control_group.h b/build/disable/level_1/fl_control_group.h index 6e56979..3892598 100644 --- a/build/disable/level_1/fl_control_group.h +++ b/build/disable/level_1/fl_control_group.h @@ -1 +1,2 @@ #define _di_fl_control_group_apply_ +#define _di_level_1_parameter_checking_ diff --git a/build/disable/level_1/fl_conversion.h b/build/disable/level_1/fl_conversion.h index 5f4bb63..52f81d2 100644 --- a/build/disable/level_1/fl_conversion.h +++ b/build/disable/level_1/fl_conversion.h @@ -1,6 +1,13 @@ +#define _di_fl_conversion_data_base_10_c_ +#define _di_fl_conversion_data_base_12_c_ +#define _di_fl_conversion_data_base_16_c_ +#define _di_fl_conversion_data_base_2_c_ +#define _di_fl_conversion_data_base_8_c_ +#define _di_fl_conversion_data_c_ +#define _di_fl_conversion_data_endian_big_c_ +#define _di_fl_conversion_data_endian_little_c_ #define _di_fl_conversion_data_flag_d_ #define _di_fl_conversion_data_t_ -#define _di_fl_conversion_data_c_ #define _di_fl_conversion_dynamic_partial_to_signed_ #define _di_fl_conversion_dynamic_partial_to_signed_detect_ #define _di_fl_conversion_dynamic_partial_to_unsigned_ @@ -9,3 +16,4 @@ #define _di_fl_conversion_dynamic_to_signed_detect_ #define _di_fl_conversion_dynamic_to_unsigned_ #define _di_fl_conversion_dynamic_to_unsigned_detect_ +#define _di_level_1_parameter_checking_ diff --git a/build/disable/level_1/fl_directory.h b/build/disable/level_1/fl_directory.h index 6405a8c..f643b95 100644 --- a/build/disable/level_1/fl_directory.h +++ b/build/disable/level_1/fl_directory.h @@ -6,4 +6,6 @@ #define _di_fl_directory_list_ #define _di_fl_directory_path_pop_ #define _di_fl_directory_path_push_ +#define _di_fl_directory_recurse_d_ #define _di_fl_directory_recurse_t_ +#define _di_level_1_parameter_checking_ diff --git a/build/disable/level_1/fl_environment.h b/build/disable/level_1/fl_environment.h index 9e4f843..2b85be7 100644 --- a/build/disable/level_1/fl_environment.h +++ b/build/disable/level_1/fl_environment.h @@ -2,3 +2,4 @@ #define _di_fl_environment_load_names_ #define _di_fl_environment_path_explode_ #define _di_fl_environment_path_explode_reverse_ +#define _di_level_1_parameter_checking_ diff --git a/build/disable/level_1/fl_execute.h b/build/disable/level_1/fl_execute.h index b88ddfb..7f0bb06 100644 --- a/build/disable/level_1/fl_execute.h +++ b/build/disable/level_1/fl_execute.h @@ -1,2 +1,3 @@ #define _di_fl_execute_as_t_ +#define _di_fl_execute_parameter_option_d_ #define _di_fl_execute_parameter_t_ diff --git a/build/disable/level_1/fl_fss.h b/build/disable/level_1/fl_fss.h index c613f14..5835fd8 100644 --- a/build/disable/level_1/fl_fss.h +++ b/build/disable/level_1/fl_fss.h @@ -18,3 +18,9 @@ #define _di_fl_fss_extended_list_object_write_ #define _di_fl_fss_extended_object_read_ #define _di_fl_fss_extended_object_write_ +#define _di_level_1_parameter_checking_ +#define _di_private_macro_fl_fss_content_with_comments_return_on_overflow_ +#define _di_private_macro_fl_fss_nest_return_on_overflow_ +#define _di_private_macro_fl_fss_nest_return_on_overflow_delimited_ +#define _di_private_macro_fl_fss_object_return_on_overflow_ +#define _di_private_macro_fl_fss_object_return_on_overflow_delimited_ diff --git a/build/disable/level_1/fl_iki.h b/build/disable/level_1/fl_iki.h index f0f452d..d7386ac 100644 --- a/build/disable/level_1/fl_iki.h +++ b/build/disable/level_1/fl_iki.h @@ -1 +1,2 @@ #define _di_fl_iki_read_ +#define _di_level_1_parameter_checking_ diff --git a/build/disable/level_1/fl_print.h b/build/disable/level_1/fl_print.h index cb3424b..532366a 100644 --- a/build/disable/level_1/fl_print.h +++ b/build/disable/level_1/fl_print.h @@ -1,3 +1,5 @@ +#define _di_fl_print_debug_s_ +#define _di_fl_print_error_s_ #define _di_fl_print_format_ #define _di_fl_print_format_convert_ #define _di_fl_print_s_ @@ -39,3 +41,5 @@ #define _di_fl_print_trim_raw_ #define _di_fl_print_trim_raw_safely_ #define _di_fl_print_trim_safely_ +#define _di_fl_print_warning_s_ +#define _di_level_1_parameter_checking_ diff --git a/build/disable/level_1/fl_signal.h b/build/disable/level_1/fl_signal.h index e045811..c91a0d1 100644 --- a/build/disable/level_1/fl_signal.h +++ b/build/disable/level_1/fl_signal.h @@ -1,2 +1,3 @@ #define _di_fl_signal_interrupt_t_ #define _di_fl_signal_state_interrupt_ +#define _di_level_1_parameter_checking_ diff --git a/build/disable/level_1/fl_string.h b/build/disable/level_1/fl_string.h index 0f17112..aa5151d 100644 --- a/build/disable/level_1/fl_string.h +++ b/build/disable/level_1/fl_string.h @@ -37,3 +37,4 @@ #define _di_fl_string_seek_line_until_graph_ #define _di_fl_string_seek_line_until_graph_non_ #define _di_fl_string_seek_to_utf_character_ +#define _di_level_1_parameter_checking_ diff --git a/build/disable/level_1/fl_utf.h b/build/disable/level_1/fl_utf.h index ca34f0e..c2affb9 100644 --- a/build/disable/level_1/fl_utf.h +++ b/build/disable/level_1/fl_utf.h @@ -17,3 +17,4 @@ #define _di_fl_utf_string_seek_line_until_graph_non_ #define _di_fl_utf_string_seek_to_char_ #define _di_fl_utf_string_seek_to_character_ +#define _di_level_1_parameter_checking_ diff --git a/build/disable/level_1/fl_utf_file.h b/build/disable/level_1/fl_utf_file.h index 9ecf2a3..10b4293 100644 --- a/build/disable/level_1/fl_utf_file.h +++ b/build/disable/level_1/fl_utf_file.h @@ -5,3 +5,5 @@ #define _di_fl_utf_file_write_block_ #define _di_fl_utf_file_write_range_ #define _di_fl_utf_file_write_until_ +#define _di_level_0_parameter_checking_ +#define _di_level_1_parameter_checking_ diff --git a/build/disable/level_2/fll_error.h b/build/disable/level_2/fll_error.h index 2d1997d..7908496 100644 --- a/build/disable/level_2/fll_error.h +++ b/build/disable/level_2/fll_error.h @@ -1,4 +1,10 @@ #define _di_fll_error_file_print_ +#define _di_fll_error_file_type_directory_s_ #define _di_fll_error_file_type_e_ +#define _di_fll_error_file_type_file_s_ +#define _di_fll_error_file_type_path_s_ +#define _di_fll_error_file_type_pipe_s_ +#define _di_fll_error_file_type_s_ +#define _di_fll_error_file_type_socket_s_ #define _di_fll_error_parameter_integer_print_ #define _di_fll_error_print_ diff --git a/build/disable/level_2/fll_execute.h b/build/disable/level_2/fll_execute.h index bfa1691..a171d6a 100644 --- a/build/disable/level_2/fll_execute.h +++ b/build/disable/level_2/fll_execute.h @@ -4,3 +4,5 @@ #define _di_fll_execute_arguments_add_set_ #define _di_fll_execute_into_ #define _di_fll_execute_program_ +#define _di_level_2_parameter_checking_ +#define _di_pthread_support_ diff --git a/build/disable/level_2/fll_file.h b/build/disable/level_2/fll_file.h index 8b0d976..5f3c5e8 100644 --- a/build/disable/level_2/fll_file.h +++ b/build/disable/level_2/fll_file.h @@ -1,3 +1,4 @@ #define _di_fll_file_mode_set_all_ #define _di_fll_file_move_ #define _di_fll_file_role_change_all_ +#define _di_level_2_parameter_checking_ diff --git a/build/disable/level_2/fll_fss.h b/build/disable/level_2/fll_fss.h index 467c132..08a48bf 100644 --- a/build/disable/level_2/fll_fss.h +++ b/build/disable/level_2/fll_fss.h @@ -21,3 +21,4 @@ #define _di_fll_fss_snatch_mash_ #define _di_fll_fss_snatch_mash_apart_ #define _di_fll_fss_snatch_together_ +#define _di_level_2_parameter_checking_ diff --git a/build/disable/level_2/fll_fss_status_string.h b/build/disable/level_2/fll_fss_status_string.h index 37418de..d9e0a3e 100644 --- a/build/disable/level_2/fll_fss_status_string.h +++ b/build/disable/level_2/fll_fss_status_string.h @@ -5,3 +5,4 @@ #define _di_fll_fss_status_string_to_ #define _di_fll_fss_status_success_ #define _di_fll_fss_status_warning_ +#define _di_level_2_parameter_checking_ diff --git a/build/disable/level_2/fll_iki.h b/build/disable/level_2/fll_iki.h index 61fc24d..b2175e4 100644 --- a/build/disable/level_2/fll_iki.h +++ b/build/disable/level_2/fll_iki.h @@ -2,3 +2,4 @@ #define _di_fll_iki_content_partial_escape_ #define _di_fll_iki_content_partial_unescape_ #define _di_fll_iki_content_unescape_ +#define _di_level_2_parameter_checking_ diff --git a/build/disable/level_2/fll_path.h b/build/disable/level_2/fll_path.h index 2671578..d6bd6b8 100644 --- a/build/disable/level_2/fll_path.h +++ b/build/disable/level_2/fll_path.h @@ -1 +1,2 @@ #define _di_fll_path_canonical_ +#define _di_level_2_parameter_checking_ diff --git a/build/disable/level_2/fll_program.h b/build/disable/level_2/fll_program.h index 639fcc2..54dfca9 100644 --- a/build/disable/level_2/fll_program.h +++ b/build/disable/level_2/fll_program.h @@ -6,6 +6,8 @@ #define _di_fll_program_parameter_additional_mash_ #define _di_fll_program_parameter_additional_rip_ #define _di_fll_program_parameter_additional_rip_mash_ +#define _di_fll_program_parameter_filename_s_ +#define _di_fll_program_parameter_filenames_s_ #define _di_fll_program_parameter_process_context_ #define _di_fll_program_parameter_process_empty_ #define _di_fll_program_parameter_process_verbosity_ @@ -41,3 +43,5 @@ #define _di_fll_program_standard_set_up_ #define _di_fll_program_standard_signal_received_ #define _di_fll_program_standard_signal_state_ +#define _di_level_2_parameter_checking_ +#define _di_level_2_parameters_checking_ diff --git a/build/disable/level_2/fll_status_string.h b/build/disable/level_2/fll_status_string.h index c8e7541..7ca7070 100644 --- a/build/disable/level_2/fll_status_string.h +++ b/build/disable/level_2/fll_status_string.h @@ -1 +1,22 @@ #define _di_fll_status_string_from_ +#define _di_f_status_access_ +#define _di_f_status_array_ +#define _di_f_status_available_ +#define _di_f_status_basic_ +#define _di_f_status_boolean_ +#define _di_f_status_buffer_ +#define _di_f_status_busy_ +#define _di_f_status_compare_ +#define _di_f_status_directory_ +#define _di_f_status_end_ +#define _di_f_status_file_ +#define _di_f_status_filesystem_ +#define _di_f_status_network_ +#define _di_f_status_number_ +#define _di_f_status_process_ +#define _di_f_status_return_ +#define _di_f_status_signal_ +#define _di_f_status_socket_ +#define _di_f_status_terminal_ +#define _di_level_0_parameter_checking_ +#define _di_level_2_parameter_checking_ diff --git a/level_0/f_color/c/color/common.c b/level_0/f_color/c/color/common.c index 45ef813..725f8da 100644 --- a/level_0/f_color/c/color/common.c +++ b/level_0/f_color/c/color/common.c @@ -4,54 +4,180 @@ extern "C" { #endif -#ifndef _di_f_color_strings_s_ - const f_string_static_t f_color_string_begin_s = macro_f_string_static_t_initialize(F_color_string_begin_s, 0, F_color_string_begin_s_length); - const f_string_static_t f_color_string_end_s = macro_f_string_static_t_initialize(F_color_string_end_s, 0, F_color_string_end_s_length); - const f_string_static_t f_color_string_medium_s = macro_f_string_static_t_initialize(F_color_string_medium_s, 0, F_color_string_medium_s_length); - - const f_string_static_t f_color_string_code_reset_s = macro_f_string_static_t_initialize(F_color_string_code_reset_s, 0, F_color_string_code_reset_s_length); - const f_string_static_t f_color_string_code_bold_s = macro_f_string_static_t_initialize(F_color_string_code_bold_s, 0, F_color_string_code_bold_s_length); - const f_string_static_t f_color_string_code_underline_s = macro_f_string_static_t_initialize(F_color_string_code_underline_s, 0, F_color_string_code_underline_s_length); - const f_string_static_t f_color_string_code_blink_s = macro_f_string_static_t_initialize(F_color_string_code_blink_s, 0, F_color_string_code_blink_s_length); - const f_string_static_t f_color_string_code_reverse_s = macro_f_string_static_t_initialize(F_color_string_code_reverse_s, 0, F_color_string_code_reverse_s_length); - const f_string_static_t f_color_string_code_conceal_s = macro_f_string_static_t_initialize(F_color_string_code_conceal_s, 0, F_color_string_code_conceal_s_length); - const f_string_static_t f_color_string_code_black_s = macro_f_string_static_t_initialize(F_color_string_code_black_s, 0, F_color_string_code_black_s_length); - const f_string_static_t f_color_string_code_red_s = macro_f_string_static_t_initialize(F_color_string_code_red_s, 0, F_color_string_code_red_s_length); - const f_string_static_t f_color_string_code_green_s = macro_f_string_static_t_initialize(F_color_string_code_green_s, 0, F_color_string_code_green_s_length); - const f_string_static_t f_color_string_code_yellow_s = macro_f_string_static_t_initialize(F_color_string_code_yellow_s, 0, F_color_string_code_yellow_s_length); - const f_string_static_t f_color_string_code_blue_s = macro_f_string_static_t_initialize(F_color_string_code_blue_s, 0, F_color_string_code_blue_s_length); - const f_string_static_t f_color_string_code_purple_s = macro_f_string_static_t_initialize(F_color_string_code_purple_s, 0, F_color_string_code_purple_s_length); - const f_string_static_t f_color_string_code_teal_s = macro_f_string_static_t_initialize(F_color_string_code_teal_s, 0, F_color_string_code_teal_s_length); - const f_string_static_t f_color_string_code_white_s = macro_f_string_static_t_initialize(F_color_string_code_white_s, 0, F_color_string_code_white_s_length); - const f_string_static_t f_color_string_code_black_bg_s = macro_f_string_static_t_initialize(F_color_string_code_black_bg_s, 0, F_color_string_code_black_bg_s_length); - const f_string_static_t f_color_string_code_red_bg_s = macro_f_string_static_t_initialize(F_color_string_code_red_bg_s, 0, F_color_string_code_red_bg_s_length); - const f_string_static_t f_color_string_code_green_bg_s = macro_f_string_static_t_initialize(F_color_string_code_green_bg_s, 0, F_color_string_code_green_bg_s_length); - const f_string_static_t f_color_string_code_yellow_bg_s = macro_f_string_static_t_initialize(F_color_string_code_yellow_bg_s, 0, F_color_string_code_yellow_bg_s_length); - const f_string_static_t f_color_string_code_blue_bg_s = macro_f_string_static_t_initialize(F_color_string_code_blue_bg_s, 0, F_color_string_code_blue_bg_s_length); - const f_string_static_t f_color_string_code_purple_bg_s = macro_f_string_static_t_initialize(F_color_string_code_purple_bg_s, 0, F_color_string_code_purple_bg_s_length); - const f_string_static_t f_color_string_code_teal_bg_s = macro_f_string_static_t_initialize(F_color_string_code_teal_bg_s, 0, F_color_string_code_teal_bg_s_length); - const f_string_static_t f_color_string_code_white_bg_s = macro_f_string_static_t_initialize(F_color_string_code_white_bg_s, 0, F_color_string_code_white_bg_s_length); - const f_string_static_t f_color_string_code_bright_black_s = macro_f_string_static_t_initialize(F_color_string_code_bright_black_s, 0, F_color_string_code_bright_black_s_length); - const f_string_static_t f_color_string_code_bright_red_s = macro_f_string_static_t_initialize(F_color_string_code_bright_red_s, 0, F_color_string_code_bright_red_s_length); - const f_string_static_t f_color_string_code_bright_green_s = macro_f_string_static_t_initialize(F_color_string_code_bright_green_s, 0, F_color_string_code_bright_green_s_length); - const f_string_static_t f_color_string_code_bright_yellow_s = macro_f_string_static_t_initialize(F_color_string_code_bright_yellow_s, 0, F_color_string_code_bright_yellow_s_length); - const f_string_static_t f_color_string_code_bright_blue_s = macro_f_string_static_t_initialize(F_color_string_code_bright_blue_s, 0, F_color_string_code_bright_blue_s_length); - const f_string_static_t f_color_string_code_bright_purple_s = macro_f_string_static_t_initialize(F_color_string_code_bright_purple_s, 0, F_color_string_code_bright_purple_s_length); - const f_string_static_t f_color_string_code_bright_teal_s = macro_f_string_static_t_initialize(F_color_string_code_bright_teal_s, 0, F_color_string_code_bright_teal_s_length); - const f_string_static_t f_color_string_code_bright_white_s = macro_f_string_static_t_initialize(F_color_string_code_bright_white_s, 0, F_color_string_code_bright_white_s_length); - const f_string_static_t f_color_string_code_bright_black_bg_s = macro_f_string_static_t_initialize(F_color_string_code_bright_black_bg_s, 0, F_color_string_code_bright_black_bg_s_length); - const f_string_static_t f_color_string_code_bright_red_bg_s = macro_f_string_static_t_initialize(F_color_string_code_bright_red_bg_s, 0, F_color_string_code_bright_red_bg_s_length); - const f_string_static_t f_color_string_code_bright_green_bg_s = macro_f_string_static_t_initialize(F_color_string_code_bright_green_bg_s, 0, F_color_string_code_bright_green_bg_s_length); - const f_string_static_t f_color_string_code_bright_yellow_bg_s = macro_f_string_static_t_initialize(F_color_string_code_bright_yellow_bg_s, 0, F_color_string_code_bright_yellow_bg_s_length); - const f_string_static_t f_color_string_code_bright_blue_bg_s = macro_f_string_static_t_initialize(F_color_string_code_bright_blue_bg_s, 0, F_color_string_code_bright_blue_bg_s_length); - const f_string_static_t f_color_string_code_bright_purple_bg_s = macro_f_string_static_t_initialize(F_color_string_code_bright_purple_bg_s, 0, F_color_string_code_bright_purple_bg_s_length); - const f_string_static_t f_color_string_code_bright_teal_bg_s = macro_f_string_static_t_initialize(F_color_string_code_bright_teal_bg_s, 0, F_color_string_code_bright_teal_bg_s_length); - const f_string_static_t f_color_string_code_bright_white_bg_s = macro_f_string_static_t_initialize(F_color_string_code_bright_white_bg_s, 0, F_color_string_code_bright_white_bg_s_length); -#endif // _di_f_color_strings_s_ +#ifndef _di_f_color_s_ + #ifndef _di_f_color_begin_s_ + const f_string_static_t f_color_begin_s = macro_f_string_static_t_initialize(F_color_string_begin_s, 0, F_color_string_begin_s_length); + #endif // _di_f_color_begin_s_ + + #ifndef _di_f_color_end_s_ + const f_string_static_t f_color_end_s = macro_f_string_static_t_initialize(F_color_string_end_s, 0, F_color_string_end_s_length); + #endif // _di_f_color_end_s_ + + #ifndef _di_f_color_medium_s_ + const f_string_static_t f_color_medium_s = macro_f_string_static_t_initialize(F_color_string_medium_s, 0, F_color_string_medium_s_length); + #endif // _di_f_color_medium_s_ + + #ifndef _di_f_color_code_reset_s_ + const f_string_static_t f_color_code_reset_s = macro_f_string_static_t_initialize(F_color_string_code_reset_s, 0, F_color_string_code_reset_s_length); + #endif // _di_f_color_reset_s_ + + #ifndef _di_f_color_code_bold_s_ + const f_string_static_t f_color_code_bold_s = macro_f_string_static_t_initialize(F_color_string_code_bold_s, 0, F_color_string_code_bold_s_length); + #endif // _di_f_color_code_bold_s_ + + #ifndef _di_f_color_code_underline_s_ + const f_string_static_t f_color_code_underline_s = macro_f_string_static_t_initialize(F_color_string_code_underline_s, 0, F_color_string_code_underline_s_length); + #endif // _di_f_color_code_underline_s_ + + #ifndef _di_f_color_code_blink_s_ + const f_string_static_t f_color_code_blink_s = macro_f_string_static_t_initialize(F_color_string_code_blink_s, 0, F_color_string_code_blink_s_length); + #endif // _di_f_color_code_blink_s_ + + #ifndef _di_f_color_code_reverse_s_ + const f_string_static_t f_color_code_reverse_s = macro_f_string_static_t_initialize(F_color_string_code_reverse_s, 0, F_color_string_code_reverse_s_length); + #endif // _di_f_color_code_reverse_s_ + + #ifndef _di_f_color_code_conceal_s_ + const f_string_static_t f_color_code_conceal_s = macro_f_string_static_t_initialize(F_color_string_code_conceal_s, 0, F_color_string_code_conceal_s_length); + #endif // _di_f_color_code_conceal_s_ + + #ifndef _di_f_color_code_black_s_ + const f_string_static_t f_color_code_black_s = macro_f_string_static_t_initialize(F_color_string_code_black_s, 0, F_color_string_code_black_s_length); + #endif // _di_f_color_code_black_s_ + + #ifndef _di_f_color_code_red_s_ + const f_string_static_t f_color_code_red_s = macro_f_string_static_t_initialize(F_color_string_code_red_s, 0, F_color_string_code_red_s_length); + #endif // _di_f_color_code_red_s_ + + #ifndef _di_f_color_code_green_s_ + const f_string_static_t f_color_code_green_s = macro_f_string_static_t_initialize(F_color_string_code_green_s, 0, F_color_string_code_green_s_length); + #endif // _di_f_color_code_green_s_ + + #ifndef _di_f_color_code_yellow_s_ + const f_string_static_t f_color_code_yellow_s = macro_f_string_static_t_initialize(F_color_string_code_yellow_s, 0, F_color_string_code_yellow_s_length); + #endif // _di_f_color_code_yellow_s_ + + #ifndef _di_f_color_code_blue_s_ + const f_string_static_t f_color_code_blue_s = macro_f_string_static_t_initialize(F_color_string_code_blue_s, 0, F_color_string_code_blue_s_length); + #endif // _di_f_color_code_blue_s_ + + #ifndef _di_f_color_code_purple_s_ + const f_string_static_t f_color_code_purple_s = macro_f_string_static_t_initialize(F_color_string_code_purple_s, 0, F_color_string_code_purple_s_length); + #endif // _di_f_color_code_purple_s_ + + #ifndef _di_f_color_code_teal_s_ + const f_string_static_t f_color_code_teal_s = macro_f_string_static_t_initialize(F_color_string_code_teal_s, 0, F_color_string_code_teal_s_length); + #endif // _di_f_color_code_teal_s_ + + #ifndef _di_f_color_code_white_s_ + const f_string_static_t f_color_code_white_s = macro_f_string_static_t_initialize(F_color_string_code_white_s, 0, F_color_string_code_white_s_length); + #endif // _di_f_color_code_white_s_ + + #ifndef _di_f_color_code_black_bg_s_ + const f_string_static_t f_color_code_black_bg_s = macro_f_string_static_t_initialize(F_color_string_code_black_bg_s, 0, F_color_string_code_black_bg_s_length); + #endif // _di_f_color_code_black_bg_s_ + + #ifndef _di_f_color_code_red_bg_s_ + const f_string_static_t f_color_code_red_bg_s = macro_f_string_static_t_initialize(F_color_string_code_red_bg_s, 0, F_color_string_code_red_bg_s_length); + #endif // _di_f_color_code_red_bg_s_ + + #ifndef _di_f_color_code_green_bg_s_ + const f_string_static_t f_color_code_green_bg_s = macro_f_string_static_t_initialize(F_color_string_code_green_bg_s, 0, F_color_string_code_green_bg_s_length); + #endif // _di_f_color_code_green_bg_s_ + + #ifndef _di_f_color_code_yellow_bg_s_ + const f_string_static_t f_color_code_yellow_bg_s = macro_f_string_static_t_initialize(F_color_string_code_yellow_bg_s, 0, F_color_string_code_yellow_bg_s_length); + #endif // _di_f_color_code_yellow_bg_s_ + + #ifndef _di_f_color_code_blue_bg_s_ + const f_string_static_t f_color_code_blue_bg_s = macro_f_string_static_t_initialize(F_color_string_code_blue_bg_s, 0, F_color_string_code_blue_bg_s_length); + #endif // _di_f_color_code_blue_bg_s_ + + #ifndef _di_f_color_code_purple_bg_s_ + const f_string_static_t f_color_code_purple_bg_s = macro_f_string_static_t_initialize(F_color_string_code_purple_bg_s, 0, F_color_string_code_purple_bg_s_length); + #endif // _di_f_color_code_purple_bg_s_ + + #ifndef _di_f_color_code_teal_bg_s_ + const f_string_static_t f_color_code_teal_bg_s = macro_f_string_static_t_initialize(F_color_string_code_teal_bg_s, 0, F_color_string_code_teal_bg_s_length); + #endif // _di_f_color_code_teal_bg_s_ + + #ifndef _di_f_color_code_white_bg_s_ + const f_string_static_t f_color_code_white_bg_s = macro_f_string_static_t_initialize(F_color_string_code_white_bg_s, 0, F_color_string_code_white_bg_s_length); + #endif // _di_f_color_code_white_bg_s_ + + #ifndef _di_f_color_code_bright_black_s_ + const f_string_static_t f_color_code_bright_black_s = macro_f_string_static_t_initialize(F_color_string_code_bright_black_s, 0, F_color_string_code_bright_black_s_length); + #endif // _di_f_color_code_bright_black_s_ + + #ifndef _di_f_color_code_bright_red_s_ + const f_string_static_t f_color_code_bright_red_s = macro_f_string_static_t_initialize(F_color_string_code_bright_red_s, 0, F_color_string_code_bright_red_s_length); + #endif // _di_f_color_code_bright_red_s_ + + #ifndef _di_f_color_code_bright_green_s_ + const f_string_static_t f_color_code_bright_green_s = macro_f_string_static_t_initialize(F_color_string_code_bright_green_s, 0, F_color_string_code_bright_green_s_length); + #endif // _di_f_color_code_bright_green_s_ + + #ifndef _di_f_color_code_bright_yellow_s_ + const f_string_static_t f_color_code_bright_yellow_s = macro_f_string_static_t_initialize(F_color_string_code_bright_yellow_s, 0, F_color_string_code_bright_yellow_s_length); + #endif // _di_f_color_code_bright_yellow_s_ + + #ifndef _di_f_color_code_bright_blue_s_ + const f_string_static_t f_color_code_bright_blue_s = macro_f_string_static_t_initialize(F_color_string_code_bright_blue_s, 0, F_color_string_code_bright_blue_s_length); + #endif // _di_f_color_code_bright_blue_s_ + + #ifndef _di_f_color_code_bright_purple_s_ + const f_string_static_t f_color_code_bright_purple_s = macro_f_string_static_t_initialize(F_color_string_code_bright_purple_s, 0, F_color_string_code_bright_purple_s_length); + #endif // _di_f_color_code_bright_purple_s_ + + #ifndef _di_f_color_code_bright_teal_s_ + const f_string_static_t f_color_code_bright_teal_s = macro_f_string_static_t_initialize(F_color_string_code_bright_teal_s, 0, F_color_string_code_bright_teal_s_length); + #endif // _di_f_color_code_bright_teal_s_ + + #ifndef _di_f_color_code_bright_white_s_ + const f_string_static_t f_color_code_bright_white_s = macro_f_string_static_t_initialize(F_color_string_code_bright_white_s, 0, F_color_string_code_bright_white_s_length); + #endif // _di_f_color_code_bright_white_s_ + + #ifndef _di_f_color_code_bright_black_bg_s_ + const f_string_static_t f_color_code_bright_black_bg_s = macro_f_string_static_t_initialize(F_color_string_code_bright_black_bg_s, 0, F_color_string_code_bright_black_bg_s_length); + #endif // _di_f_color_code_bright_black_bg_s_ + + #ifndef _di_f_color_code_bright_red_bg_s_ + const f_string_static_t f_color_code_bright_red_bg_s = macro_f_string_static_t_initialize(F_color_string_code_bright_red_bg_s, 0, F_color_string_code_bright_red_bg_s_length); + #endif // _di_f_color_code_bright_red_bg_s_ + + #ifndef _di_f_color_code_bright_green_bg_s_ + const f_string_static_t f_color_code_bright_green_bg_s = macro_f_string_static_t_initialize(F_color_string_code_bright_green_bg_s, 0, F_color_string_code_bright_green_bg_s_length); + #endif // _di_f_color_code_bright_green_bg_s_ + + #ifndef _di_f_color_code_bright_yellow_bg_s_ + const f_string_static_t f_color_code_bright_yellow_bg_s = macro_f_string_static_t_initialize(F_color_string_code_bright_yellow_bg_s, 0, F_color_string_code_bright_yellow_bg_s_length); + #endif // _di_f_color_code_bright_yellow_bg_s_ + + #ifndef _di_f_color_code_bright_blue_bg_s_ + const f_string_static_t f_color_code_bright_blue_bg_s = macro_f_string_static_t_initialize(F_color_string_code_bright_blue_bg_s, 0, F_color_string_code_bright_blue_bg_s_length); + #endif // _di_f_color_code__s_ + + #ifndef _di_f_color_code_bright_purple_bg_s_ + const f_string_static_t f_color_code_bright_purple_bg_s = macro_f_string_static_t_initialize(F_color_string_code_bright_purple_bg_s, 0, F_color_string_code_bright_purple_bg_s_length); + #endif // _di_f_color_code_bright_purple_bg_s_ + + #ifndef _di_f_color_code_bright_teal_bg_s_ + const f_string_static_t f_color_code_bright_teal_bg_s = macro_f_string_static_t_initialize(F_color_string_code_bright_teal_bg_s, 0, F_color_string_code_bright_teal_bg_s_length); + #endif // _di_f_color_code_bright_teal_bg_s_ + + #ifndef _di_f_color_code_bright_white_bg_s_ + const f_string_static_t f_color_code_bright_white_bg_s = macro_f_string_static_t_initialize(F_color_string_code_bright_white_bg_s, 0, F_color_string_code_bright_white_bg_s_length); + #endif // _di_f_color_code_bright_white_bg_s_ +#endif // _di_f_color_s_ #ifndef _di_f_color_terminal_s_ - const f_string_static_t f_color_terminal_name_s = macro_f_string_static_t_initialize(F_color_terminal_name_s, 0, F_color_terminal_name_s_length); - const f_string_static_t f_color_terminal_value_linux_s = macro_f_string_static_t_initialize(F_color_terminal_value_linux_s, 0, F_color_terminal_value_linux_s_length); + #ifndef _di_f_color_terminal_name_s_ + const f_string_static_t f_color_terminal_name_s = macro_f_string_static_t_initialize(F_color_terminal_name_s, 0, F_color_terminal_name_s_length); + #endif // _di_f_color_terminal_name_s_ + + #ifndef _di_f_color_terminal_value_linux_s_ + const f_string_static_t f_color_terminal_value_linux_s = macro_f_string_static_t_initialize(F_color_terminal_value_linux_s, 0, F_color_terminal_value_linux_s_length); + #endif // _di_f_color_terminal_value_linux_s_ #endif // _di_f_color_terminal_s_ #ifndef _di_f_color_set_string_empty_s_ diff --git a/level_0/f_color/c/color/common.h b/level_0/f_color/c/color/common.h index 52a95fd..eb360a5 100644 --- a/level_0/f_color/c/color/common.h +++ b/level_0/f_color/c/color/common.h @@ -17,56 +17,6 @@ extern "C" { #endif /** - * Color max size represents the maximum length of the resulting color string. - * - * This color max size does not include the terminating null. - * - * A color max size terminated represents the max size with the terminating null. - */ -#ifndef _di_f_color_max_size_d_ - #define F_color_max_size_d 7 - #define F_color_max_size_terminated_d 8 -#endif // _di_f_color_max_size_d_ - -/** - * Define codes representing color sets. - * - * F_color_code_*_e: - * - none: No color code set defined. - * - linux: Linux terminal color code set. - * - xterminal: X-Terminal color code set. - */ -#ifndef _di_f_color_code_t_ - typedef f_char_t f_color_code_t; - - enum { - f_color_code_none_e = 0, - f_color_code_linux_e, - f_color_code_xterminal_e, - }; - - #define f_color_code_t_initialize f_color_code_none_e -#endif // _di_f_color_code_t_ - -/** - * Terminal environment variable strings that may relate to color processing. - * - * f_color_terminal_*: - * - name: The standard terminal environment variable name. - * - value_linux: The value representing the Linux terminal. - */ -#ifndef _di_f_color_terminal_s_ - #define F_color_terminal_name_s "TERM" - #define F_color_terminal_value_linux_s "linux" - - #define F_color_terminal_name_s_length 4 - #define F_color_terminal_value_linux_s_length 5 - - extern const f_string_static_t f_color_terminal_name_s; - extern const f_string_static_t f_color_terminal_value_linux_s; -#endif // _di_f_color_terminal_s_ - -/** * Provide a global color related strings. * * F_color_string_*: @@ -201,50 +151,241 @@ extern "C" { #define F_color_string_code_bright_teal_bg_s_length 3 #define F_color_string_code_bright_white_bg_s_length 3 - extern const f_string_static_t f_color_string_begin_s; - extern const f_string_static_t f_color_string_end_s; - extern const f_string_static_t f_color_string_medium_s; - - extern const f_string_static_t f_color_string_code_reset_s; - extern const f_string_static_t f_color_string_code_bold_s; - extern const f_string_static_t f_color_string_code_underline_s; - extern const f_string_static_t f_color_string_code_blink_s; - extern const f_string_static_t f_color_string_code_reverse_s; - extern const f_string_static_t f_color_string_code_conceal_s; - extern const f_string_static_t f_color_string_code_black_s; - extern const f_string_static_t f_color_string_code_red_s; - extern const f_string_static_t f_color_string_code_green_s; - extern const f_string_static_t f_color_string_code_yellow_s; - extern const f_string_static_t f_color_string_code_blue_s; - extern const f_string_static_t f_color_string_code_purple_s; - extern const f_string_static_t f_color_string_code_teal_s; - extern const f_string_static_t f_color_string_code_white_s; - extern const f_string_static_t f_color_string_code_black_bg_s; - extern const f_string_static_t f_color_string_code_red_bg_s; - extern const f_string_static_t f_color_string_code_green_bg_s; - extern const f_string_static_t f_color_string_code_yellow_bg_s; - extern const f_string_static_t f_color_string_code_blue_bg_s; - extern const f_string_static_t f_color_string_code_purple_bg_s; - extern const f_string_static_t f_color_string_code_teal_bg_s; - extern const f_string_static_t f_color_string_code_white_bg_s; - extern const f_string_static_t f_color_string_code_bright_black_s; - extern const f_string_static_t f_color_string_code_bright_red_s; - extern const f_string_static_t f_color_string_code_bright_green_s; - extern const f_string_static_t f_color_string_code_bright_yellow_s; - extern const f_string_static_t f_color_string_code_bright_blue_s; - extern const f_string_static_t f_color_string_code_bright_purple_s; - extern const f_string_static_t f_color_string_code_bright_teal_s; - extern const f_string_static_t f_color_string_code_bright_white_s; - extern const f_string_static_t f_color_string_code_bright_black_bg_s; - extern const f_string_static_t f_color_string_code_bright_red_bg_s; - extern const f_string_static_t f_color_string_code_bright_green_bg_s; - extern const f_string_static_t f_color_string_code_bright_yellow_bg_s; - extern const f_string_static_t f_color_string_code_bright_blue_bg_s; - extern const f_string_static_t f_color_string_code_bright_purple_bg_s; - extern const f_string_static_t f_color_string_code_bright_teal_bg_s; - extern const f_string_static_t f_color_string_code_bright_white_bg_s; + #ifndef _di_f_color_begin_s_ + extern const f_string_static_t f_color_begin_s; + #endif // _di_f_color_begin_s_ + + #ifndef _di_f_color_end_s_ + extern const f_string_static_t f_color_end_s; + #endif // _di_f_color_end_s_ + + #ifndef _di_f_color_medium_s_ + extern const f_string_static_t f_color_medium_s; + #endif // _di_f_color_medium_s_ + + #ifndef _di_f_color_code_reset_s_ + extern const f_string_static_t f_color_code_reset_s; + #endif // _di_f_color_reset_s_ + + #ifndef _di_f_color_code_bold_s_ + extern const f_string_static_t f_color_code_bold_s; + #endif // _di_f_color_code_bold_s_ + + #ifndef _di_f_color_code_underline_s_ + extern const f_string_static_t f_color_code_underline_s; + #endif // _di_f_color_code_underline_s_ + + #ifndef _di_f_color_code_blink_s_ + extern const f_string_static_t f_color_code_blink_s; + #endif // _di_f_color_code_blink_s_ + + #ifndef _di_f_color_code_reverse_s_ + extern const f_string_static_t f_color_code_reverse_s; + #endif // _di_f_color_code_reverse_s_ + + #ifndef _di_f_color_code_conceal_s_ + extern const f_string_static_t f_color_code_conceal_s; + #endif // _di_f_color_code_conceal_s_ + + #ifndef _di_f_color_code_black_s_ + extern const f_string_static_t f_color_code_black_s; + #endif // _di_f_color_code_black_s_ + + #ifndef _di_f_color_code_red_s_ + extern const f_string_static_t f_color_code_red_s; + #endif // _di_f_color_code_red_s_ + + #ifndef _di_f_color_code_green_s_ + extern const f_string_static_t f_color_code_green_s; + #endif // _di_f_color_code_green_s_ + + #ifndef _di_f_color_code_yellow_s_ + extern const f_string_static_t f_color_code_yellow_s; + #endif // _di_f_color_code_yellow_s_ + + #ifndef _di_f_color_code_blue_s_ + extern const f_string_static_t f_color_code_blue_s; + #endif // _di_f_color_code_blue_s_ + + #ifndef _di_f_color_code_purple_s_ + extern const f_string_static_t f_color_code_purple_s; + #endif // _di_f_color_code_purple_s_ + + #ifndef _di_f_color_code_teal_s_ + extern const f_string_static_t f_color_code_teal_s; + #endif // _di_f_color_code_teal_s_ + + #ifndef _di_f_color_code_white_s_ + extern const f_string_static_t f_color_code_white_s; + #endif // _di_f_color_code_white_s_ + + #ifndef _di_f_color_code_black_bg_s_ + extern const f_string_static_t f_color_code_black_bg_s; + #endif // _di_f_color_code_black_bg_s_ + + #ifndef _di_f_color_code_red_bg_s_ + extern const f_string_static_t f_color_code_red_bg_s; + #endif // _di_f_color_code_red_bg_s_ + + #ifndef _di_f_color_code_green_bg_s_ + extern const f_string_static_t f_color_code_green_bg_s; + #endif // _di_f_color_code_green_bg_s_ + + #ifndef _di_f_color_code_yellow_bg_s_ + extern const f_string_static_t f_color_code_yellow_bg_s; + #endif // _di_f_color_code_yellow_bg_s_ + + #ifndef _di_f_color_code_blue_bg_s_ + extern const f_string_static_t f_color_code_blue_bg_s; + #endif // _di_f_color_code_blue_bg_s_ + + #ifndef _di_f_color_code_purple_bg_s_ + extern const f_string_static_t f_color_code_purple_bg_s; + #endif // _di_f_color_code_purple_bg_s_ + + #ifndef _di_f_color_code_teal_bg_s_ + extern const f_string_static_t f_color_code_teal_bg_s; + #endif // _di_f_color_code_teal_bg_s_ + + #ifndef _di_f_color_code_white_bg_s_ + extern const f_string_static_t f_color_code_white_bg_s; + #endif // _di_f_color_code_white_bg_s_ + + #ifndef _di_f_color_code_bright_black_s_ + extern const f_string_static_t f_color_code_bright_black_s; + #endif // _di_f_color_code_bright_black_s_ + + #ifndef _di_f_color_code_bright_red_s_ + extern const f_string_static_t f_color_code_bright_red_s; + #endif // _di_f_color_code_bright_red_s_ + + #ifndef _di_f_color_code_bright_green_s_ + extern const f_string_static_t f_color_code_bright_green_s; + #endif // _di_f_color_code_bright_green_s_ + + #ifndef _di_f_color_code_bright_yellow_s_ + extern const f_string_static_t f_color_code_bright_yellow_s; + #endif // _di_f_color_code_bright_yellow_s_ + + #ifndef _di_f_color_code_bright_blue_s_ + extern const f_string_static_t f_color_code_bright_blue_s; + #endif // _di_f_color_code_bright_blue_s_ + + #ifndef _di_f_color_code_bright_purple_s_ + extern const f_string_static_t f_color_code_bright_purple_s; + #endif // _di_f_color_code_bright_purple_s_ + + #ifndef _di_f_color_code_bright_teal_s_ + extern const f_string_static_t f_color_code_bright_teal_s; + #endif // _di_f_color_code_bright_teal_s_ + + #ifndef _di_f_color_code_bright_white_s_ + extern const f_string_static_t f_color_code_bright_white_s; + #endif // _di_f_color_code_bright_white_s_ + + #ifndef _di_f_color_code_bright_black_bg_s_ + extern const f_string_static_t f_color_code_bright_black_bg_s; + #endif // _di_f_color_code_bright_black_bg_s_ + + #ifndef _di_f_color_code_bright_red_bg_s_ + extern const f_string_static_t f_color_code_bright_red_bg_s; + #endif // _di_f_color_code_bright_red_bg_s_ + + #ifndef _di_f_color_code_bright_green_bg_s_ + extern const f_string_static_t f_color_code_bright_green_bg_s; + #endif // _di_f_color_code_bright_green_bg_s_ + + #ifndef _di_f_color_code_bright_yellow_bg_s_ + extern const f_string_static_t f_color_code_bright_yellow_bg_s; + #endif // _di_f_color_code_bright_yellow_bg_s_ + + #ifndef _di_f_color_code_bright_blue_bg_s_ + extern const f_string_static_t f_color_code_bright_blue_bg_s; + #endif // _di_f_color_code__s_ + + #ifndef _di_f_color_code_bright_purple_bg_s_ + extern const f_string_static_t f_color_code_bright_purple_bg_s; + #endif // _di_f_color_code_bright_purple_bg_s_ + + #ifndef _di_f_color_code_bright_teal_bg_s_ + extern const f_string_static_t f_color_code_bright_teal_bg_s; + #endif // _di_f_color_code_bright_teal_bg_s_ + + #ifndef _di_f_color_code_bright_white_bg_s_ + extern const f_string_static_t f_color_code_bright_white_bg_s; + #endif // _di_f_color_code_bright_white_bg_s_ #endif // _di_f_color_s_ +#ifndef _di_f_color_terminal_s_ + #ifndef _di_f_color_terminal_name_s_ + extern const f_string_static_t f_color_terminal_name_s; + #endif // _di_f_color_terminal_name_s_ + + #ifndef _di_f_color_terminal_value_linux_s_ + extern const f_string_static_t f_color_terminal_value_linux_s; + #endif // _di_f_color_terminal_value_linux_s_ +#endif // _di_f_color_s_ + +/** + * Color max size represents the maximum length of the resulting color string. + * + * This color max size does not include the terminating null. + * + * A color max size terminated represents the max size with the terminating null. + */ +#ifndef _di_f_color_max_size_d_ + #define F_color_max_size_d 7 + #define F_color_max_size_terminated_d 8 +#endif // _di_f_color_max_size_d_ + +/** + * Data type representing color sets. + */ +#ifndef _di_f_color_code_t_ + typedef f_char_t f_color_code_t; + + #define f_color_code_t_initialize f_color_code_none_e +#endif // _di_f_color_code_t_ + +/** + * Define codes representing color sets. + * + * F_color_code_*_e: + * - none: No color code set defined. + * - linux: Linux terminal color code set. + * - xterminal: X-Terminal color code set. + */ +#ifndef _di_f_color_code_e_ + enum { + f_color_code_none_e = 0, + f_color_code_linux_e, + f_color_code_xterminal_e, + }; // enum +#endif // _di_f_color_code_e_ + +/** + * Terminal environment variable strings that may relate to color processing. + * + * f_color_terminal_*: + * - name: The standard terminal environment variable name. + * - value_linux: The value representing the Linux terminal. + */ +#ifndef _di_f_color_terminal_s_ + #define F_color_terminal_name_s "TERM" + #define F_color_terminal_value_linux_s "linux" + + #define F_color_terminal_name_s_length 4 + #define F_color_terminal_value_linux_s_length 5 + + #ifndef _di_f_color_terminal_name_s_ + extern const f_string_static_t f_color_terminal_name_s; + #endif // _di_f_color_terminal_name_s_ + + #ifndef _di_f_color_terminal_value_linux_s_ + extern const f_string_static_t f_color_terminal_value_linux_s; + #endif // _di_f_color_terminal_value_linux_s_ +#endif // _di_f_color_terminal_s_ + /** * Color modes communicate how the color is supposed to be. * @@ -254,14 +395,14 @@ extern "C" { * - dark: Designates that the color mode is for dark backgrounds. * - light: Designates that the color mode is for light backgrounds. */ -#ifndef _di_f_color_mode_t_ +#ifndef _di_f_color_mode_e_ enum { f_color_mode_none_e = 0, f_color_mode_color_not_e, f_color_mode_dark_e, f_color_mode_light_e, - }; -#endif // _di_f_color_mode_t_ + }; // enum +#endif // _di_f_color_mode_e_ /** * Provide structure for containing color format control strings. @@ -284,15 +425,15 @@ extern "C" { } #define f_color_format_t_initialize_linux { \ - f_color_string_begin_s, \ - f_color_string_end_s, \ - f_color_string_medium_s \ + f_color_begin_s, \ + f_color_end_s, \ + f_color_medium_s \ } #define f_color_format_t_initialize_xterminal { \ - f_color_string_begin_s, \ - f_color_string_end_s, \ - f_color_string_medium_s \ + f_color_begin_s, \ + f_color_end_s, \ + f_color_medium_s \ } #define macro_f_color_format_t_initialize(begin, end, medium) { begin, end, medium } @@ -303,14 +444,14 @@ extern "C" { macro_f_string_static_t_clear(format.medium) #define macro_f_color_format_t_set_linux(format) \ - format.begin = f_color_string_begin_s; \ - format.end = f_color_string_end_s; \ - format.medium = f_color_string_medium_s; + format.begin = f_color_begin_s; \ + format.end = f_color_end_s; \ + format.medium = f_color_medium_s; #define macro_f_color_format_t_set_xterminal(format) \ - format.begin = f_color_string_begin_s; \ - format.end = f_color_string_end_s; \ - format.medium = f_color_string_medium_s; + format.begin = f_color_begin_s; \ + format.end = f_color_end_s; \ + format.medium = f_color_medium_s; #endif // _di_f_color_format_t_ /** @@ -445,85 +586,85 @@ extern "C" { } #define f_color_t_initialize_linux { \ - f_color_string_code_reset_s, \ - f_color_string_code_bold_s, \ - f_color_string_code_underline_s, \ - f_color_string_code_blink_s, \ - f_color_string_code_reverse_s, \ - f_color_string_code_conceal_s, \ - f_color_string_code_black_s, \ - f_color_string_code_red_s, \ - f_color_string_code_green_s, \ - f_color_string_code_yellow_s, \ - f_color_string_code_blue_s, \ - f_color_string_code_purple_s, \ - f_color_string_code_teal_s, \ - f_color_string_code_white_s, \ - f_color_string_code_black_bg_s, \ - f_color_string_code_red_bg_s, \ - f_color_string_code_green_bg_s, \ - f_color_string_code_yellow_bg_s, \ - f_color_string_code_blue_bg_s, \ - f_color_string_code_purple_bg_s, \ - f_color_string_code_teal_bg_s, \ - f_color_string_code_white_bg_s, \ - f_color_string_code_black_s, \ - f_color_string_code_red_s, \ - f_color_string_code_green_s, \ - f_color_string_code_yellow_s, \ - f_color_string_code_blue_s, \ - f_color_string_code_purple_s, \ - f_color_string_code_teal_s, \ - f_color_string_code_white_s, \ - f_color_string_code_black_bg_s, \ - f_color_string_code_red_bg_s, \ - f_color_string_code_green_bg_s, \ - f_color_string_code_yellow_bg_s, \ - f_color_string_code_blue_bg_s, \ - f_color_string_code_purple_bg_s, \ - f_color_string_code_teal_bg_s, \ - f_color_string_code_white_bg_s, \ + f_color_code_reset_s, \ + f_color_code_bold_s, \ + f_color_code_underline_s, \ + f_color_code_blink_s, \ + f_color_code_reverse_s, \ + f_color_code_conceal_s, \ + f_color_code_black_s, \ + f_color_code_red_s, \ + f_color_code_green_s, \ + f_color_code_yellow_s, \ + f_color_code_blue_s, \ + f_color_code_purple_s, \ + f_color_code_teal_s, \ + f_color_code_white_s, \ + f_color_code_black_bg_s, \ + f_color_code_red_bg_s, \ + f_color_code_green_bg_s, \ + f_color_code_yellow_bg_s, \ + f_color_code_blue_bg_s, \ + f_color_code_purple_bg_s, \ + f_color_code_teal_bg_s, \ + f_color_code_white_bg_s, \ + f_color_code_black_s, \ + f_color_code_red_s, \ + f_color_code_green_s, \ + f_color_code_yellow_s, \ + f_color_code_blue_s, \ + f_color_code_purple_s, \ + f_color_code_teal_s, \ + f_color_code_white_s, \ + f_color_code_black_bg_s, \ + f_color_code_red_bg_s, \ + f_color_code_green_bg_s, \ + f_color_code_yellow_bg_s, \ + f_color_code_blue_bg_s, \ + f_color_code_purple_bg_s, \ + f_color_code_teal_bg_s, \ + f_color_code_white_bg_s, \ } #define f_color_t_initialize_xterminal { \ - f_color_string_code_reset_s, \ - f_color_string_code_bold_s, \ - f_color_string_code_underline_s, \ - f_color_string_code_blink_s, \ - f_color_string_code_reverse_s, \ - f_color_string_code_conceal_s, \ - f_color_string_code_black_s, \ - f_color_string_code_red_s, \ - f_color_string_code_green_s, \ - f_color_string_code_yellow_s, \ - f_color_string_code_blue_s, \ - f_color_string_code_purple_s, \ - f_color_string_code_teal_s, \ - f_color_string_code_white_s, \ - f_color_string_code_black_bg_s, \ - f_color_string_code_red_bg_s, \ - f_color_string_code_green_bg_s, \ - f_color_string_code_yellow_bg_s, \ - f_color_string_code_blue_bg_s, \ - f_color_string_code_purple_bg_s, \ - f_color_string_code_teal_bg_s, \ - f_color_string_code_white_bg_s, \ - f_color_string_code_bright_black_s, \ - f_color_string_code_bright_red_s, \ - f_color_string_code_bright_green_s, \ - f_color_string_code_bright_yellow_s, \ - f_color_string_code_bright_blue_s, \ - f_color_string_code_bright_purple_s, \ - f_color_string_code_bright_teal_s, \ - f_color_string_code_bright_white_s, \ - f_color_string_code_bright_black_bg_s, \ - f_color_string_code_bright_red_bg_s, \ - f_color_string_code_bright_green_bg_s, \ - f_color_string_code_bright_yellow_bg_s, \ - f_color_string_code_bright_blue_bg_s, \ - f_color_string_code_bright_purple_bg_s, \ - f_color_string_code_bright_teal_bg_s, \ - f_color_string_code_bright_white_bg_s, \ + f_color_code_reset_s, \ + f_color_code_bold_s, \ + f_color_code_underline_s, \ + f_color_code_blink_s, \ + f_color_code_reverse_s, \ + f_color_code_conceal_s, \ + f_color_code_black_s, \ + f_color_code_red_s, \ + f_color_code_green_s, \ + f_color_code_yellow_s, \ + f_color_code_blue_s, \ + f_color_code_purple_s, \ + f_color_code_teal_s, \ + f_color_code_white_s, \ + f_color_code_black_bg_s, \ + f_color_code_red_bg_s, \ + f_color_code_green_bg_s, \ + f_color_code_yellow_bg_s, \ + f_color_code_blue_bg_s, \ + f_color_code_purple_bg_s, \ + f_color_code_teal_bg_s, \ + f_color_code_white_bg_s, \ + f_color_code_bright_black_s, \ + f_color_code_bright_red_s, \ + f_color_code_bright_green_s, \ + f_color_code_bright_yellow_s, \ + f_color_code_bright_blue_s, \ + f_color_code_bright_purple_s, \ + f_color_code_bright_teal_s, \ + f_color_code_bright_white_s, \ + f_color_code_bright_black_bg_s, \ + f_color_code_bright_red_bg_s, \ + f_color_code_bright_green_bg_s, \ + f_color_code_bright_yellow_bg_s, \ + f_color_code_bright_blue_bg_s, \ + f_color_code_bright_purple_bg_s, \ + f_color_code_bright_teal_bg_s, \ + f_color_code_bright_white_bg_s, \ } #define macro_f_color_t_set_none(color) \ @@ -567,84 +708,84 @@ extern "C" { color.bright_white_bg = f_string_empty_s; #define macro_f_color_t_set_linux(color) \ - color.reset = f_color_string_code_reset_s; \ - color.bold = f_color_string_code_bold_s; \ - color.underline = f_color_string_code_underline_s; \ - color.blink = f_color_string_code_blink_s; \ - color.reverse = f_color_string_code_reverse_s; \ - color.conceal = f_color_string_code_conceal_s; \ - color.black = f_color_string_code_black_s; \ - color.red = f_color_string_code_red_s; \ - color.green = f_color_string_code_green_s; \ - color.yellow = f_color_string_code_yellow_s; \ - color.blue = f_color_string_code_blue_s; \ - color.purple = f_color_string_code_purple_s; \ - color.teal = f_color_string_code_teal_s; \ - color.white = f_color_string_code_white_s; \ - color.black_bg = f_color_string_code_black_bg_s; \ - color.red_bg = f_color_string_code_red_bg_s; \ - color.green_bg = f_color_string_code_green_bg_s; \ - color.yellow_bg = f_color_string_code_yellow_bg_s; \ - color.blue_bg = f_color_string_code_blue_bg_s; \ - color.purple_bg = f_color_string_code_purple_bg_s; \ - color.teal_bg = f_color_string_code_teal_bg_s; \ - color.white_bg = f_color_string_code_white_bg_s; \ - color.bright_black = f_color_string_code_black_s; \ - color.bright_red = f_color_string_code_red_s; \ - color.bright_green = f_color_string_code_green_s; \ - color.bright_yellow = f_color_string_code_yellow_s; \ - color.bright_blue = f_color_string_code_blue_s; \ - color.bright_purple = f_color_string_code_purple_s; \ - color.bright_teal = f_color_string_code_teal_s; \ - color.bright_white = f_color_string_code_white_s; \ - color.bright_black_bg = f_color_string_code_black_bg_s; \ - color.bright_red_bg = f_color_string_code_red_bg_s; \ - color.bright_green_bg = f_color_string_code_green_bg_s; \ - color.bright_yellow_bg = f_color_string_code_yellow_bg_s; \ - color.bright_blue_bg = f_color_string_code_blue_bg_s; \ - color.bright_purple_bg = f_color_string_code_purple_bg_s; \ - color.bright_teal_bg = f_color_string_code_teal_bg_s; \ - color.bright_white_bg = f_color_string_code_white_bg_s; + color.reset = f_color_code_reset_s; \ + color.bold = f_color_code_bold_s; \ + color.underline = f_color_code_underline_s; \ + color.blink = f_color_code_blink_s; \ + color.reverse = f_color_code_reverse_s; \ + color.conceal = f_color_code_conceal_s; \ + color.black = f_color_code_black_s; \ + color.red = f_color_code_red_s; \ + color.green = f_color_code_green_s; \ + color.yellow = f_color_code_yellow_s; \ + color.blue = f_color_code_blue_s; \ + color.purple = f_color_code_purple_s; \ + color.teal = f_color_code_teal_s; \ + color.white = f_color_code_white_s; \ + color.black_bg = f_color_code_black_bg_s; \ + color.red_bg = f_color_code_red_bg_s; \ + color.green_bg = f_color_code_green_bg_s; \ + color.yellow_bg = f_color_code_yellow_bg_s; \ + color.blue_bg = f_color_code_blue_bg_s; \ + color.purple_bg = f_color_code_purple_bg_s; \ + color.teal_bg = f_color_code_teal_bg_s; \ + color.white_bg = f_color_code_white_bg_s; \ + color.bright_black = f_color_code_black_s; \ + color.bright_red = f_color_code_red_s; \ + color.bright_green = f_color_code_green_s; \ + color.bright_yellow = f_color_code_yellow_s; \ + color.bright_blue = f_color_code_blue_s; \ + color.bright_purple = f_color_code_purple_s; \ + color.bright_teal = f_color_code_teal_s; \ + color.bright_white = f_color_code_white_s; \ + color.bright_black_bg = f_color_code_black_bg_s; \ + color.bright_red_bg = f_color_code_red_bg_s; \ + color.bright_green_bg = f_color_code_green_bg_s; \ + color.bright_yellow_bg = f_color_code_yellow_bg_s; \ + color.bright_blue_bg = f_color_code_blue_bg_s; \ + color.bright_purple_bg = f_color_code_purple_bg_s; \ + color.bright_teal_bg = f_color_code_teal_bg_s; \ + color.bright_white_bg = f_color_code_white_bg_s; #define macro_f_color_t_set_xterminal(color) \ - color.reset = f_color_string_code_reset_s; \ - color.bold = f_color_string_code_bold_s; \ - color.underline = f_color_string_code_underline_s; \ - color.blink = f_color_string_code_blink_s; \ - color.reverse = f_color_string_code_reverse_s; \ - color.conceal = f_color_string_code_conceal_s; \ - color.black = f_color_string_code_black_s; \ - color.red = f_color_string_code_red_s; \ - color.green = f_color_string_code_green_s; \ - color.yellow = f_color_string_code_yellow_s; \ - color.blue = f_color_string_code_blue_s; \ - color.purple = f_color_string_code_purple_s; \ - color.teal = f_color_string_code_teal_s; \ - color.white = f_color_string_code_white_s; \ - color.black_bg = f_color_string_code_black_bg_s; \ - color.red_bg = f_color_string_code_red_bg_s; \ - color.green_bg = f_color_string_code_green_bg_s; \ - color.yellow_bg = f_color_string_code_yellow_bg_s; \ - color.blue_bg = f_color_string_code_blue_bg_s; \ - color.purple_bg = f_color_string_code_purple_bg_s; \ - color.teal_bg = f_color_string_code_teal_bg_s; \ - color.white_bg = f_color_string_code_white_bg_s; \ - color.bright_black = f_color_string_code_bright_black_s; \ - color.bright_red = f_color_string_code_bright_red_s; \ - color.bright_green = f_color_string_code_bright_green_s; \ - color.bright_yellow = f_color_string_code_bright_yellow_s; \ - color.bright_blue = f_color_string_code_bright_blue_s; \ - color.bright_purple = f_color_string_code_bright_purple_s; \ - color.bright_teal = f_color_string_code_bright_teal_s; \ - color.bright_white = f_color_string_code_bright_white_s; \ - color.bright_black_bg = f_color_string_code_bright_black_bg_s; \ - color.bright_red_bg = f_color_string_code_bright_red_bg_s; \ - color.bright_green_bg = f_color_string_code_bright_green_bg_s; \ - color.bright_yellow_bg = f_color_string_code_bright_yellow_bg_s; \ - color.bright_blue_bg = f_color_string_code_bright_blue_bg_s; \ - color.bright_purple_bg = f_color_string_code_bright_purple_bg_s; \ - color.bright_teal_bg = f_color_string_code_bright_teal_bg_s; \ - color.bright_white_bg = f_color_string_code_bright_white_bg_s; + color.reset = f_color_code_reset_s; \ + color.bold = f_color_code_bold_s; \ + color.underline = f_color_code_underline_s; \ + color.blink = f_color_code_blink_s; \ + color.reverse = f_color_code_reverse_s; \ + color.conceal = f_color_code_conceal_s; \ + color.black = f_color_code_black_s; \ + color.red = f_color_code_red_s; \ + color.green = f_color_code_green_s; \ + color.yellow = f_color_code_yellow_s; \ + color.blue = f_color_code_blue_s; \ + color.purple = f_color_code_purple_s; \ + color.teal = f_color_code_teal_s; \ + color.white = f_color_code_white_s; \ + color.black_bg = f_color_code_black_bg_s; \ + color.red_bg = f_color_code_red_bg_s; \ + color.green_bg = f_color_code_green_bg_s; \ + color.yellow_bg = f_color_code_yellow_bg_s; \ + color.blue_bg = f_color_code_blue_bg_s; \ + color.purple_bg = f_color_code_purple_bg_s; \ + color.teal_bg = f_color_code_teal_bg_s; \ + color.white_bg = f_color_code_white_bg_s; \ + color.bright_black = f_color_code_bright_black_s; \ + color.bright_red = f_color_code_bright_red_s; \ + color.bright_green = f_color_code_bright_green_s; \ + color.bright_yellow = f_color_code_bright_yellow_s; \ + color.bright_blue = f_color_code_bright_blue_s; \ + color.bright_purple = f_color_code_bright_purple_s; \ + color.bright_teal = f_color_code_bright_teal_s; \ + color.bright_white = f_color_code_bright_white_s; \ + color.bright_black_bg = f_color_code_bright_black_bg_s; \ + color.bright_red_bg = f_color_code_bright_red_bg_s; \ + color.bright_green_bg = f_color_code_bright_green_bg_s; \ + color.bright_yellow_bg = f_color_code_bright_yellow_bg_s; \ + color.bright_blue_bg = f_color_code_bright_blue_bg_s; \ + color.bright_purple_bg = f_color_code_bright_purple_bg_s; \ + color.bright_teal_bg = f_color_code_bright_teal_bg_s; \ + color.bright_white_bg = f_color_code_bright_white_bg_s; #endif // _di_f_color_t_ /** diff --git a/level_0/f_console/c/console/common.c b/level_0/f_console/c/console/common.c index cbfbeb2..9928fbf 100644 --- a/level_0/f_console/c/console/common.c +++ b/level_0/f_console/c/console/common.c @@ -5,43 +5,135 @@ extern "C" { #endif #ifndef _di_f_console_standard_s_ - const f_string_static_t f_console_standard_short_dark_s = macro_f_string_static_t_initialize((f_string_t) F_console_standard_short_dark_s, 0, F_console_standard_short_dark_s_length); - const f_string_static_t f_console_standard_short_debug_s = macro_f_string_static_t_initialize((f_string_t) F_console_standard_short_debug_s, 0, F_console_standard_short_debug_s_length); - const f_string_static_t f_console_standard_short_error_s = macro_f_string_static_t_initialize((f_string_t) F_console_standard_short_error_s, 0, F_console_standard_short_error_s_length); - const f_string_static_t f_console_standard_short_help_s = macro_f_string_static_t_initialize((f_string_t) F_console_standard_short_help_s, 0, F_console_standard_short_help_s_length); - const f_string_static_t f_console_standard_short_light_s = macro_f_string_static_t_initialize((f_string_t) F_console_standard_short_light_s, 0, F_console_standard_short_light_s_length); - const f_string_static_t f_console_standard_short_line_first_no_s = macro_f_string_static_t_initialize((f_string_t) F_console_standard_short_line_first_no_s, 0, F_console_standard_short_line_first_no_s_length); - const f_string_static_t f_console_standard_short_line_last_no_s = macro_f_string_static_t_initialize((f_string_t) F_console_standard_short_line_last_no_s, 0, F_console_standard_short_line_last_no_s_length); - const f_string_static_t f_console_standard_short_no_color_s = macro_f_string_static_t_initialize((f_string_t) F_console_standard_short_no_color_s, 0, F_console_standard_short_no_color_s_length); - const f_string_static_t f_console_standard_short_normal_s = macro_f_string_static_t_initialize((f_string_t) F_console_standard_short_normal_s, 0, F_console_standard_short_normal_s_length); - const f_string_static_t f_console_standard_short_quiet_s = macro_f_string_static_t_initialize((f_string_t) F_console_standard_short_quiet_s, 0, F_console_standard_short_quiet_s_length); - const f_string_static_t f_console_standard_short_status_in_s = macro_f_string_static_t_initialize((f_string_t) F_console_standard_short_status_in_s, 0, F_console_standard_short_status_in_s_length); - const f_string_static_t f_console_standard_short_status_out_s = macro_f_string_static_t_initialize((f_string_t) F_console_standard_short_status_out_s, 0, F_console_standard_short_status_out_s_length); - const f_string_static_t f_console_standard_short_verbose_s = macro_f_string_static_t_initialize((f_string_t) F_console_standard_short_verbose_s, 0, F_console_standard_short_verbose_s_length); - const f_string_static_t f_console_standard_short_version_s = macro_f_string_static_t_initialize((f_string_t) F_console_standard_short_version_s, 0, F_console_standard_short_version_s_length); - - const f_string_static_t f_console_standard_long_dark_s = macro_f_string_static_t_initialize((f_string_t) F_console_standard_long_dark_s, 0, F_console_standard_long_dark_s_length); - const f_string_static_t f_console_standard_long_debug_s = macro_f_string_static_t_initialize((f_string_t) F_console_standard_long_debug_s, 0, F_console_standard_long_debug_s_length); - const f_string_static_t f_console_standard_long_error_s = macro_f_string_static_t_initialize((f_string_t) F_console_standard_long_error_s, 0, F_console_standard_long_error_s_length); - const f_string_static_t f_console_standard_long_help_s = macro_f_string_static_t_initialize((f_string_t) F_console_standard_long_help_s, 0, F_console_standard_long_help_s_length); - const f_string_static_t f_console_standard_long_light_s = macro_f_string_static_t_initialize((f_string_t) F_console_standard_long_light_s, 0, F_console_standard_long_light_s_length); - const f_string_static_t f_console_standard_long_line_first_no_s = macro_f_string_static_t_initialize((f_string_t) F_console_standard_long_line_first_no_s, 0, F_console_standard_long_line_first_no_s_length); - const f_string_static_t f_console_standard_long_line_last_no_s = macro_f_string_static_t_initialize((f_string_t) F_console_standard_long_line_last_no_s, 0, F_console_standard_long_line_last_no_s_length); - const f_string_static_t f_console_standard_long_no_color_s = macro_f_string_static_t_initialize((f_string_t) F_console_standard_long_no_color_s, 0, F_console_standard_long_no_color_s_length); - const f_string_static_t f_console_standard_long_normal_s = macro_f_string_static_t_initialize((f_string_t) F_console_standard_long_normal_s, 0, F_console_standard_long_normal_s_length); - const f_string_static_t f_console_standard_long_quiet_s = macro_f_string_static_t_initialize((f_string_t) F_console_standard_long_quiet_s, 0, F_console_standard_long_quiet_s_length); - const f_string_static_t f_console_standard_long_status_in_s = macro_f_string_static_t_initialize((f_string_t) F_console_standard_long_status_in_s, 0, F_console_standard_long_status_in_s_length); - const f_string_static_t f_console_standard_long_status_out_s = macro_f_string_static_t_initialize((f_string_t) F_console_standard_long_status_out_s, 0, F_console_standard_long_status_out_s_length); - const f_string_static_t f_console_standard_long_verbose_s = macro_f_string_static_t_initialize((f_string_t) F_console_standard_long_verbose_s, 0, F_console_standard_long_verbose_s_length); - const f_string_static_t f_console_standard_long_version_s = macro_f_string_static_t_initialize((f_string_t) F_console_standard_long_version_s, 0, F_console_standard_long_version_s_length); + #ifndef _di_f_console_standard_short_dark_s_ + const f_string_static_t f_console_standard_short_dark_s = macro_f_string_static_t_initialize(F_console_standard_short_dark_s, 0, F_console_standard_short_dark_s_length); + #endif // _di_f_console_standard_short_dark_s_ + + #ifndef _di_f_console_standard_short_debug_s_ + const f_string_static_t f_console_standard_short_debug_s = macro_f_string_static_t_initialize(F_console_standard_short_debug_s, 0, F_console_standard_short_debug_s_length); + #endif // _di_f_console_standard_short_debug_s_ + + #ifndef _di_f_console_standard_short_error_s_ + const f_string_static_t f_console_standard_short_error_s = macro_f_string_static_t_initialize(F_console_standard_short_error_s, 0, F_console_standard_short_error_s_length); + #endif // _di_f_console_standard_short_error_s_ + + #ifndef _di_f_console_standard_short_help_s_ + const f_string_static_t f_console_standard_short_help_s = macro_f_string_static_t_initialize(F_console_standard_short_help_s, 0, F_console_standard_short_help_s_length); + #endif // _di_f_console_standard_short_help_s_ + + #ifndef _di_f_console_standard_short_light_s_ + const f_string_static_t f_console_standard_short_light_s = macro_f_string_static_t_initialize(F_console_standard_short_light_s, 0, F_console_standard_short_light_s_length); + #endif // _di_f_console_standard_short_light_s_ + + #ifndef _di_f_console_standard_short_line_first_no_s_ + const f_string_static_t f_console_standard_short_line_first_no_s = macro_f_string_static_t_initialize(F_console_standard_short_line_first_no_s, 0, F_console_standard_short_line_first_no_s_length); + #endif // _di_f_console_standard_short_line_first_no_s_ + + #ifndef _di_f_console_standard_short_line_last_no_s_ + const f_string_static_t f_console_standard_short_line_last_no_s = macro_f_string_static_t_initialize(F_console_standard_short_line_last_no_s, 0, F_console_standard_short_line_last_no_s_length); + #endif // _di_f_console_standard_short_line_last_no_s_ + + #ifndef _di_f_console_standard_short_no_color_s_ + const f_string_static_t f_console_standard_short_no_color_s = macro_f_string_static_t_initialize(F_console_standard_short_no_color_s, 0, F_console_standard_short_no_color_s_length); + #endif // _di_f_console_standard_short_no_color_s_ + + #ifndef _di_f_console_standard_short_normal_s_ + const f_string_static_t f_console_standard_short_normal_s = macro_f_string_static_t_initialize(F_console_standard_short_normal_s, 0, F_console_standard_short_normal_s_length); + #endif // _di_f_console_standard_short_normal_s_ + + #ifndef _di_f_console_standard_short_quiet_s_ + const f_string_static_t f_console_standard_short_quiet_s = macro_f_string_static_t_initialize(F_console_standard_short_quiet_s, 0, F_console_standard_short_quiet_s_length); + #endif // _di_f_console_standard_short_quiet_s_ + + #ifndef _di_f_console_standard_short_status_in_s_ + const f_string_static_t f_console_standard_short_status_in_s = macro_f_string_static_t_initialize(F_console_standard_short_status_in_s, 0, F_console_standard_short_status_in_s_length); + #endif // _di_f_console_standard_short_status_in_s_ + + #ifndef _di_f_console_standard_short_status_out_s_ + const f_string_static_t f_console_standard_short_status_out_s = macro_f_string_static_t_initialize(F_console_standard_short_status_out_s, 0, F_console_standard_short_status_out_s_length); + #endif // _di_f_console_standard_short_status_out_s_ + + #ifndef _di_f_console_standard_short_verbose_s_ + const f_string_static_t f_console_standard_short_verbose_s = macro_f_string_static_t_initialize(F_console_standard_short_verbose_s, 0, F_console_standard_short_verbose_s_length); + #endif // _di_f_console_standard_short_verbose_s_ + + #ifndef _di_f_console_standard_short_version_s_ + const f_string_static_t f_console_standard_short_version_s = macro_f_string_static_t_initialize(F_console_standard_short_version_s, 0, F_console_standard_short_version_s_length); + #endif // _di_f_console_standard_short_version_s_ + + #ifndef _di_f_console_standard_long_dark_s_ + const f_string_static_t f_console_standard_long_dark_s = macro_f_string_static_t_initialize(F_console_standard_long_dark_s, 0, F_console_standard_long_dark_s_length); + #endif // _di_f_console_standard_long_dark_s_ + + #ifndef _di_f_console_standard_long_debug_s_ + const f_string_static_t f_console_standard_long_debug_s = macro_f_string_static_t_initialize(F_console_standard_long_debug_s, 0, F_console_standard_long_debug_s_length); + #endif // _di_f_console_standard_long_debug_s_ + + #ifndef _di_f_console_standard_long_error_s_ + const f_string_static_t f_console_standard_long_error_s = macro_f_string_static_t_initialize(F_console_standard_long_error_s, 0, F_console_standard_long_error_s_length); + #endif // _di_f_console_standard_long_error_s_ + + #ifndef _di_f_console_standard_long_help_s_ + const f_string_static_t f_console_standard_long_help_s = macro_f_string_static_t_initialize(F_console_standard_long_help_s, 0, F_console_standard_long_help_s_length); + #endif // _di_f_console_standard_long_help_s_ + + #ifndef _di_f_console_standard_long_light_s_ + const f_string_static_t f_console_standard_long_light_s = macro_f_string_static_t_initialize(F_console_standard_long_light_s, 0, F_console_standard_long_light_s_length); + #endif // _di_f_console_standard_long_light_s_ + + #ifndef _di_f_console_standard_long_line_first_no_s_ + const f_string_static_t f_console_standard_long_line_first_no_s = macro_f_string_static_t_initialize(F_console_standard_long_line_first_no_s, 0, F_console_standard_long_line_first_no_s_length); + #endif // _di_f_console_standard_long_line_first_no_s_ + + #ifndef _di_f_console_standard_long_line_last_no_s_ + const f_string_static_t f_console_standard_long_line_last_no_s = macro_f_string_static_t_initialize(F_console_standard_long_line_last_no_s, 0, F_console_standard_long_line_last_no_s_length); + #endif // _di_f_console_standard_long_line_last_no_s_ + + #ifndef _di_f_console_standard_long_no_color_s_ + const f_string_static_t f_console_standard_long_no_color_s = macro_f_string_static_t_initialize(F_console_standard_long_no_color_s, 0, F_console_standard_long_no_color_s_length); + #endif // _di_f_console_standard_long_no_color_s_ + + #ifndef _di_f_console_standard_long_normal_s_ + const f_string_static_t f_console_standard_long_normal_s = macro_f_string_static_t_initialize(F_console_standard_long_normal_s, 0, F_console_standard_long_normal_s_length); + #endif // _di_f_console_standard_long_normal_s_ + + #ifndef _di_f_console_standard_long_quiet_s_ + const f_string_static_t f_console_standard_long_quiet_s = macro_f_string_static_t_initialize(F_console_standard_long_quiet_s, 0, F_console_standard_long_quiet_s_length); + #endif // _di_f_console_standard_long_quiet_s_ + + #ifndef _di_f_console_standard_long_status_in_s_ + const f_string_static_t f_console_standard_long_status_in_s = macro_f_string_static_t_initialize(F_console_standard_long_status_in_s, 0, F_console_standard_long_status_in_s_length); + #endif // _di_f_console_standard_long_status_in_s_ + + #ifndef _di_f_console_standard_long_status_out_s_ + const f_string_static_t f_console_standard_long_status_out_s = macro_f_string_static_t_initialize(F_console_standard_long_status_out_s, 0, F_console_standard_long_status_out_s_length); + #endif // _di_f_console_standard_long_status_out_s_ + + #ifndef _di_f_console_standard_long_verbose_s_ + const f_string_static_t f_console_standard_long_verbose_s = macro_f_string_static_t_initialize(F_console_standard_long_verbose_s, 0, F_console_standard_long_verbose_s_length); + #endif // _di_f_console_standard_long_verbose_s_ + + #ifndef _di_f_console_standard_long_version_s_ + const f_string_static_t f_console_standard_long_version_s = macro_f_string_static_t_initialize(F_console_standard_long_version_s, 0, F_console_standard_long_version_s_length); + #endif // _di_f_console_standard_long_version_s_ #endif // _di_f_console_standard_s_ #ifndef _di_f_console_symbol_s_ - const f_string_static_t f_console_symbol_short_normal_s = macro_f_string_static_t_initialize((f_string_t)F_console_symbol_short_normal_s, 0, F_console_symbol_short_normal_s_length); - const f_string_static_t f_console_symbol_short_inverse_s = macro_f_string_static_t_initialize((f_string_t)F_console_symbol_short_inverse_s, 0, F_console_symbol_short_inverse_s_length); + #ifndef _di_f_console_symbol_short_normal_s_ + const f_string_static_t f_console_symbol_short_normal_s = macro_f_string_static_t_initialize(F_console_symbol_short_normal_s, 0, F_console_symbol_short_normal_s_length); + #endif // _di_f_console_symbol_short_normal_s_ + + #ifndef _di_f_console_symbol_short_inverse_s_ + const f_string_static_t f_console_symbol_short_inverse_s = macro_f_string_static_t_initialize(F_console_symbol_short_inverse_s, 0, F_console_symbol_short_inverse_s_length); + #endif // _di_f_console_symbol_short_inverse_s_ + + #ifndef _di_f_console_symbol_long_normal_s_ + const f_string_static_t f_console_symbol_long_normal_s = macro_f_string_static_t_initialize(F_console_symbol_long_normal_s, 0, F_console_symbol_long_normal_s_length); + #endif // _di_f_console_symbol_long_normal_s_ - const f_string_static_t f_console_symbol_long_normal_s = macro_f_string_static_t_initialize((f_string_t)F_console_symbol_long_normal_s, 0, F_console_symbol_long_normal_s_length); - const f_string_static_t f_console_symbol_long_inverse_s = macro_f_string_static_t_initialize((f_string_t)F_console_symbol_long_inverse_s, 0, F_console_symbol_long_inverse_s_length); + #ifndef _di_f_console_symbol_long_inverse_s_ + const f_string_static_t f_console_symbol_long_inverse_s = macro_f_string_static_t_initialize(F_console_symbol_long_inverse_s, 0, F_console_symbol_long_inverse_s_length); + #endif // _di_f_console_symbol_long_inverse_s_ #endif // _di_f_console_symbol_s_ #ifndef _di_f_console_parameters_delete_ diff --git a/level_0/f_console/c/console/common.h b/level_0/f_console/c/console/common.h index e71628f..34c4616 100644 --- a/level_0/f_console/c/console/common.h +++ b/level_0/f_console/c/console/common.h @@ -34,11 +34,21 @@ extern "C" { #define F_console_symbol_long_normal_s_length 2 #define F_console_symbol_long_inverse_s_length 2 - extern const f_string_static_t f_console_symbol_short_normal_s; - extern const f_string_static_t f_console_symbol_short_inverse_s; + #ifndef _di_f_console_symbol_short_normal_s_ + extern const f_string_static_t f_console_symbol_short_normal_s; + #endif // _di_f_console_symbol_short_normal_s_ - extern const f_string_static_t f_console_symbol_long_normal_s; - extern const f_string_static_t f_console_symbol_long_inverse_s; + #ifndef _di_f_console_symbol_short_inverse_s_ + extern const f_string_static_t f_console_symbol_short_inverse_s; + #endif // _di_f_console_symbol_short_inverse_s_ + + #ifndef _di_f_console_symbol_long_normal_s_ + extern const f_string_static_t f_console_symbol_long_normal_s; + #endif // _di_f_console_symbol_long_normal_s_ + + #ifndef _di_f_console_symbol_long_inverse_s_ + extern const f_string_static_t f_console_symbol_long_inverse_s; + #endif // _di_f_console_symbol_long_inverse_s_ #endif // _di_f_console_symbol_s_ /** @@ -139,35 +149,117 @@ extern "C" { #define F_console_standard_long_verbose_s_length 7 #define F_console_standard_long_version_s_length 7 - extern const f_string_static_t f_console_standard_short_dark_s; - extern const f_string_static_t f_console_standard_short_debug_s; - extern const f_string_static_t f_console_standard_short_error_s; - extern const f_string_static_t f_console_standard_short_help_s; - extern const f_string_static_t f_console_standard_short_light_s; - extern const f_string_static_t f_console_standard_short_line_first_no_s; - extern const f_string_static_t f_console_standard_short_line_last_no_s; - extern const f_string_static_t f_console_standard_short_no_color_s; - extern const f_string_static_t f_console_standard_short_normal_s; - extern const f_string_static_t f_console_standard_short_quiet_s; - extern const f_string_static_t f_console_standard_short_status_in_s; - extern const f_string_static_t f_console_standard_short_status_out_s; - extern const f_string_static_t f_console_standard_short_verbose_s; - extern const f_string_static_t f_console_standard_short_version_s; - - extern const f_string_static_t f_console_standard_long_dark_s; - extern const f_string_static_t f_console_standard_long_debug_s; - extern const f_string_static_t f_console_standard_long_error_s; - extern const f_string_static_t f_console_standard_long_help_s; - extern const f_string_static_t f_console_standard_long_light_s; - extern const f_string_static_t f_console_standard_long_line_first_no_s; - extern const f_string_static_t f_console_standard_long_line_last_no_s; - extern const f_string_static_t f_console_standard_long_no_color_s; - extern const f_string_static_t f_console_standard_long_normal_s; - extern const f_string_static_t f_console_standard_long_quiet_s; - extern const f_string_static_t f_console_standard_long_status_in_s; - extern const f_string_static_t f_console_standard_long_status_out_s; - extern const f_string_static_t f_console_standard_long_verbose_s; - extern const f_string_static_t f_console_standard_long_version_s; + #ifndef _di_f_console_standard_short_dark_s_ + extern const f_string_static_t f_console_standard_short_dark_s; + #endif // _di_f_console_standard_short_dark_s_ + + #ifndef _di_f_console_standard_short_debug_s_ + extern const f_string_static_t f_console_standard_short_debug_s; + #endif // _di_f_console_standard_short_debug_s_ + + #ifndef _di_f_console_standard_short_error_s_ + extern const f_string_static_t f_console_standard_short_error_s; + #endif // _di_f_console_standard_short_error_s_ + + #ifndef _di_f_console_standard_short_help_s_ + extern const f_string_static_t f_console_standard_short_help_s; + #endif // _di_f_console_standard_short_help_s_ + + #ifndef _di_f_console_standard_short_light_s_ + extern const f_string_static_t f_console_standard_short_light_s; + #endif // _di_f_console_standard_short_light_s_ + + #ifndef _di_f_console_standard_short_line_first_no_s_ + extern const f_string_static_t f_console_standard_short_line_first_no_s; + #endif // _di_f_console_standard_short_line_first_no_s_ + + #ifndef _di_f_console_standard_short_line_last_no_s_ + extern const f_string_static_t f_console_standard_short_line_last_no_s; + #endif // _di_f_console_standard_short_line_last_no_s_ + + #ifndef _di_f_console_standard_short_no_color_s_ + extern const f_string_static_t f_console_standard_short_no_color_s; + #endif // _di_f_console_standard_short_no_color_s_ + + #ifndef _di_f_console_standard_short_normal_s_ + extern const f_string_static_t f_console_standard_short_normal_s; + #endif // _di_f_console_standard_short_normal_s_ + + #ifndef _di_f_console_standard_short_quiet_s_ + extern const f_string_static_t f_console_standard_short_quiet_s; + #endif // _di_f_console_standard_short_quiet_s_ + + #ifndef _di_f_console_standard_short_status_in_s_ + extern const f_string_static_t f_console_standard_short_status_in_s; + #endif // _di_f_console_standard_short_status_in_s_ + + #ifndef _di_f_console_standard_short_status_out_s_ + extern const f_string_static_t f_console_standard_short_status_out_s; + #endif // _di_f_console_standard_short_status_out_s_ + + #ifndef _di_f_console_standard_short_verbose_s_ + extern const f_string_static_t f_console_standard_short_verbose_s; + #endif // _di_f_console_standard_short_verbose_s_ + + #ifndef _di_f_console_standard_short_version_s_ + extern const f_string_static_t f_console_standard_short_version_s; + #endif // _di_f_console_standard_short_version_s_ + + #ifndef _di_f_console_standard_long_dark_s_ + extern const f_string_static_t f_console_standard_long_dark_s; + #endif // _di_f_console_standard_long_dark_s_ + + #ifndef _di_f_console_standard_long_debug_s_ + extern const f_string_static_t f_console_standard_long_debug_s; + #endif // _di_f_console_standard_long_debug_s_ + + #ifndef _di_f_console_standard_long_error_s_ + extern const f_string_static_t f_console_standard_long_error_s; + #endif // _di_f_console_standard_long_error_s_ + + #ifndef _di_f_console_standard_long_help_s_ + extern const f_string_static_t f_console_standard_long_help_s; + #endif // _di_f_console_standard_long_help_s_ + + #ifndef _di_f_console_standard_long_light_s_ + extern const f_string_static_t f_console_standard_long_light_s; + #endif // _di_f_console_standard_long_light_s_ + + #ifndef _di_f_console_standard_long_line_first_no_s_ + extern const f_string_static_t f_console_standard_long_line_first_no_s; + #endif // _di_f_console_standard_long_line_first_no_s_ + + #ifndef _di_f_console_standard_long_line_last_no_s_ + extern const f_string_static_t f_console_standard_long_line_last_no_s; + #endif // _di_f_console_standard_long_line_last_no_s_ + + #ifndef _di_f_console_standard_long_no_color_s_ + extern const f_string_static_t f_console_standard_long_no_color_s; + #endif // _di_f_console_standard_long_no_color_s_ + + #ifndef _di_f_console_standard_long_normal_s_ + extern const f_string_static_t f_console_standard_long_normal_s; + #endif // _di_f_console_standard_long_normal_s_ + + #ifndef _di_f_console_standard_long_quiet_s_ + extern const f_string_static_t f_console_standard_long_quiet_s; + #endif // _di_f_console_standard_long_quiet_s_ + + #ifndef _di_f_console_standard_long_status_in_s_ + extern const f_string_static_t f_console_standard_long_status_in_s; + #endif // _di_f_console_standard_long_status_in_s_ + + #ifndef _di_f_console_standard_long_status_out_s_ + extern const f_string_static_t f_console_standard_long_status_out_s; + #endif // _di_f_console_standard_long_status_out_s_ + + #ifndef _di_f_console_standard_long_verbose_s_ + extern const f_string_static_t f_console_standard_long_verbose_s; + #endif // _di_f_console_standard_long_verbose_s_ + + #ifndef _di_f_console_standard_long_version_s_ + extern const f_string_static_t f_console_standard_long_version_s; + #endif // _di_f_console_standard_long_version_s_ #endif // _di_f_console_standard_s_ /** @@ -181,6 +273,15 @@ extern "C" { #endif // _di_f_console_length_size_ /** + * Provide console flag data type. + */ +#ifndef _di_f_console_flag_t_ + typedef uint8_t f_console_flag_t; + + #define f_console_flag_t_initialize 0 +#endif // _di_f_console_flag_t_ + +/** * Provide console flags. * * The flags are bits or sets of bits used for designating different states of the parameter. @@ -188,7 +289,7 @@ extern "C" { * The disabled flag prevents it from being processed at all and will be treated as other data. * If the flag should still be processed, then do not set disabled flag and instead just ignore it when found. * - * f_console_flag_*: + * f_console_flag_*e: * - none: No flag data is set. * - normal: Parameters using minus sign, such as '--help' ("inverse" and "additional" bits are 0. * - inverse: Parameters using plus sign, such as '++version'. @@ -200,11 +301,7 @@ extern "C" { * - type: A mask for selecting the bits representing all possible type value flags. * - state: A mask for selecting the bits representing all possible state flags. */ -#ifndef _di_f_console_flag_t_ - typedef uint8_t f_console_flag_t; - - #define f_console_flag_t_initialize 0 - +#ifndef _di_f_console_flag_e_ enum { f_console_flag_none_e = 0x0, @@ -216,18 +313,27 @@ extern "C" { // State flags. f_console_flag_disable_e = 0x10, - }; + }; // enum #define f_console_flag_mask_type_d 0xf #define f_console_flag_mask_state_d 0x10 -#endif // _di_f_console_flag_t_ +#endif // _di_f_console_flag_e_ + +/** + * The console result data type. + */ +#ifndef _di_f_console_result_t_ + typedef uint8_t f_console_result_t; + + #define f_console_result_t_initialize 0 +#endif // _di_f_console_result_t_ /** * Result values that represent the type of command found. * * Here "alone" refers to '-', or '++', in that they only have the symbols (whereas '-x', or '++x' would not be alone). * - * f_console_result_*: + * f_console_result_*e: * - none: No flags are set. * - found: The parameter has been found. * - normal: The normal prefix character ("-" by default) has been found. @@ -237,11 +343,7 @@ extern "C" { * - alone: The prefix character is by itself (such as only "-" rather than "-h"). * - value: One or more values associated with the parameter have been found. */ -#ifndef _di_f_console_result_t_ - typedef uint8_t f_console_result_t; - - #define f_console_result_t_initialize 0 - +#ifndef _di_f_console_result_e_ enum { f_console_result_none_e = 0x0, f_console_result_found_e = 0x1, @@ -251,8 +353,8 @@ extern "C" { f_console_result_long_e = 0x10, f_console_result_alone_e = 0x20, f_console_result_value_e = 0x40, - }; -#endif // _di_f_console_result_t_ + }; // enum +#endif // _di_f_console_result_e_ /** * Provide the standard verbosity codes. diff --git a/level_0/f_control_group/c/control_group/common.c b/level_0/f_control_group/c/control_group/common.c index 5d117ca..cc8b1c5 100644 --- a/level_0/f_control_group/c/control_group/common.c +++ b/level_0/f_control_group/c/control_group/common.c @@ -5,9 +5,17 @@ extern "C" { #endif #ifndef _di_f_control_group_s_ - const f_string_static_t f_control_group_path_system_default_s = macro_f_string_static_t_initialize(F_control_group_path_system_default_s, 0, F_control_group_path_system_default_s_length); - const f_string_static_t f_control_group_path_system_prefix_s = macro_f_string_static_t_initialize(F_control_group_path_system_prefix_s, 0, F_control_group_path_system_prefix_s_length); - const f_string_static_t f_control_group_path_system_suffix_s = macro_f_string_static_t_initialize(F_control_group_path_system_suffix_s, 0, F_control_group_path_system_suffix_s_length); + #ifndef _di_f_control_group_path_system_default_s_ + const f_string_static_t f_control_group_path_system_default_s = macro_f_string_static_t_initialize(F_control_group_path_system_default_s, 0, F_control_group_path_system_default_s_length); + #endif // _di_f_control_group_path_system_default_s_ + + #ifndef _di_f_control_group_path_system_prefix_s_ + const f_string_static_t f_control_group_path_system_prefix_s = macro_f_string_static_t_initialize(F_control_group_path_system_prefix_s, 0, F_control_group_path_system_prefix_s_length); + #endif // _di_f_control_group_path_system_prefix_s_ + + #ifndef _di_f_control_group_path_system_suffix_s_ + const f_string_static_t f_control_group_path_system_suffix_s = macro_f_string_static_t_initialize(F_control_group_path_system_suffix_s, 0, F_control_group_path_system_suffix_s_length); + #endif // _di_f_control_group_path_system_suffix_s_ #endif // _di_f_control_group_s_ #ifdef __cplusplus diff --git a/level_0/f_control_group/c/control_group/common.h b/level_0/f_control_group/c/control_group/common.h index 2264735..67f3244 100644 --- a/level_0/f_control_group/c/control_group/common.h +++ b/level_0/f_control_group/c/control_group/common.h @@ -19,6 +19,13 @@ extern "C" { /** * The defines for control groups. */ +#ifndef _di_f_control_group_d_ + #define F_control_group_pid_length_max_d 64 +#endif // _di_f_control_group_d_ + +/** + * Control group strings. + */ #ifndef _di_f_control_group_s_ #define F_control_group_path_system_default_s "sys/fs/cgroup/" #define F_control_group_path_system_prefix_s "/" @@ -28,11 +35,17 @@ extern "C" { #define F_control_group_path_system_prefix_s_length 1 #define F_control_group_path_system_suffix_s_length 13 - #define F_control_group_pid_length_max_d 64 + #ifndef _di_f_control_group_path_system_default_s_ + extern const f_string_static_t f_control_group_path_system_default_s; + #endif // _di_f_control_group_path_system_default_s_ + + #ifndef _di_f_control_group_path_system_prefix_s_ + extern const f_string_static_t f_control_group_path_system_prefix_s; + #endif // _di_f_control_group_path_system_prefix_s_ - extern const f_string_static_t f_control_group_path_system_default_s; - extern const f_string_static_t f_control_group_path_system_prefix_s; - extern const f_string_static_t f_control_group_path_system_suffix_s; + #ifndef _di_f_control_group_path_system_suffix_s_ + extern const f_string_static_t f_control_group_path_system_suffix_s; + #endif // _di_f_control_group_path_system_suffix_s_ #endif // _di_f_control_group_s_ /** diff --git a/level_0/f_directory/c/directory/common.c b/level_0/f_directory/c/directory/common.c index f556f54..d72e38e 100644 --- a/level_0/f_directory/c/directory/common.c +++ b/level_0/f_directory/c/directory/common.c @@ -5,8 +5,13 @@ extern "C" { #endif #ifndef _di_f_directory_s_ - const f_string_static_t f_directory_back_s = macro_f_string_static_t_initialize(F_directory_back_s, 0, F_directory_back_s_length); - const f_string_static_t f_directory_current_s = macro_f_string_static_t_initialize(F_directory_current_s, 0, F_directory_current_s_length); + #ifndef _di_f_directory_back_s_ + const f_string_static_t f_directory_back_s = macro_f_string_static_t_initialize(F_directory_back_s, 0, F_directory_back_s_length); + #endif // _di_f_directory_back_s_ + + #ifndef _di_f_directory_current_s_ + const f_string_static_t f_directory_current_s = macro_f_string_static_t_initialize(F_directory_current_s, 0, F_directory_current_s_length); + #endif // _di_f_directory_current_s_ #endif // _di_f_directory_s_ #ifdef __cplusplus diff --git a/level_0/f_directory/c/directory/common.h b/level_0/f_directory/c/directory/common.h index 2992134..7ed226d 100644 --- a/level_0/f_directory/c/directory/common.h +++ b/level_0/f_directory/c/directory/common.h @@ -23,8 +23,13 @@ extern "C" { #define F_directory_back_s_length 2 #define F_directory_current_s_length 1 - extern const f_string_static_t f_directory_back_s; - extern const f_string_static_t f_directory_current_s; + #ifndef _di_f_directory_back_s_ + extern const f_string_static_t f_directory_back_s; + #endif // _di_f_directory_back_s_ + + #ifndef _di_f_directory_current_s_ + extern const f_string_static_t f_directory_current_s; + #endif // _di_f_directory_current_s_ #endif // _di_f_directory_s_ /** diff --git a/level_0/f_environment/c/environment.c b/level_0/f_environment/c/environment.c index 64b1866..66bf895 100644 --- a/level_0/f_environment/c/environment.c +++ b/level_0/f_environment/c/environment.c @@ -49,7 +49,7 @@ extern char **environ; return F_exist_not; } - const f_array_length_t size = strnlen(result, f_environment_max_length); + const f_array_length_t size = strnlen(result, f_environment_max_length_d); if (size) { const f_status_t status = f_string_dynamic_increase_by(size + 1, value); diff --git a/level_0/f_environment/c/environment/common.h b/level_0/f_environment/c/environment/common.h index e4cbed1..ea9ad85 100644 --- a/level_0/f_environment/c/environment/common.h +++ b/level_0/f_environment/c/environment/common.h @@ -20,7 +20,7 @@ extern "C" { * Environment related defines. */ #ifndef _di_f_environment_d_ - #define f_environment_max_length F_string_t_size_d + #define f_environment_max_length_d F_string_t_size_d #endif // _di_f_environment_d_ #ifdef __cplusplus diff --git a/level_0/f_file/c/file/common.c b/level_0/f_file/c/file/common.c index 410b079..f57d20e 100644 --- a/level_0/f_file/c/file/common.c +++ b/level_0/f_file/c/file/common.c @@ -5,69 +5,237 @@ extern "C" { #endif #ifndef _di_f_file_type_d_ - const f_string_static_t f_file_type_name_block_s = macro_f_string_static_t_initialize(F_file_type_name_block_s, 0, F_file_type_name_block_s_length); - const f_string_static_t f_file_type_name_character_s = macro_f_string_static_t_initialize(F_file_type_name_character_s, 0, F_file_type_name_character_s_length); - const f_string_static_t f_file_type_name_directory_s = macro_f_string_static_t_initialize(F_file_type_name_directory_s, 0, F_file_type_name_directory_s_length); - const f_string_static_t f_file_type_name_fifo_s = macro_f_string_static_t_initialize(F_file_type_name_fifo_s, 0, F_file_type_name_fifo_s_length); - const f_string_static_t f_file_type_name_link_s = macro_f_string_static_t_initialize(F_file_type_name_link_s, 0, F_file_type_name_link_s_length); - const f_string_static_t f_file_type_name_regular_s = macro_f_string_static_t_initialize(F_file_type_name_regular_s, 0, F_file_type_name_regular_s_length); - const f_string_static_t f_file_type_name_socket_s = macro_f_string_static_t_initialize(F_file_type_name_socket_s, 0, F_file_type_name_socket_s_length); + #ifndef _di_f_file_type_name_block_s_ + const f_string_static_t f_file_type_name_block_s = macro_f_string_static_t_initialize(F_file_type_name_block_s, 0, F_file_type_name_block_s_length); + #endif // _di_f_file_type_name_block_s_ + + #ifndef _di_f_file_type_name_character_s_ + const f_string_static_t f_file_type_name_character_s = macro_f_string_static_t_initialize(F_file_type_name_character_s, 0, F_file_type_name_character_s_length); + #endif // _di_f_file_type_name_character_s_ + + #ifndef _di_f_file_type_name_directory_s_ + const f_string_static_t f_file_type_name_directory_s = macro_f_string_static_t_initialize(F_file_type_name_directory_s, 0, F_file_type_name_directory_s_length); + #endif // _di_f_file_type_name_directory_s_ + + #ifndef _di_f_file_type_name_fifo_s_ + const f_string_static_t f_file_type_name_fifo_s = macro_f_string_static_t_initialize(F_file_type_name_fifo_s, 0, F_file_type_name_fifo_s_length); + #endif // _di_f_file_type_name_fifo_s_ + + #ifndef _di_f_file_type_name_link_s_ + const f_string_static_t f_file_type_name_link_s = macro_f_string_static_t_initialize(F_file_type_name_link_s, 0, F_file_type_name_link_s_length); + #endif // _di_f_file_type_name_link_s_ + + #ifndef _di_f_file_type_name_regular_s_ + const f_string_static_t f_file_type_name_regular_s = macro_f_string_static_t_initialize(F_file_type_name_regular_s, 0, F_file_type_name_regular_s_length); + #endif // _di_f_file_type_name_regular_s_ + + #ifndef _di_f_file_type_name_socket_s_ + const f_string_static_t f_file_type_name_socket_s = macro_f_string_static_t_initialize(F_file_type_name_socket_s, 0, F_file_type_name_socket_s_length); + #endif // _di_f_file_type_name_socket_s_ #endif // _di_f_file_type_d_ #ifndef _di_f_file_open_mode_s_ - const f_string_static_t f_file_open_mode_append_s = macro_f_string_static_t_initialize(F_file_open_mode_append_s, 0, F_file_open_mode_append_s_length); - const f_string_static_t f_file_open_mode_read_s = macro_f_string_static_t_initialize(F_file_open_mode_read_s, 0, F_file_open_mode_read_s_length); - const f_string_static_t f_file_open_mode_read_append_s = macro_f_string_static_t_initialize(F_file_open_mode_read_append_s, 0, F_file_open_mode_read_append_s_length); - const f_string_static_t f_file_open_mode_read_truncate_s = macro_f_string_static_t_initialize(F_file_open_mode_read_truncate_s, 0, F_file_open_mode_read_truncate_s_length); - const f_string_static_t f_file_open_mode_read_write_s = macro_f_string_static_t_initialize(F_file_open_mode_read_write_s, 0, F_file_open_mode_read_write_s_length); - const f_string_static_t f_file_open_mode_truncate_s = macro_f_string_static_t_initialize(F_file_open_mode_truncate_s, 0, F_file_open_mode_truncate_s_length); + #ifndef _di_f_file_open_mode_append_s_ + const f_string_static_t f_file_open_mode_append_s = macro_f_string_static_t_initialize(F_file_open_mode_append_s, 0, F_file_open_mode_append_s_length); + #endif // _di_f_file_open_mode_append_s_ + + #ifndef _di_f_file_open_mode_read_s_ + const f_string_static_t f_file_open_mode_read_s = macro_f_string_static_t_initialize(F_file_open_mode_read_s, 0, F_file_open_mode_read_s_length); + #endif // _di_f_file_open_mode_read_s_ + + #ifndef _di_f_file_open_mode_read_append_s_ + const f_string_static_t f_file_open_mode_read_append_s = macro_f_string_static_t_initialize(F_file_open_mode_read_append_s, 0, F_file_open_mode_read_append_s_length); + #endif // _di_f_file_open_mode_read_append_s_ + + #ifndef _di_f_file_open_mode_read_truncate_s_ + const f_string_static_t f_file_open_mode_read_truncate_s = macro_f_string_static_t_initialize(F_file_open_mode_read_truncate_s, 0, F_file_open_mode_read_truncate_s_length); + #endif // _di_f_file_open_mode_read_truncate_s_ + + #ifndef _di_f_file_open_mode_read_write_s_ + const f_string_static_t f_file_open_mode_read_write_s = macro_f_string_static_t_initialize(F_file_open_mode_read_write_s, 0, F_file_open_mode_read_write_s_length); + #endif // _di_f_file_open_mode_read_write_s_ + + #ifndef _di_f_file_open_mode_truncate_s_ + const f_string_static_t f_file_open_mode_truncate_s = macro_f_string_static_t_initialize(F_file_open_mode_truncate_s, 0, F_file_open_mode_truncate_s_length); + #endif // _di_f_file_open_mode_truncate_s_ #endif // _di_f_file_open_mode_s_ #ifndef _di_f_file_operation_s_ - const f_string_static_t f_file_operation_access_s = macro_f_string_static_t_initialize(F_file_operation_access_s, 0, F_file_operation_access_s_length); - const f_string_static_t f_file_operation_analyze_s = macro_f_string_static_t_initialize(F_file_operation_analyze_s, 0, F_file_operation_analyze_s_length); - const f_string_static_t f_file_operation_append_s = macro_f_string_static_t_initialize(F_file_operation_append_s, 0, F_file_operation_append_s_length); - const f_string_static_t f_file_operation_change_group_s = macro_f_string_static_t_initialize(F_file_operation_change_group_s, 0, F_file_operation_change_group_s_length); - const f_string_static_t f_file_operation_change_mode_s = macro_f_string_static_t_initialize(F_file_operation_change_mode_s, 0, F_file_operation_change_mode_s_length); - const f_string_static_t f_file_operation_change_owner_s = macro_f_string_static_t_initialize(F_file_operation_change_owner_s, 0, F_file_operation_change_owner_s_length); - const f_string_static_t f_file_operation_change_type_s = macro_f_string_static_t_initialize(F_file_operation_change_type_s, 0, F_file_operation_change_type_s_length); - const f_string_static_t f_file_operation_clone_s = macro_f_string_static_t_initialize(F_file_operation_clone_s, 0, F_file_operation_clone_s_length); - const f_string_static_t f_file_operation_close_s = macro_f_string_static_t_initialize(F_file_operation_close_s, 0, F_file_operation_close_s_length); - const f_string_static_t f_file_operation_concatenate_s = macro_f_string_static_t_initialize(F_file_operation_concatenate_s, 0, F_file_operation_concatenate_s_length); - const f_string_static_t f_file_operation_connect_s = macro_f_string_static_t_initialize(F_file_operation_connect_s, 0, F_file_operation_connect_s_length); - const f_string_static_t f_file_operation_copy_s = macro_f_string_static_t_initialize(F_file_operation_copy_s, 0, F_file_operation_copy_s_length); - const f_string_static_t f_file_operation_create_s = macro_f_string_static_t_initialize(F_file_operation_create_s, 0, F_file_operation_create_s_length); - const f_string_static_t f_file_operation_decrypt_s = macro_f_string_static_t_initialize(F_file_operation_decrypt_s, 0, F_file_operation_decrypt_s_length); - const f_string_static_t f_file_operation_delete_s = macro_f_string_static_t_initialize(F_file_operation_delete_s, 0, F_file_operation_delete_s_length); - const f_string_static_t f_file_operation_disconnect_s = macro_f_string_static_t_initialize(F_file_operation_disconnect_s, 0, F_file_operation_disconnect_s_length); - const f_string_static_t f_file_operation_encrypt_s = macro_f_string_static_t_initialize(F_file_operation_encrypt_s, 0, F_file_operation_encrypt_s_length); - const f_string_static_t f_file_operation_find_s = macro_f_string_static_t_initialize(F_file_operation_find_s, 0, F_file_operation_find_s_length); - const f_string_static_t f_file_operation_from_s = macro_f_string_static_t_initialize(F_file_operation_from_s, 0, F_file_operation_from_s_length); - const f_string_static_t f_file_operation_flush_s = macro_f_string_static_t_initialize(F_file_operation_flush_s, 0, F_file_operation_flush_s_length); - const f_string_static_t f_file_operation_get_group_s = macro_f_string_static_t_initialize(F_file_operation_get_group_s, 0, F_file_operation_get_group_s_length); - const f_string_static_t f_file_operation_get_mode_s = macro_f_string_static_t_initialize(F_file_operation_get_mode_s, 0, F_file_operation_get_mode_s_length); - const f_string_static_t f_file_operation_get_owner_s = macro_f_string_static_t_initialize(F_file_operation_get_owner_s, 0, F_file_operation_get_owner_s_length); - const f_string_static_t f_file_operation_get_type_s = macro_f_string_static_t_initialize(F_file_operation_get_type_s, 0, F_file_operation_get_type_s_length); - const f_string_static_t f_file_operation_identify_s = macro_f_string_static_t_initialize(F_file_operation_identify_s, 0, F_file_operation_identify_s_length); - const f_string_static_t f_file_operation_link_s = macro_f_string_static_t_initialize(F_file_operation_link_s, 0, F_file_operation_link_s_length); - const f_string_static_t f_file_operation_list_s = macro_f_string_static_t_initialize(F_file_operation_list_s, 0, F_file_operation_list_s_length); - const f_string_static_t f_file_operation_move_s = macro_f_string_static_t_initialize(F_file_operation_move_s, 0, F_file_operation_move_s_length); - const f_string_static_t f_file_operation_open_s = macro_f_string_static_t_initialize(F_file_operation_open_s, 0, F_file_operation_open_s_length); - const f_string_static_t f_file_operation_pipe_s = macro_f_string_static_t_initialize(F_file_operation_pipe_s, 0, F_file_operation_pipe_s_length); - const f_string_static_t f_file_operation_process_s = macro_f_string_static_t_initialize(F_file_operation_process_s, 0, F_file_operation_process_s_length); - const f_string_static_t f_file_operation_read_s = macro_f_string_static_t_initialize(F_file_operation_read_s, 0, F_file_operation_read_s_length); - const f_string_static_t f_file_operation_receive_s = macro_f_string_static_t_initialize(F_file_operation_receive_s, 0, F_file_operation_receive_s_length); - const f_string_static_t f_file_operation_rename_s = macro_f_string_static_t_initialize(F_file_operation_rename_s, 0, F_file_operation_rename_s_length); - const f_string_static_t f_file_operation_send_s = macro_f_string_static_t_initialize(F_file_operation_send_s, 0, F_file_operation_send_s_length); - const f_string_static_t f_file_operation_shred_s = macro_f_string_static_t_initialize(F_file_operation_shred_s, 0, F_file_operation_shred_s_length); - const f_string_static_t f_file_operation_stat_s = macro_f_string_static_t_initialize(F_file_operation_stat_s, 0, F_file_operation_stat_s_length); - const f_string_static_t f_file_operation_to_s = macro_f_string_static_t_initialize(F_file_operation_to_s, 0, F_file_operation_to_s_length); - const f_string_static_t f_file_operation_touch_s = macro_f_string_static_t_initialize(F_file_operation_touch_s, 0, F_file_operation_touch_s_length); - const f_string_static_t f_file_operation_truncate_s = macro_f_string_static_t_initialize(F_file_operation_truncate_s, 0, F_file_operation_truncate_s_length); - const f_string_static_t f_file_operation_unlink_s = macro_f_string_static_t_initialize(F_file_operation_unlink_s, 0, F_file_operation_unlink_s_length); - const f_string_static_t f_file_operation_verify_s = macro_f_string_static_t_initialize(F_file_operation_verify_s, 0, F_file_operation_verify_s_length); - const f_string_static_t f_file_operation_wipe_s = macro_f_string_static_t_initialize(F_file_operation_wipe_s, 0, F_file_operation_wipe_s_length); - const f_string_static_t f_file_operation_write_s = macro_f_string_static_t_initialize(F_file_operation_write_s, 0, F_file_operation_write_s_length); + #ifndef _di_f_file_operation_access_s_ + const f_string_static_t f_file_operation_access_s = macro_f_string_static_t_initialize(F_file_operation_access_s, 0, F_file_operation_access_s_length); + #endif // _di_f_file_operation_access_s_ + + #ifndef _di_f_file_operation_analyze_s_ + const f_string_static_t f_file_operation_analyze_s = macro_f_string_static_t_initialize(F_file_operation_analyze_s, 0, F_file_operation_analyze_s_length); + #endif // _di_f_file_operation_analyze_s_ + + #ifndef _di_f_file_operation_append_s_ + const f_string_static_t f_file_operation_append_s = macro_f_string_static_t_initialize(F_file_operation_append_s, 0, F_file_operation_append_s_length); + #endif // _di_f_file_operation_append_s_ + + #ifndef _di_f_file_operation_change_group_s_ + const f_string_static_t f_file_operation_change_group_s = macro_f_string_static_t_initialize(F_file_operation_change_group_s, 0, F_file_operation_change_group_s_length); + #endif // _di_f_file_operation_change_group_s_ + + #ifndef _di_f_file_operation_change_mode_s_ + const f_string_static_t f_file_operation_change_mode_s = macro_f_string_static_t_initialize(F_file_operation_change_mode_s, 0, F_file_operation_change_mode_s_length); + #endif // _di_f_file_operation_change_mode_s_ + + #ifndef _di_f_file_operation_change_owner_s_ + const f_string_static_t f_file_operation_change_owner_s = macro_f_string_static_t_initialize(F_file_operation_change_owner_s, 0, F_file_operation_change_owner_s_length); + #endif // _di_f_file_operation_change_owner_s_ + + #ifndef _di_f_file_operation_change_type_s_ + const f_string_static_t f_file_operation_change_type_s = macro_f_string_static_t_initialize(F_file_operation_change_type_s, 0, F_file_operation_change_type_s_length); + #endif // _di_f_file_operation_change_type_s_ + + #ifndef _di_f_file_operation_clone_s_ + const f_string_static_t f_file_operation_clone_s = macro_f_string_static_t_initialize(F_file_operation_clone_s, 0, F_file_operation_clone_s_length); + #endif // _di_f_file_operation_clone_s_ + + #ifndef _di_f_file_operation_close_s_ + const f_string_static_t f_file_operation_close_s = macro_f_string_static_t_initialize(F_file_operation_close_s, 0, F_file_operation_close_s_length); + #endif // _di_f_file_operation_close_s_ + + #ifndef _di_f_file_operation_concatenate_s_ + const f_string_static_t f_file_operation_concatenate_s = macro_f_string_static_t_initialize(F_file_operation_concatenate_s, 0, F_file_operation_concatenate_s_length); + #endif // _di_f_file_operation_concatenate_s_ + + #ifndef _di_f_file_operation_connect_s_ + const f_string_static_t f_file_operation_connect_s = macro_f_string_static_t_initialize(F_file_operation_connect_s, 0, F_file_operation_connect_s_length); + #endif // _di_f_file_operation_connect_s_ + + #ifndef _di_f_file_operation_copy_s_ + const f_string_static_t f_file_operation_copy_s = macro_f_string_static_t_initialize(F_file_operation_copy_s, 0, F_file_operation_copy_s_length); + #endif // _di_f_file_operation_copy_s_ + + #ifndef _di_f_file_operation_create_s_ + const f_string_static_t f_file_operation_create_s = macro_f_string_static_t_initialize(F_file_operation_create_s, 0, F_file_operation_create_s_length); + #endif // _di_f_file_operation_create_s_ + + #ifndef _di_f_file_operation_decrypt_s_ + const f_string_static_t f_file_operation_decrypt_s = macro_f_string_static_t_initialize(F_file_operation_decrypt_s, 0, F_file_operation_decrypt_s_length); + #endif // _di_f_file_operation_decrypt_s_ + + #ifndef _di_f_file_operation_delete_s_ + const f_string_static_t f_file_operation_delete_s = macro_f_string_static_t_initialize(F_file_operation_delete_s, 0, F_file_operation_delete_s_length); + #endif // _di_f_file_operation_delete_s_ + + #ifndef _di_f_file_operation_disconnect_s_ + const f_string_static_t f_file_operation_disconnect_s = macro_f_string_static_t_initialize(F_file_operation_disconnect_s, 0, F_file_operation_disconnect_s_length); + #endif // _di_f_file_operation_disconnect_s_ + + #ifndef _di_f_file_operation_encrypt_s_ + const f_string_static_t f_file_operation_encrypt_s = macro_f_string_static_t_initialize(F_file_operation_encrypt_s, 0, F_file_operation_encrypt_s_length); + #endif // _di_f_file_operation_encrypt_s_ + + #ifndef _di_f_file_operation_find_s_ + const f_string_static_t f_file_operation_find_s = macro_f_string_static_t_initialize(F_file_operation_find_s, 0, F_file_operation_find_s_length); + #endif // _di_f_file_operation_find_s_ + + #ifndef _di_f_file_operation_from_s_ + const f_string_static_t f_file_operation_from_s = macro_f_string_static_t_initialize(F_file_operation_from_s, 0, F_file_operation_from_s_length); + #endif // _di_f_file_operation_from_s_ + + #ifndef _di_f_file_operation__s_ + const f_string_static_t f_file_operation_flush_s = macro_f_string_static_t_initialize(F_file_operation_flush_s, 0, F_file_operation_flush_s_length); + #endif // _di_f_file_operation__s_ + + #ifndef _di_f_file_operation_get_group_s_ + const f_string_static_t f_file_operation_get_group_s = macro_f_string_static_t_initialize(F_file_operation_get_group_s, 0, F_file_operation_get_group_s_length); + #endif // _di_f_file_operation_get_group_s_ + + #ifndef _di_f_file_operation_get_mode_s_ + const f_string_static_t f_file_operation_get_mode_s = macro_f_string_static_t_initialize(F_file_operation_get_mode_s, 0, F_file_operation_get_mode_s_length); + #endif // _di_f_file_operation_get_mode_s_ + + #ifndef _di_f_file_operation_get_owner_s_ + const f_string_static_t f_file_operation_get_owner_s = macro_f_string_static_t_initialize(F_file_operation_get_owner_s, 0, F_file_operation_get_owner_s_length); + #endif // _di_f_file_operation_get_owner_s_ + + #ifndef _di_f_file_operation_get_type_s_ + const f_string_static_t f_file_operation_get_type_s = macro_f_string_static_t_initialize(F_file_operation_get_type_s, 0, F_file_operation_get_type_s_length); + #endif // _di_f_file_operation_get_type_s_ + + #ifndef _di_f_file_operation_identify_s_ + const f_string_static_t f_file_operation_identify_s = macro_f_string_static_t_initialize(F_file_operation_identify_s, 0, F_file_operation_identify_s_length); + #endif // _di_f_file_operation_identify_s_ + + #ifndef _di_f_file_operation_link_s_ + const f_string_static_t f_file_operation_link_s = macro_f_string_static_t_initialize(F_file_operation_link_s, 0, F_file_operation_link_s_length); + #endif // _di_f_file_operation_link_s_ + + #ifndef _di_f_file_operation_list_s_ + const f_string_static_t f_file_operation_list_s = macro_f_string_static_t_initialize(F_file_operation_list_s, 0, F_file_operation_list_s_length); + #endif // _di_f_file_operation_list_s_ + + #ifndef _di_f_file_operation_move_s_ + const f_string_static_t f_file_operation_move_s = macro_f_string_static_t_initialize(F_file_operation_move_s, 0, F_file_operation_move_s_length); + #endif // _di_f_file_operation_move_s_ + + #ifndef _di_f_file_operation_open_s_ + const f_string_static_t f_file_operation_open_s = macro_f_string_static_t_initialize(F_file_operation_open_s, 0, F_file_operation_open_s_length); + #endif // _di_f_file_operation_open_s_ + + #ifndef _di_f_file_operation_pipe_s_ + const f_string_static_t f_file_operation_pipe_s = macro_f_string_static_t_initialize(F_file_operation_pipe_s, 0, F_file_operation_pipe_s_length); + #endif // _di_f_file_operation_pipe_s_ + + #ifndef _di_f_file_operation_process_s_ + const f_string_static_t f_file_operation_process_s = macro_f_string_static_t_initialize(F_file_operation_process_s, 0, F_file_operation_process_s_length); + #endif // _di_f_file_operation_process_s_ + + #ifndef _di_f_file_operation_read_s_ + const f_string_static_t f_file_operation_read_s = macro_f_string_static_t_initialize(F_file_operation_read_s, 0, F_file_operation_read_s_length); + #endif // _di_f_file_operation_read_s_ + + #ifndef _di_f_file_operation_receive_s_ + const f_string_static_t f_file_operation_receive_s = macro_f_string_static_t_initialize(F_file_operation_receive_s, 0, F_file_operation_receive_s_length); + #endif // _di_f_file_operation_receive_s_ + + #ifndef _di_f_file_operation_rename_s_ + const f_string_static_t f_file_operation_rename_s = macro_f_string_static_t_initialize(F_file_operation_rename_s, 0, F_file_operation_rename_s_length); + #endif // _di_f_file_operation_rename_s_ + + #ifndef _di_f_file_operation_send_s_ + const f_string_static_t f_file_operation_send_s = macro_f_string_static_t_initialize(F_file_operation_send_s, 0, F_file_operation_send_s_length); + #endif // _di_f_file_operation_send_s_ + + #ifndef _di_f_file_operation_shred_s_ + const f_string_static_t f_file_operation_shred_s = macro_f_string_static_t_initialize(F_file_operation_shred_s, 0, F_file_operation_shred_s_length); + #endif // _di_f_file_operation_shred_s_ + + #ifndef _di_f_file_operation_stat_s_ + const f_string_static_t f_file_operation_stat_s = macro_f_string_static_t_initialize(F_file_operation_stat_s, 0, F_file_operation_stat_s_length); + #endif // _di_f_file_operation_stat_s_ + + #ifndef _di_f_file_operation_to_s_ + const f_string_static_t f_file_operation_to_s = macro_f_string_static_t_initialize(F_file_operation_to_s, 0, F_file_operation_to_s_length); + #endif // _di_f_file_operation_to_s_ + + #ifndef _di_f_file_operation_touch_s_ + const f_string_static_t f_file_operation_touch_s = macro_f_string_static_t_initialize(F_file_operation_touch_s, 0, F_file_operation_touch_s_length); + #endif // _di_f_file_operation_touch_s_ + + #ifndef _di_f_file_operation_truncate_s_ + const f_string_static_t f_file_operation_truncate_s = macro_f_string_static_t_initialize(F_file_operation_truncate_s, 0, F_file_operation_truncate_s_length); + #endif // _di_f_file_operation_truncate_s_ + + #ifndef _di_f_file_operation_unlink_s_ + const f_string_static_t f_file_operation_unlink_s = macro_f_string_static_t_initialize(F_file_operation_unlink_s, 0, F_file_operation_unlink_s_length); + #endif // _di_f_file_operation_unlink_s_ + + #ifndef _di_f_file_operation_verify_s_ + const f_string_static_t f_file_operation_verify_s = macro_f_string_static_t_initialize(F_file_operation_verify_s, 0, F_file_operation_verify_s_length); + #endif // _di_f_file_operation_verify_s_ + + #ifndef _di_f_file_operation_wipe_s_ + const f_string_static_t f_file_operation_wipe_s = macro_f_string_static_t_initialize(F_file_operation_wipe_s, 0, F_file_operation_wipe_s_length); + #endif // _di_f_file_operation_wipe_s_ + + #ifndef _di_f_file_operation_write_s_ + const f_string_static_t f_file_operation_write_s = macro_f_string_static_t_initialize(F_file_operation_write_s, 0, F_file_operation_write_s_length); + #endif // _di_f_file_operation_write_s_ #endif // _di_f_file_operation_s_ #ifdef __cplusplus diff --git a/level_0/f_file/c/file/common.h b/level_0/f_file/c/file/common.h index 6307e4a..a4e4c02 100644 --- a/level_0/f_file/c/file/common.h +++ b/level_0/f_file/c/file/common.h @@ -101,13 +101,33 @@ extern "C" { #define F_file_type_name_regular_s_length 7 #define F_file_type_name_socket_s_length 6 - extern const f_string_static_t f_file_type_name_block_s; - extern const f_string_static_t f_file_type_name_character_s; - extern const f_string_static_t f_file_type_name_directory_s; - extern const f_string_static_t f_file_type_name_fifo_s; - extern const f_string_static_t f_file_type_name_link_s; - extern const f_string_static_t f_file_type_name_regular_s; - extern const f_string_static_t f_file_type_name_socket_s; + #ifndef _di_f_file_type_name_block_s_ + extern const f_string_static_t f_file_type_name_block_s; + #endif // _di_f_file_type_name_block_s_ + + #ifndef _di_f_file_type_name_character_s_ + extern const f_string_static_t f_file_type_name_character_s; + #endif // _di_f_file_type_name_character_s_ + + #ifndef _di_f_file_type_name_directory_s_ + extern const f_string_static_t f_file_type_name_directory_s; + #endif // _di_f_file_type_name_directory_s_ + + #ifndef _di_f_file_type_name_fifo_s_ + extern const f_string_static_t f_file_type_name_fifo_s; + #endif // _di_f_file_type_name_fifo_s_ + + #ifndef _di_f_file_type_name_link_s_ + extern const f_string_static_t f_file_type_name_link_s; + #endif // _di_f_file_type_name_link_s_ + + #ifndef _di_f_file_type_name_regular_s_ + extern const f_string_static_t f_file_type_name_regular_s; + #endif // _di_f_file_type_name_regular_s_ + + #ifndef _di_f_file_type_name_socket_s_ + extern const f_string_static_t f_file_type_name_socket_s; + #endif // _di_f_file_type_name_socket_s_ #endif // _di_f_file_type_s_ /** @@ -152,12 +172,29 @@ extern "C" { #define F_file_open_mode_read_write_s_length 2 #define F_file_open_mode_truncate_s_length 1 - extern const f_string_static_t f_file_open_mode_append_s; - extern const f_string_static_t f_file_open_mode_read_s; - extern const f_string_static_t f_file_open_mode_read_append_s; - extern const f_string_static_t f_file_open_mode_read_truncate_s; - extern const f_string_static_t f_file_open_mode_read_write_s; - extern const f_string_static_t f_file_open_mode_truncate_s; + #ifndef _di_f_file_open_mode_append_s_ + extern const f_string_static_t f_file_open_mode_append_s; + #endif // _di_f_file_open_mode_append_s_ + + #ifndef _di_f_file_open_mode_read_s_ + extern const f_string_static_t f_file_open_mode_read_s; + #endif // _di_f_file_open_mode_read_s_ + + #ifndef _di_f_file_open_mode_read_append_s_ + extern const f_string_static_t f_file_open_mode_read_append_s; + #endif // _di_f_file_open_mode_read_append_s_ + + #ifndef _di_f_file_open_mode_read_truncate_s_ + extern const f_string_static_t f_file_open_mode_read_truncate_s; + #endif // _di_f_file_open_mode_read_truncate_s_ + + #ifndef _di_f_file_open_mode_read_write_s_ + extern const f_string_static_t f_file_open_mode_read_write_s; + #endif // _di_f_file_open_mode_read_write_s_ + + #ifndef _di_f_file_open_mode_truncate_s_ + extern const f_string_static_t f_file_open_mode_truncate_s; + #endif // _di_f_file_open_mode_truncate_s_ #endif // _di_f_file_open_mode_s_ /** @@ -573,50 +610,181 @@ extern "C" { #define F_file_operation_wipe_s_length 4 #define F_file_operation_write_s_length 5 - extern const f_string_static_t f_file_operation_access_s; - extern const f_string_static_t f_file_operation_analyze_s; - extern const f_string_static_t f_file_operation_append_s; - extern const f_string_static_t f_file_operation_change_group_s; - extern const f_string_static_t f_file_operation_change_mode_s; - extern const f_string_static_t f_file_operation_change_owner_s; - extern const f_string_static_t f_file_operation_change_type_s; - extern const f_string_static_t f_file_operation_clone_s; - extern const f_string_static_t f_file_operation_close_s; - extern const f_string_static_t f_file_operation_concatenate_s; - extern const f_string_static_t f_file_operation_connect_s; - extern const f_string_static_t f_file_operation_copy_s; - extern const f_string_static_t f_file_operation_create_s; - extern const f_string_static_t f_file_operation_decrypt_s; - extern const f_string_static_t f_file_operation_delete_s; - extern const f_string_static_t f_file_operation_disconnect_s; - extern const f_string_static_t f_file_operation_encrypt_s; - extern const f_string_static_t f_file_operation_find_s; - extern const f_string_static_t f_file_operation_from_s; - extern const f_string_static_t f_file_operation_flush_s; - extern const f_string_static_t f_file_operation_get_group_s; - extern const f_string_static_t f_file_operation_get_mode_s; - extern const f_string_static_t f_file_operation_get_owner_s; - extern const f_string_static_t f_file_operation_get_type_s; - extern const f_string_static_t f_file_operation_identify_s; - extern const f_string_static_t f_file_operation_link_s; - extern const f_string_static_t f_file_operation_list_s; - extern const f_string_static_t f_file_operation_move_s; - extern const f_string_static_t f_file_operation_open_s; - extern const f_string_static_t f_file_operation_pipe_s; - extern const f_string_static_t f_file_operation_process_s; - extern const f_string_static_t f_file_operation_read_s; - extern const f_string_static_t f_file_operation_receive_s; - extern const f_string_static_t f_file_operation_rename_s; - extern const f_string_static_t f_file_operation_send_s; - extern const f_string_static_t f_file_operation_shred_s; - extern const f_string_static_t f_file_operation_stat_s; - extern const f_string_static_t f_file_operation_to_s; - extern const f_string_static_t f_file_operation_touch_s; - extern const f_string_static_t f_file_operation_truncate_s; - extern const f_string_static_t f_file_operation_unlink_s; - extern const f_string_static_t f_file_operation_verify_s; - extern const f_string_static_t f_file_operation_wipe_s; - extern const f_string_static_t f_file_operation_write_s; + #ifndef _di_f_file_operation_access_s_ + extern const f_string_static_t f_file_operation_access_s; + #endif // _di_f_file_operation_access_s_ + + #ifndef _di_f_file_operation_analyze_s_ + extern const f_string_static_t f_file_operation_analyze_s; + #endif // _di_f_file_operation_analyze_s_ + + #ifndef _di_f_file_operation_append_s_ + extern const f_string_static_t f_file_operation_append_s; + #endif // _di_f_file_operation_append_s_ + + #ifndef _di_f_file_operation_change_group_s_ + extern const f_string_static_t f_file_operation_change_group_s; + #endif // _di_f_file_operation_change_group_s_ + + #ifndef _di_f_file_operation_change_mode_s_ + extern const f_string_static_t f_file_operation_change_mode_s; + #endif // _di_f_file_operation_change_mode_s_ + + #ifndef _di_f_file_operation_change_owner_s_ + extern const f_string_static_t f_file_operation_change_owner_s; + #endif // _di_f_file_operation_change_owner_s_ + + #ifndef _di_f_file_operation_change_type_s_ + extern const f_string_static_t f_file_operation_change_type_s; + #endif // _di_f_file_operation_change_type_s_ + + #ifndef _di_f_file_operation_clone_s_ + extern const f_string_static_t f_file_operation_clone_s; + #endif // _di_f_file_operation_clone_s_ + + #ifndef _di_f_file_operation_close_s_ + extern const f_string_static_t f_file_operation_close_s; + #endif // _di_f_file_operation_close_s_ + + #ifndef _di_f_file_operation_concatenate_s_ + extern const f_string_static_t f_file_operation_concatenate_s; + #endif // _di_f_file_operation_concatenate_s_ + + #ifndef _di_f_file_operation_connect_s_ + extern const f_string_static_t f_file_operation_connect_s; + #endif // _di_f_file_operation_connect_s_ + + #ifndef _di_f_file_operation_copy_s_ + extern const f_string_static_t f_file_operation_copy_s; + #endif // _di_f_file_operation_copy_s_ + + #ifndef _di_f_file_operation_create_s_ + extern const f_string_static_t f_file_operation_create_s; + #endif // _di_f_file_operation_create_s_ + + #ifndef _di_f_file_operation_decrypt_s_ + extern const f_string_static_t f_file_operation_decrypt_s; + #endif // _di_f_file_operation_decrypt_s_ + + #ifndef _di_f_file_operation_delete_s_ + extern const f_string_static_t f_file_operation_delete_s; + #endif // _di_f_file_operation_delete_s_ + + #ifndef _di_f_file_operation_disconnect_s_ + extern const f_string_static_t f_file_operation_disconnect_s; + #endif // _di_f_file_operation_disconnect_s_ + + #ifndef _di_f_file_operation_encrypt_s_ + extern const f_string_static_t f_file_operation_encrypt_s; + #endif // _di_f_file_operation_encrypt_s_ + + #ifndef _di_f_file_operation_find_s_ + extern const f_string_static_t f_file_operation_find_s; + #endif // _di_f_file_operation_find_s_ + + #ifndef _di_f_file_operation_from_s_ + extern const f_string_static_t f_file_operation_from_s; + #endif // _di_f_file_operation_from_s_ + + #ifndef _di_f_file_operation__s_ + extern const f_string_static_t f_file_operation_flush_s; + #endif // _di_f_file_operation__s_ + + #ifndef _di_f_file_operation_get_group_s_ + extern const f_string_static_t f_file_operation_get_group_s; + #endif // _di_f_file_operation_get_group_s_ + + #ifndef _di_f_file_operation_get_mode_s_ + extern const f_string_static_t f_file_operation_get_mode_s; + #endif // _di_f_file_operation_get_mode_s_ + + #ifndef _di_f_file_operation_get_owner_s_ + extern const f_string_static_t f_file_operation_get_owner_s; + #endif // _di_f_file_operation_get_owner_s_ + + #ifndef _di_f_file_operation_get_type_s_ + extern const f_string_static_t f_file_operation_get_type_s; + #endif // _di_f_file_operation_get_type_s_ + + #ifndef _di_f_file_operation_identify_s_ + extern const f_string_static_t f_file_operation_identify_s; + #endif // _di_f_file_operation_identify_s_ + + #ifndef _di_f_file_operation_link_s_ + extern const f_string_static_t f_file_operation_link_s; + #endif // _di_f_file_operation_link_s_ + + #ifndef _di_f_file_operation_list_s_ + extern const f_string_static_t f_file_operation_list_s; + #endif // _di_f_file_operation_list_s_ + + #ifndef _di_f_file_operation_move_s_ + extern const f_string_static_t f_file_operation_move_s; + #endif // _di_f_file_operation_move_s_ + + #ifndef _di_f_file_operation_open_s_ + extern const f_string_static_t f_file_operation_open_s; + #endif // _di_f_file_operation_open_s_ + + #ifndef _di_f_file_operation_pipe_s_ + extern const f_string_static_t f_file_operation_pipe_s; + #endif // _di_f_file_operation_pipe_s_ + + #ifndef _di_f_file_operation_process_s_ + extern const f_string_static_t f_file_operation_process_s; + #endif // _di_f_file_operation_process_s_ + + #ifndef _di_f_file_operation_read_s_ + extern const f_string_static_t f_file_operation_read_s; + #endif // _di_f_file_operation_read_s_ + + #ifndef _di_f_file_operation_receive_s_ + extern const f_string_static_t f_file_operation_receive_s; + #endif // _di_f_file_operation_receive_s_ + + #ifndef _di_f_file_operation_rename_s_ + extern const f_string_static_t f_file_operation_rename_s; + #endif // _di_f_file_operation_rename_s_ + + #ifndef _di_f_file_operation_send_s_ + extern const f_string_static_t f_file_operation_send_s; + #endif // _di_f_file_operation_send_s_ + + #ifndef _di_f_file_operation_shred_s_ + extern const f_string_static_t f_file_operation_shred_s; + #endif // _di_f_file_operation_shred_s_ + + #ifndef _di_f_file_operation_stat_s_ + extern const f_string_static_t f_file_operation_stat_s; + #endif // _di_f_file_operation_stat_s_ + + #ifndef _di_f_file_operation_to_s_ + extern const f_string_static_t f_file_operation_to_s; + #endif // _di_f_file_operation_to_s_ + + #ifndef _di_f_file_operation_touch_s_ + extern const f_string_static_t f_file_operation_touch_s; + #endif // _di_f_file_operation_touch_s_ + + #ifndef _di_f_file_operation_truncate_s_ + extern const f_string_static_t f_file_operation_truncate_s; + #endif // _di_f_file_operation_truncate_s_ + + #ifndef _di_f_file_operation_unlink_s_ + extern const f_string_static_t f_file_operation_unlink_s; + #endif // _di_f_file_operation_unlink_s_ + + #ifndef _di_f_file_operation_verify_s_ + extern const f_string_static_t f_file_operation_verify_s; + #endif // _di_f_file_operation_verify_s_ + + #ifndef _di_f_file_operation_wipe_s_ + extern const f_string_static_t f_file_operation_wipe_s; + #endif // _di_f_file_operation_wipe_s_ + + #ifndef _di_f_file_operation_write_s_ + extern const f_string_static_t f_file_operation_write_s; + #endif // _di_f_file_operation_write_s_ #endif // _di_f_file_operation_s_ #ifdef __cplusplus diff --git a/level_0/f_fss/c/fss/common.c b/level_0/f_fss/c/fss/common.c index 7594b85..e1d0a1e 100644 --- a/level_0/f_fss/c/fss/common.c +++ b/level_0/f_fss/c/fss/common.c @@ -5,8 +5,13 @@ extern "C" { #endif #ifndef _di_f_fss_s_ - const f_string_static_t f_fss_string_header_s = macro_f_string_static_t_initialize(F_fss_string_header_s, 0, F_fss_string_header_s_length); - const f_string_static_t f_fss_string_payload_s = macro_f_string_static_t_initialize(F_fss_string_payload_s, 0, F_fss_string_payload_s_length); + #ifndef _di_f_fss_header_s_ + const f_string_static_t f_fss_header_s = macro_f_string_static_t_initialize(F_fss_header_s, 0, F_fss_string_header_s_length); + #endif // _di_f_fss_header_s_ + + #ifndef _di_f_fss_payload_s_ + const f_string_static_t f_fss_payload_s = macro_f_string_static_t_initialize(F_fss_payload_s, 0, F_fss_string_payload_s_length); + #endif // _di_f_fss_payload_s_ #endif // _di_f_fss_s_ #ifdef __cplusplus diff --git a/level_0/f_fss/c/fss/common.h b/level_0/f_fss/c/fss/common.h index ed1b5c1..e96f749 100644 --- a/level_0/f_fss/c/fss/common.h +++ b/level_0/f_fss/c/fss/common.h @@ -110,19 +110,24 @@ extern "C" { /** * Provide strings used by FSS. * - * F_fss_string_*: + * F_fss_*_s: * - header: String representing the header Object name. * - payload: String representing the payload Object name. */ #ifndef _di_f_fss_s_ - #define F_fss_string_header_s "header" - #define F_fss_string_payload_s "payload" + #define F_fss_header_s "header" + #define F_fss_payload_s "payload" #define F_fss_string_header_s_length 6 #define F_fss_string_payload_s_length 7 - extern const f_string_static_t f_fss_string_header_s; - extern const f_string_static_t f_fss_string_payload_s; + #ifndef _di_f_fss_header_s_ + extern const f_string_static_t f_fss_header_s; + #endif // _di_f_fss_header_s_ + + #ifndef _di_f_fss_payload_s_ + extern const f_string_static_t f_fss_payload_s; + #endif // _di_f_fss_payload_s_ #endif // _di_f_fss_s_ /** @@ -164,7 +169,7 @@ extern "C" { f_fss_basic_rule_e, f_fss_payload_e, f_fss_simple_packet_e, - }; + }; // enum #endif // _di_f_fss_e_ /** @@ -193,7 +198,7 @@ extern "C" { f_fss_complete_next_e, f_fss_complete_partial_e, f_fss_complete_partial_trim_e, - }; + }; // enum #endif // _di_f_fss_complete_e_ /** diff --git a/level_0/f_iki/c/iki/common.c b/level_0/f_iki/c/iki/common.c index f4a2b5f..dc5a66d 100644 --- a/level_0/f_iki/c/iki/common.c +++ b/level_0/f_iki/c/iki/common.c @@ -6,31 +6,85 @@ extern "C" { #endif #ifndef _di_f_iki_syntax_s_ - const f_string_static_t f_iki_syntax_separator_s = macro_f_string_static_t_initialize(F_iki_syntax_separator_s, 0, F_iki_syntax_separator_s_length); - const f_string_static_t f_iki_syntax_placeholder_s = macro_f_string_static_t_initialize(F_iki_syntax_placeholder_s, 0, F_iki_syntax_placeholder_s_length); - const f_string_static_t f_iki_syntax_quote_backtick_s = macro_f_string_static_t_initialize(F_iki_syntax_quote_backtick_s, 0, F_iki_syntax_quote_backtick_s_length); - const f_string_static_t f_iki_syntax_quote_double_s = macro_f_string_static_t_initialize(F_iki_syntax_quote_double_s, 0, F_iki_syntax_quote_double_s_length); - const f_string_static_t f_iki_syntax_quote_single_s = macro_f_string_static_t_initialize(F_iki_syntax_quote_single_s, 0, F_iki_syntax_quote_single_s_length); - const f_string_static_t f_iki_syntax_slash_s = macro_f_string_static_t_initialize(F_iki_syntax_slash_s, 0, F_iki_syntax_slash_s_length); + #ifndef _di_f_iki_syntax_separator_s_ + const f_string_static_t f_iki_syntax_separator_s = macro_f_string_static_t_initialize(F_iki_syntax_separator_s, 0, F_iki_syntax_separator_s_length); + #endif // _di_f_iki_syntax_separator_s_ + + #ifndef _di_f_iki_syntax_placeholder_s_ + const f_string_static_t f_iki_syntax_placeholder_s = macro_f_string_static_t_initialize(F_iki_syntax_placeholder_s, 0, F_iki_syntax_placeholder_s_length); + #endif // _di_f_iki_syntax_placeholder_s_ + + #ifndef _di_f_iki_syntax_quote_backtick_s_ + const f_string_static_t f_iki_syntax_quote_backtick_s = macro_f_string_static_t_initialize(F_iki_syntax_quote_backtick_s, 0, F_iki_syntax_quote_backtick_s_length); + #endif // _di_f_iki_syntax_quote_backtick_s_ + + #ifndef _di_f_iki_syntax_quote_double_s_ + const f_string_static_t f_iki_syntax_quote_double_s = macro_f_string_static_t_initialize(F_iki_syntax_quote_double_s, 0, F_iki_syntax_quote_double_s_length); + #endif // _di_f_iki_syntax_quote_double_s_ + + #ifndef _di_f_iki_syntax_quote_single_s_ + const f_string_static_t f_iki_syntax_quote_single_s = macro_f_string_static_t_initialize(F_iki_syntax_quote_single_s, 0, F_iki_syntax_quote_single_s_length); + #endif // _di_f_iki_syntax_quote_single_s_ + + #ifndef _di_f_iki_syntax_slash_s_ + const f_string_static_t f_iki_syntax_slash_s = macro_f_string_static_t_initialize(F_iki_syntax_slash_s, 0, F_iki_syntax_slash_s_length); + #endif // _di_f_iki_syntax_slash_s_ #endif //_di_f_iki_syntax_s_ #ifndef _di_f_iki_vocabulary_0001_s_ - const f_string_static_t f_iki_vocabulary_0001_address_s = macro_f_string_static_t_initialize(F_iki_vocabulary_0001_address_s, 0, F_iki_vocabulary_0001_address_s_length); - const f_string_static_t f_iki_vocabulary_0001_code_s = macro_f_string_static_t_initialize(F_iki_vocabulary_0001_code_s, 0, F_iki_vocabulary_0001_code_s_length); - const f_string_static_t f_iki_vocabulary_0001_email_s = macro_f_string_static_t_initialize(F_iki_vocabulary_0001_email_s, 0, F_iki_vocabulary_0001_email_s_length); - const f_string_static_t f_iki_vocabulary_0001_name_s = macro_f_string_static_t_initialize(F_iki_vocabulary_0001_name_s, 0, F_iki_vocabulary_0001_name_s_length); - const f_string_static_t f_iki_vocabulary_0001_phone_s = macro_f_string_static_t_initialize(F_iki_vocabulary_0001_phone_s, 0, F_iki_vocabulary_0001_phone_s_length); - const f_string_static_t f_iki_vocabulary_0001_quote_s = macro_f_string_static_t_initialize(F_iki_vocabulary_0001_quote_s, 0, F_iki_vocabulary_0001_quote_s_length); - const f_string_static_t f_iki_vocabulary_0001_uri_s = macro_f_string_static_t_initialize(F_iki_vocabulary_0001_uri_s, 0, F_iki_vocabulary_0001_uri_s_length); - const f_string_static_t f_iki_vocabulary_0001_url_s = macro_f_string_static_t_initialize(F_iki_vocabulary_0001_url_s, 0, F_iki_vocabulary_0001_url_s_length); - const f_string_static_t f_iki_vocabulary_0001_urn_s = macro_f_string_static_t_initialize(F_iki_vocabulary_0001_urn_s, 0, F_iki_vocabulary_0001_urn_s_length); - const f_string_static_t f_iki_vocabulary_0001_variable_s = macro_f_string_static_t_initialize(F_iki_vocabulary_0001_variable_s, 0, F_iki_vocabulary_0001_variable_s_length); + #ifndef _di_f_iki_vocabulary_0001_address_s_ + const f_string_static_t f_iki_vocabulary_0001_address_s = macro_f_string_static_t_initialize(F_iki_vocabulary_0001_address_s, 0, F_iki_vocabulary_0001_address_s_length); + #endif // _di_f_iki_vocabulary_0001_address_s_ + + #ifndef _di_f_iki_vocabulary_0001_code_s_ + const f_string_static_t f_iki_vocabulary_0001_code_s = macro_f_string_static_t_initialize(F_iki_vocabulary_0001_code_s, 0, F_iki_vocabulary_0001_code_s_length); + #endif // _di_f_iki_vocabulary_0001_code_s_ + + #ifndef _di_f_iki_vocabulary_0001_email_s_ + const f_string_static_t f_iki_vocabulary_0001_email_s = macro_f_string_static_t_initialize(F_iki_vocabulary_0001_email_s, 0, F_iki_vocabulary_0001_email_s_length); + #endif // _di_f_iki_vocabulary_0001_email_s_ + + #ifndef _di_f_iki_vocabulary_0001_name_s_ + const f_string_static_t f_iki_vocabulary_0001_name_s = macro_f_string_static_t_initialize(F_iki_vocabulary_0001_name_s, 0, F_iki_vocabulary_0001_name_s_length); + #endif // _di_f_iki_vocabulary_0001_name_s_ + + #ifndef _di_f_iki_vocabulary_0001_phone_s_ + const f_string_static_t f_iki_vocabulary_0001_phone_s = macro_f_string_static_t_initialize(F_iki_vocabulary_0001_phone_s, 0, F_iki_vocabulary_0001_phone_s_length); + #endif // _di_f_iki_vocabulary_0001_phone_s_ + + #ifndef _di_f_iki_vocabulary_0001_quote_s_ + const f_string_static_t f_iki_vocabulary_0001_quote_s = macro_f_string_static_t_initialize(F_iki_vocabulary_0001_quote_s, 0, F_iki_vocabulary_0001_quote_s_length); + #endif // _di_f_iki_vocabulary_0001_quote_s_ + + #ifndef _di_f_iki_vocabulary_0001_uri_s_ + const f_string_static_t f_iki_vocabulary_0001_uri_s = macro_f_string_static_t_initialize(F_iki_vocabulary_0001_uri_s, 0, F_iki_vocabulary_0001_uri_s_length); + #endif // _di_f_iki_vocabulary_0001_uri_s_ + + #ifndef _di_f_iki_vocabulary_0001_url_s_ + const f_string_static_t f_iki_vocabulary_0001_url_s = macro_f_string_static_t_initialize(F_iki_vocabulary_0001_url_s, 0, F_iki_vocabulary_0001_url_s_length); + #endif // _di_f_iki_vocabulary_0001_url_s_ + + #ifndef _di_f_iki_vocabulary_0001_urn_s_ + const f_string_static_t f_iki_vocabulary_0001_urn_s = macro_f_string_static_t_initialize(F_iki_vocabulary_0001_urn_s, 0, F_iki_vocabulary_0001_urn_s_length); + #endif // _di_f_iki_vocabulary_0001_urn_s_ + + #ifndef _di_f_iki_vocabulary_0001_variable_s_ + const f_string_static_t f_iki_vocabulary_0001_variable_s = macro_f_string_static_t_initialize(F_iki_vocabulary_0001_variable_s, 0, F_iki_vocabulary_0001_variable_s_length); + #endif // _di_f_iki_vocabulary_0001_variable_s_ #endif // _di_f_iki_vocabulary_0001_s_ #ifndef _di_f_iki_vocabulary_0002_s_ - const f_string_static_t f_iki_vocabulary_0002_context_s = macro_f_string_static_t_initialize(F_iki_vocabulary_0002_context_s, 0, F_iki_vocabulary_0002_context_s_length); - const f_string_static_t f_iki_vocabulary_0002_define_s = macro_f_string_static_t_initialize(F_iki_vocabulary_0002_define_s, 0, F_iki_vocabulary_0002_define_s_length); - const f_string_static_t f_iki_vocabulary_0002_parameter_s = macro_f_string_static_t_initialize(F_iki_vocabulary_0002_parameter_s, 0, F_iki_vocabulary_0002_parameter_s_length); + #ifndef _di_f_iki_vocabulary_0002_context_s_ + const f_string_static_t f_iki_vocabulary_0002_context_s = macro_f_string_static_t_initialize(F_iki_vocabulary_0002_context_s, 0, F_iki_vocabulary_0002_context_s_length); + #endif // _di_f_iki_vocabulary_0002_context_s_ + + #ifndef _di_f_iki_vocabulary_0002_define_s_ + const f_string_static_t f_iki_vocabulary_0002_define_s = macro_f_string_static_t_initialize(F_iki_vocabulary_0002_define_s, 0, F_iki_vocabulary_0002_define_s_length); + #endif // _di_f_iki_vocabulary_0002_define_s_ + + #ifndef _di_f_iki_vocabulary_0002_parameter_s_ + const f_string_static_t f_iki_vocabulary_0002_parameter_s = macro_f_string_static_t_initialize(F_iki_vocabulary_0002_parameter_s, 0, F_iki_vocabulary_0002_parameter_s_length); + #endif // _di_f_iki_vocabulary_0002_parameter_s_ #endif // _di_f_iki_vocabulary_0002_s_ #ifdef __cplusplus diff --git a/level_0/f_iki/c/iki/common.h b/level_0/f_iki/c/iki/common.h index f08e5eb..35b62d7 100644 --- a/level_0/f_iki/c/iki/common.h +++ b/level_0/f_iki/c/iki/common.h @@ -17,6 +17,20 @@ extern "C" { #endif /** + * Provide a default allocation step. + * + * For a UTF-8 friendly allocation step, set to at least 4. + * + * F_iki_default_allocation_*: + * - large: The large allocation size. + * - small: The small allocation size, in particular used for allocation iki strings. + */ +#ifndef _di_f_iki_default_d_ + #define F_iki_default_allocation_large_d F_memory_default_allocation_large_d + #define F_iki_default_allocation_small_d 8 +#endif // _di_f_iki_default_d_ + +/** * State flags associated with iki functions. * * These flags are meant to be bitwise for the 32-bit f_state_t flag property. @@ -52,12 +66,29 @@ extern "C" { #define F_iki_syntax_quote_single_s_length F_string_ascii_quote_single_s_length #define F_iki_syntax_slash_s_length F_string_ascii_slash_backward_s_length - extern const f_string_static_t f_iki_syntax_separator_s; - extern const f_string_static_t f_iki_syntax_placeholder_s; - extern const f_string_static_t f_iki_syntax_quote_backtick_s; - extern const f_string_static_t f_iki_syntax_quote_double_s; - extern const f_string_static_t f_iki_syntax_quote_single_s; - extern const f_string_static_t f_iki_syntax_slash_s; + #ifndef _di_f_iki_syntax_separator_s_ + extern const f_string_static_t f_iki_syntax_separator_s; + #endif // _di_f_iki_syntax_separator_s_ + + #ifndef _di_f_iki_syntax_placeholder_s_ + extern const f_string_static_t f_iki_syntax_placeholder_s; + #endif // _di_f_iki_syntax_placeholder_s_ + + #ifndef _di_f_iki_syntax_quote_backtick_s_ + extern const f_string_static_t f_iki_syntax_quote_backtick_s; + #endif // _di_f_iki_syntax_quote_backtick_s_ + + #ifndef _di_f_iki_syntax_quote_double_s_ + extern const f_string_static_t f_iki_syntax_quote_double_s; + #endif // _di_f_iki_syntax_quote_double_s_ + + #ifndef _di_f_iki_syntax_quote_single_s_ + extern const f_string_static_t f_iki_syntax_quote_single_s; + #endif // _di_f_iki_syntax_quote_single_s_ + + #ifndef _di_f_iki_syntax_slash_s_ + extern const f_string_static_t f_iki_syntax_slash_s; + #endif // _di_f_iki_syntax_slash_s_ #endif //_di_f_iki_syntax_s_ #ifndef _di_f_iki_vocabulary_0001_s_ @@ -83,16 +114,45 @@ extern "C" { #define F_iki_vocabulary_0001_urn_s_length 3 #define F_iki_vocabulary_0001_variable_s_length 3 - extern const f_string_static_t f_iki_vocabulary_0001_address_s; - extern const f_string_static_t f_iki_vocabulary_0001_code_s; - extern const f_string_static_t f_iki_vocabulary_0001_email_s; - extern const f_string_static_t f_iki_vocabulary_0001_name_s; - extern const f_string_static_t f_iki_vocabulary_0001_phone_s; - extern const f_string_static_t f_iki_vocabulary_0001_quote_s; - extern const f_string_static_t f_iki_vocabulary_0001_uri_s; - extern const f_string_static_t f_iki_vocabulary_0001_url_s; - extern const f_string_static_t f_iki_vocabulary_0001_urn_s; - extern const f_string_static_t f_iki_vocabulary_0001_variable_s; + #ifndef _di_f_iki_vocabulary_0001_address_s_ + extern const f_string_static_t f_iki_vocabulary_0001_address_s; + #endif // _di_f_iki_vocabulary_0001_address_s_ + + #ifndef _di_f_iki_vocabulary_0001_code_s_ + extern const f_string_static_t f_iki_vocabulary_0001_code_s; + #endif // _di_f_iki_vocabulary_0001_code_s_ + + #ifndef _di_f_iki_vocabulary_0001_email_s_ + extern const f_string_static_t f_iki_vocabulary_0001_email_s; + #endif // _di_f_iki_vocabulary_0001_email_s_ + + #ifndef _di_f_iki_vocabulary_0001_name_s_ + extern const f_string_static_t f_iki_vocabulary_0001_name_s; + #endif // _di_f_iki_vocabulary_0001_name_s_ + + #ifndef _di_f_iki_vocabulary_0001_phone_s_ + extern const f_string_static_t f_iki_vocabulary_0001_phone_s; + #endif // _di_f_iki_vocabulary_0001_phone_s_ + + #ifndef _di_f_iki_vocabulary_0001_quote_s_ + extern const f_string_static_t f_iki_vocabulary_0001_quote_s; + #endif // _di_f_iki_vocabulary_0001_quote_s_ + + #ifndef _di_f_iki_vocabulary_0001_uri_s_ + extern const f_string_static_t f_iki_vocabulary_0001_uri_s; + #endif // _di_f_iki_vocabulary_0001_uri_s_ + + #ifndef _di_f_iki_vocabulary_0001_url_s_ + extern const f_string_static_t f_iki_vocabulary_0001_url_s; + #endif // _di_f_iki_vocabulary_0001_url_s_ + + #ifndef _di_f_iki_vocabulary_0001_urn_s_ + extern const f_string_static_t f_iki_vocabulary_0001_urn_s; + #endif // _di_f_iki_vocabulary_0001_urn_s_ + + #ifndef _di_f_iki_vocabulary_0001_variable_s_ + extern const f_string_static_t f_iki_vocabulary_0001_variable_s; + #endif // _di_f_iki_vocabulary_0001_variable_s_ #endif // _di_f_iki_vocabulary_0001_s_ #ifndef _di_f_iki_vocabulary_0002_s_ @@ -104,9 +164,17 @@ extern "C" { #define F_iki_vocabulary_0002_define_s_length 6 #define F_iki_vocabulary_0002_parameter_s_length 9 - extern const f_string_static_t f_iki_vocabulary_0002_context_s; - extern const f_string_static_t f_iki_vocabulary_0002_define_s; - extern const f_string_static_t f_iki_vocabulary_0002_parameter_s; + #ifndef _di_f_iki_vocabulary_0002_context_s_ + extern const f_string_static_t f_iki_vocabulary_0002_context_s; + #endif // _di_f_iki_vocabulary_0002_context_s_ + + #ifndef _di_f_iki_vocabulary_0002_define_s_ + extern const f_string_static_t f_iki_vocabulary_0002_define_s; + #endif // _di_f_iki_vocabulary_0002_define_s_ + + #ifndef _di_f_iki_vocabulary_0002_parameter_s_ + extern const f_string_static_t f_iki_vocabulary_0002_parameter_s; + #endif // _di_f_iki_vocabulary_0002_parameter_s_ #endif // _di_f_iki_vocabulary_0002_s_ /** @@ -212,20 +280,6 @@ extern "C" { #define macro_f_iki_datass_t_decimate_by(status, datas, amount) status = f_iki_datass_decimate_by(amount, &datas); #endif // _di_f_iki_datass_t_ -/** - * Provide a default allocation step. - * - * For a UTF-8 friendly allocation step, set to at least 4. - * - * F_iki_default_allocation_*: - * - large: The large allocation size. - * - small: The small allocation size, in particular used for allocation iki strings. - */ -#ifndef _di_f_iki_default_d_ - #define F_iki_default_allocation_large_d F_memory_default_allocation_large_d - #define F_iki_default_allocation_small_d 8 -#endif // _di_f_iki_default_d_ - #ifdef __cplusplus } // extern "C" #endif diff --git a/level_0/f_path/c/path/common.c b/level_0/f_path/c/path/common.c index 078ef32..ac0ea55 100644 --- a/level_0/f_path/c/path/common.c +++ b/level_0/f_path/c/path/common.c @@ -5,82 +5,236 @@ extern "C" { #endif #ifndef _di_f_path_d_ - const f_string_static_t f_path_separator_s = macro_f_string_static_t_initialize(F_string_ascii_slash_forward_s, 0, F_string_ascii_slash_forward_s_length); - const f_string_static_t f_path_separator_current_s = macro_f_string_static_t_initialize(F_string_ascii_period_s, 0, F_string_ascii_period_s_length); - const f_string_static_t f_path_separator_variable_s = macro_f_string_static_t_initialize(F_string_ascii_colon_s, 0, F_string_ascii_colon_s_length); + #ifndef _di_f_path_separator_s_ + const f_string_static_t f_path_separator_s = macro_f_string_static_t_initialize(F_string_ascii_slash_forward_s, 0, F_string_ascii_slash_forward_s_length); + #endif // _di_f_path_separator_s_ - const f_string_static_t f_path_extension_separator_s = macro_f_string_static_t_initialize(F_string_ascii_period_s, 0, F_string_ascii_period_s_length); + #ifndef _di_f_path_separator_current_s_ + const f_string_static_t f_path_separator_current_s = macro_f_string_static_t_initialize(F_string_ascii_period_s, 0, F_string_ascii_period_s_length); + #endif // _di_f_path_separator_current_s_ - const f_string_static_t f_path_environment_s = macro_f_string_static_t_initialize(F_path_environment_s, 0, F_path_environment_s_length); - const f_string_static_t f_path_home_wildcard_s = macro_f_string_static_t_initialize(F_string_ascii_tilde_s, 0, F_string_ascii_tilde_s_length); - const f_string_static_t f_path_present_working_s = macro_f_string_static_t_initialize(F_path_present_working_s, 0, F_path_present_working_s_length); - const f_string_static_t f_path_present_working_old_s = macro_f_string_static_t_initialize(F_path_present_working_old_s, 0, F_path_present_working_old_s_length); + #ifndef _di_f_path_separator_variable_s_ + const f_string_static_t f_path_separator_variable_s = macro_f_string_static_t_initialize(F_string_ascii_colon_s, 0, F_string_ascii_colon_s_length); + #endif // _di_f_path_separator_variable_s_ + + #ifndef _di_f_path_extension_separator_s_ + const f_string_static_t f_path_extension_separator_s = macro_f_string_static_t_initialize(F_string_ascii_period_s, 0, F_string_ascii_period_s_length); + #endif // _di_f_path_extension_separator_s_ + + #ifndef _di_f_path_environment_s_ + const f_string_static_t f_path_environment_s = macro_f_string_static_t_initialize(F_path_environment_s, 0, F_path_environment_s_length); + #endif // _di_f_path_environment_s_ + + #ifndef _di_f_path_home_wildcard_s_ + const f_string_static_t f_path_home_wildcard_s = macro_f_string_static_t_initialize(F_string_ascii_tilde_s, 0, F_string_ascii_tilde_s_length); + #endif // _di_f_path_home_wildcard_s_ + + #ifndef _di_f_path_present_working_s_ + const f_string_static_t f_path_present_working_s = macro_f_string_static_t_initialize(F_path_present_working_s, 0, F_path_present_working_s_length); + #endif // _di_f_path_present_working_s_ + + #ifndef _di_f_path_present_working_old_s_ + const f_string_static_t f_path_present_working_old_s = macro_f_string_static_t_initialize(F_path_present_working_old_s, 0, F_path_present_working_old_s_length); + #endif // _di_f_path_present_working_old_s_ #endif // _di_f_path_d_ #if defined(_di_f_path_tree_s_) && !defined(_di_f_path_tree_hierarchy_standard_d_) && !defined(_di_f_path_tree_kevux_standard_d_) // KFS Root Level. - const f_string_static_t f_path_tree_devices_s = macro_f_string_static_t_initialize(F_path_tree_devices_s, 0, F_path_tree_devices_s_length); - const f_string_static_t f_path_tree_external_s = macro_f_string_static_t_initialize(F_path_tree_external_s, 0, F_path_tree_external_s_length); - const f_string_static_t f_path_tree_libraries_s = macro_f_string_static_t_initialize(F_path_tree_libraries_s, 0, F_path_tree_libraries_s_length); - const f_string_static_t f_path_tree_programs_s = macro_f_string_static_t_initialize(F_path_tree_programs_s, 0,F_path_tree_programs_s _length); - const f_string_static_t f_path_tree_temporary_s = macro_f_string_static_t_initialize(F_path_tree_temporary_s, 0, F_path_tree_temporary_s_length); - const f_string_static_t f_path_tree_home_s = macro_f_string_static_t_initialize(F_path_tree_home_s, 0, F_path_tree_home_s_length); - const f_string_static_t f_path_tree_run_s = macro_f_string_static_t_initialize(F_path_tree_run_s, 0, F_path_tree_run_s_length); - const f_string_static_t f_path_tree_binary_s = macro_f_string_static_t_initialize(F_path_tree_binary_s, 0, F_path_tree_binary_s_length); + #ifndef _di_f_path_tree_devices_s_ + const f_string_static_t f_path_tree_devices_s = macro_f_string_static_t_initialize(F_path_tree_devices_s, 0, F_path_tree_devices_s_length); + #endif // _di_f_path_tree_devices_s_ + + #ifndef _di_f_path_tree_external_s_ + const f_string_static_t f_path_tree_external_s = macro_f_string_static_t_initialize(F_path_tree_external_s, 0, F_path_tree_external_s_length); + #endif // _di_f_path_tree_external_s_ + + #ifndef _di_f_path_tree_libraries_s_ + const f_string_static_t f_path_tree_libraries_s = macro_f_string_static_t_initialize(F_path_tree_libraries_s, 0, F_path_tree_libraries_s_length); + #endif // _di_f_path_tree_libraries_s_ + + #ifndef _di_f_path_tree_programs_s_ + const f_string_static_t f_path_tree_programs_s = macro_f_string_static_t_initialize(F_path_tree_programs_s, 0,F_path_tree_programs_s _length); + #endif // _di_f_path_tree_programs_s_ + + #ifndef _di_f_path_tree_temporary_s_ + const f_string_static_t f_path_tree_temporary_s = macro_f_string_static_t_initialize(F_path_tree_temporary_s, 0, F_path_tree_temporary_s_length); + #endif // _di_f_path_tree_temporary_s_ + + #ifndef _di_f_path_tree_home_s_ + const f_string_static_t f_path_tree_home_s = macro_f_string_static_t_initialize(F_path_tree_home_s, 0, F_path_tree_home_s_length); + #endif // _di_f_path_tree_home_s_ + + #ifndef _di_f_path_tree_run_s_ + const f_string_static_t f_path_tree_run_s = macro_f_string_static_t_initialize(F_path_tree_run_s, 0, F_path_tree_run_s_length); + #endif // _di_f_path_tree_run_s_ + + #ifndef _di_f_path_tree_binary_s_ + const f_string_static_t f_path_tree_binary_s = macro_f_string_static_t_initialize(F_path_tree_binary_s, 0, F_path_tree_binary_s_length); + #endif // _di_f_path_tree_binary_s_ // FHS Root Level. - const f_string_static_t f_path_tree_boot_s = macro_f_string_static_t_initialize(F_path_tree_boot_s, 0, F_path_tree_boot_s_length); - const f_string_static_t f_path_tree_hardware_s = macro_f_string_static_t_initialize(F_path_tree_hardware_s, 0, F_path_tree_hardware_s_length); - const f_string_static_t f_path_tree_processes_s = macro_f_string_static_t_initialize(F_path_tree_processes_s, 0, F_path_tree_processes_s_length); - const f_string_static_t f_path_tree_system_s = macro_f_string_static_t_initialize(F_path_tree_system_s, 0, F_path_tree_system_s_length); + #ifndef _di_f_path_tree_boot_s_ + const f_string_static_t f_path_tree_boot_s = macro_f_string_static_t_initialize(F_path_tree_boot_s, 0, F_path_tree_boot_s_length); + #endif // _di_f_path_tree_boot_s_ + + #ifndef _di_f_path_tree_hardware_s_ + const f_string_static_t f_path_tree_hardware_s = macro_f_string_static_t_initialize(F_path_tree_hardware_s, 0, F_path_tree_hardware_s_length); + #endif // _di_f_path_tree_hardware_s_ + + #ifndef _di_f_path_tree_processes_s_ + const f_string_static_t f_path_tree_processes_s = macro_f_string_static_t_initialize(F_path_tree_processes_s, 0, F_path_tree_processes_s_length); + #endif // _di_f_path_tree_processes_s_ + + #ifndef _di_f_path_tree_system_s_ + const f_string_static_t f_path_tree_system_s = macro_f_string_static_t_initialize(F_path_tree_system_s, 0, F_path_tree_system_s_length); + #endif // _di_f_path_tree_system_s_ // Program Level. - const f_string_static_t f_path_tree_programs_public_s = macro_f_string_static_t_initialize(F_path_tree_programs_public_s, 0, F_path_tree_programs_public_s_length); - const f_string_static_t f_path_tree_programs_system_s = macro_f_string_static_t_initialize(F_path_tree_programs_system_s, 0, F_path_tree_programs_system_s_length); - const f_string_static_t f_path_tree_programs_remote_s = macro_f_string_static_t_initialize(F_path_tree_programs_remote_s, 0, F_path_tree_programs_remote_s_length); - const f_string_static_t f_path_tree_programs_services_s = macro_f_string_static_t_initialize(F_path_tree_programs_services_s, 0, F_path_tree_programs_services_s_length); - const f_string_static_t f_path_tree_programs_toolchain_s = macro_f_string_static_t_initialize(F_path_tree_programs_toolchain_s, 0, F_path_tree_programs_toolchain_s_length); - const f_string_static_t f_path_tree_programs_users_s = macro_f_string_static_t_initialize(F_path_tree_programs_users_s, 0, F_path_tree_programs_users_s_length); - const f_string_static_t f_path_tree_programs_susers_s = macro_f_string_static_t_initialize(F_path_tree_programs_susers_s, 0, F_path_tree_programs_susers_s_length); - const f_string_static_t f_path_tree_programs_boot_s = macro_f_string_static_t_initialize(F_path_tree_programs_boot_s, 0, F_path_tree_programs_boot_s_length); - const f_string_static_t f_path_tree_programs_sboot_s = macro_f_string_static_t_initialize(F_path_tree_programs_sboot_s, 0, F_path_tree_programs_sboot_s_length); + #ifndef _di_f_path_tree_programs_public_s_ + const f_string_static_t f_path_tree_programs_public_s = macro_f_string_static_t_initialize(F_path_tree_programs_public_s, 0, F_path_tree_programs_public_s_length); + #endif // _di_f_path_tree_programs_public_s_ + + #ifndef _di_f_path_tree_programs_system_s_ + const f_string_static_t f_path_tree_programs_system_s = macro_f_string_static_t_initialize(F_path_tree_programs_system_s, 0, F_path_tree_programs_system_s_length); + #endif // _di_f_path_tree_programs_system_s_ + + #ifndef _di_f_path_tree_programs_remote_s_ + const f_string_static_t f_path_tree_programs_remote_s = macro_f_string_static_t_initialize(F_path_tree_programs_remote_s, 0, F_path_tree_programs_remote_s_length); + #endif // _di_f_path_tree_programs_remote_s_ + + #ifndef _di_f_path_tree_programs_services_s_ + const f_string_static_t f_path_tree_programs_services_s = macro_f_string_static_t_initialize(F_path_tree_programs_services_s, 0, F_path_tree_programs_services_s_length); + #endif // _di_f_path_tree_programs_services_s_ + + #ifndef _di_f_path_tree_programs_toolchain_s_ + const f_string_static_t f_path_tree_programs_toolchain_s = macro_f_string_static_t_initialize(F_path_tree_programs_toolchain_s, 0, F_path_tree_programs_toolchain_s_length); + #endif // _di_f_path_tree_programs_toolchain_s_ + + #ifndef _di_f_path_tree_programs_users_s_ + const f_string_static_t f_path_tree_programs_users_s = macro_f_string_static_t_initialize(F_path_tree_programs_users_s, 0, F_path_tree_programs_users_s_length); + #endif // _di_f_path_tree_programs_users_s_ + + #ifndef _di_f_path_tree_programs_susers_s_ + const f_string_static_t f_path_tree_programs_susers_s = macro_f_string_static_t_initialize(F_path_tree_programs_susers_s, 0, F_path_tree_programs_susers_s_length); + #endif // _di_f_path_tree_programs_susers_s_ + + #ifndef _di_f_path_tree_programs_boot_s_ + const f_string_static_t f_path_tree_programs_boot_s = macro_f_string_static_t_initialize(F_path_tree_programs_boot_s, 0, F_path_tree_programs_boot_s_length); + #endif // _di_f_path_tree_programs_boot_s_ + + #ifndef _di_f_path_tree_programs_sboot_s_ + const f_string_static_t f_path_tree_programs_sboot_s = macro_f_string_static_t_initialize(F_path_tree_programs_sboot_s, 0, F_path_tree_programs_sboot_s_length); + #endif // _di_f_path_tree_programs_sboot_s_ // Library Level. - const f_string_static_t f_path_tree_libraries_public_s = macro_f_string_static_t_initialize(F_path_tree_libraries_public_s, 0, F_path_tree_libraries_public_s_length); - const f_string_static_t f_path_tree_libraries_system_s = macro_f_string_static_t_initialize(F_path_tree_libraries_system_s, 0, F_path_tree_libraries_system_s_length); - const f_string_static_t f_path_tree_libraries_remote_s = macro_f_string_static_t_initialize(F_path_tree_libraries_remote_s, 0, F_path_tree_libraries_remote_s_length); - const f_string_static_t f_path_tree_libraries_services_s = macro_f_string_static_t_initialize(F_path_tree_libraries_services_s, 0, F_path_tree_libraries_services_s_length); - const f_string_static_t f_path_tree_libraries_toolchain_s = macro_f_string_static_t_initialize(F_path_tree_libraries_toolchain_s, 0, F_path_tree_libraries_toolchain_s_length); - const f_string_static_t f_path_tree_libraries_users_s = macro_f_string_static_t_initialize(F_path_tree_libraries_users_s, 0, F_path_tree_libraries_users_s_length); - const f_string_static_t f_path_tree_libraries_boot_s = macro_f_string_static_t_initialize(F_path_tree_libraries_boot_s, 0, F_path_tree_libraries_boot_s_length); + #ifndef _di_f_path_tree_libraries_public_s_ + const f_string_static_t f_path_tree_libraries_public_s = macro_f_string_static_t_initialize(F_path_tree_libraries_public_s, 0, F_path_tree_libraries_public_s_length); + #endif // _di_f_path_tree_libraries_public_s_ + + #ifndef _di_f_path_tree_libraries_system_s_ + const f_string_static_t f_path_tree_libraries_system_s = macro_f_string_static_t_initialize(F_path_tree_libraries_system_s, 0, F_path_tree_libraries_system_s_length); + #endif // _di_f_path_tree_libraries_system_s_ + + #ifndef _di_f_path_tree_libraries_remote_s_ + const f_string_static_t f_path_tree_libraries_remote_s = macro_f_string_static_t_initialize(F_path_tree_libraries_remote_s, 0, F_path_tree_libraries_remote_s_length); + #endif // _di_f_path_tree_libraries_remote_s_ + + #ifndef _di_f_path_tree_libraries_services_s_ + const f_string_static_t f_path_tree_libraries_services_s = macro_f_string_static_t_initialize(F_path_tree_libraries_services_s, 0, F_path_tree_libraries_services_s_length); + #endif // _di_f_path_tree_libraries_services_s_ + + #ifndef _di_f_path_tree_libraries_toolchain_s_ + const f_string_static_t f_path_tree_libraries_toolchain_s = macro_f_string_static_t_initialize(F_path_tree_libraries_toolchain_s, 0, F_path_tree_libraries_toolchain_s_length); + #endif // _di_f_path_tree_libraries_toolchain_s_ + + #ifndef _di_f_path_tree_libraries_users_s_ + const f_string_static_t f_path_tree_libraries_users_s = macro_f_string_static_t_initialize(F_path_tree_libraries_users_s, 0, F_path_tree_libraries_users_s_length); + #endif // _di_f_path_tree_libraries_users_s_ + + #ifndef _di_f_path_tree_libraries_boot_s_ + const f_string_static_t f_path_tree_libraries_boot_s = macro_f_string_static_t_initialize(F_path_tree_libraries_boot_s, 0, F_path_tree_libraries_boot_s_length); + #endif // _di_f_path_tree_libraries_boot_s_ // Home Level. - const f_string_static_t f_path_tree_home_services_s = macro_f_string_static_t_initialize(F_path_tree_home_services_s, 0, F_path_tree_home_services_s_length); - const f_string_static_t f_path_tree_home_share_s = macro_f_string_static_t_initialize(F_path_tree_home_share_s, 0, F_path_tree_home_share_s_length); - const f_string_static_t f_path_tree_home_users_s = macro_f_string_static_t_initialize(F_path_tree_home_users_s, 0, F_path_tree_home_users_s_length); - const f_string_static_t f_path_tree_home_websites_s = macro_f_string_static_t_initialize(F_path_tree_home_websites_s, 0, F_path_tree_home_websites_s_length); + #ifndef _di_f_path_tree_home_services_s_ + const f_string_static_t f_path_tree_home_services_s = macro_f_string_static_t_initialize(F_path_tree_home_services_s, 0, F_path_tree_home_services_s_length); + #endif // _di_f_path_tree_home_services_s_ + + #ifndef _di_f_path_tree_home_share_s_ + const f_string_static_t f_path_tree_home_share_s = macro_f_string_static_t_initialize(F_path_tree_home_share_s, 0, F_path_tree_home_share_s_length); + #endif // _di_f_path_tree_home_share_s_ + + #ifndef _di_f_path_tree_home_users_s_ + const f_string_static_t f_path_tree_home_users_s = macro_f_string_static_t_initialize(F_path_tree_home_users_s, 0, F_path_tree_home_users_s_length); + #endif // _di_f_path_tree_home_users_s_ + + #ifndef _di_f_path_tree_home_websites_s_ + const f_string_static_t f_path_tree_home_websites_s = macro_f_string_static_t_initialize(F_path_tree_home_websites_s, 0, F_path_tree_home_websites_s_length); + #endif // _di_f_path_tree_home_websites_s_ // System Level. - const f_string_static_t f_path_tree_system_logs_s = macro_f_string_static_t_initialize(F_path_tree_system_logs_s, 0, F_path_tree_system_logs_s_length); - const f_string_static_t f_path_tree_system_settings_s = macro_f_string_static_t_initialize(F_path_tree_system_settings_s, 0, F_path_tree_system_settings_s_length); - const f_string_static_t f_path_tree_system_data_s = macro_f_string_static_t_initialize(F_path_tree_system_data_s, 0, F_path_tree_system_data_s_length); - const f_string_static_t f_path_tree_system_variables_s = macro_f_string_static_t_initialize(F_path_tree_system_variables_s, 0, F_path_tree_system_variables_s_length); + #ifndef _di_f_path_tree_system_logs_s_ + const f_string_static_t f_path_tree_system_logs_s = macro_f_string_static_t_initialize(F_path_tree_system_logs_s, 0, F_path_tree_system_logs_s_length); + #endif // _di_f_path_tree_system_logs_s_ + + #ifndef _di_f_path_tree_system_settings_s_ + const f_string_static_t f_path_tree_system_settings_s = macro_f_string_static_t_initialize(F_path_tree_system_settings_s, 0, F_path_tree_system_settings_s_length); + #endif // _di_f_path_tree_system_settings_s_ + + #ifndef _di_f_path_tree_system_data_s_ + const f_string_static_t f_path_tree_system_data_s = macro_f_string_static_t_initialize(F_path_tree_system_data_s, 0, F_path_tree_system_data_s_length); + #endif // _di_f_path_tree_system_data_s_ + + #ifndef _di_f_path_tree_system_variables_s_ + const f_string_static_t f_path_tree_system_variables_s = macro_f_string_static_t_initialize(F_path_tree_system_variables_s, 0, F_path_tree_system_variables_s_length); + #endif // _di_f_path_tree_system_variables_s_ // Temporary Level. - const f_string_static_t f_path_tree_temporary_public_s = macro_f_string_static_t_initialize(F_path_tree_temporary_public_s, 0, F_path_tree_temporary_public_s_length); - const f_string_static_t f_path_tree_temporary_services_s = macro_f_string_static_t_initialize(F_path_tree_temporary_services_s, 0, F_path_tree_temporary_services_s_length); - const f_string_static_t f_path_tree_temporary_users_s = macro_f_string_static_t_initialize(F_path_tree_temporary_users_s, 0, F_path_tree_temporary_users_s_length); - const f_string_static_t f_path_tree_temporary_variables_s = macro_f_string_static_t_initialize(F_path_tree_temporary_variables_s, 0, F_path_tree_temporary_variables_s_length); + #ifndef _di_f_path_tree_temporary_public_s_ + const f_string_static_t f_path_tree_temporary_public_s = macro_f_string_static_t_initialize(F_path_tree_temporary_public_s, 0, F_path_tree_temporary_public_s_length); + #endif // _di_f_path_tree_temporary_public_s_ + + #ifndef _di_f_path_tree_temporary_services_s_ + const f_string_static_t f_path_tree_temporary_services_s = macro_f_string_static_t_initialize(F_path_tree_temporary_services_s, 0, F_path_tree_temporary_services_s_length); + #endif // _di_f_path_tree_temporary_services_s_ + + #ifndef _di_f_path_tree_temporary_users_s_ + const f_string_static_t f_path_tree_temporary_users_s = macro_f_string_static_t_initialize(F_path_tree_temporary_users_s, 0, F_path_tree_temporary_users_s_length); + #endif // _di_f_path_tree_temporary_users_s_ + + #ifndef _di_f_path_tree_temporary_variables_s_ + const f_string_static_t f_path_tree_temporary_variables_s = macro_f_string_static_t_initialize(F_path_tree_temporary_variables_s, 0, F_path_tree_temporary_variables_s_length); + #endif // _di_f_path_tree_temporary_variables_s_ // Private User Directories. - const f_string_static_t f_path_user_downloads_s = macro_f_string_static_t_initialize(F_path_user_downloads_s, 0, F_path_user_downloads_s_length); - const f_string_static_t f_path_user_desktop_s = macro_f_string_static_t_initialize(F_path_user_desktop_s, 0, F_path_user_desktop_s_length); - const f_string_static_t f_path_user_private_s = macro_f_string_static_t_initialize(F_path_user_private_s, 0, F_path_user_private_s_length); - const f_string_static_t f_path_user_settings_s = macro_f_string_static_t_initialize(F_path_user_settings_s, 0, F_path_user_settings_s_length); - const f_string_static_t f_path_user_data_s = macro_f_string_static_t_initialize(F_path_user_data_s, 0, F_path_user_data_s_length); - const f_string_static_t f_path_user_temporary_s = macro_f_string_static_t_initialize(F_path_user_temporary_s, 0, F_path_user_temporary_s_length); - const f_string_static_t f_path_user_shared_s = macro_f_string_static_t_initialize(F_path_user_shared_s, 0, F_path_user_shared_s_length); + #ifndef _di_f_path_user_downloads_s_ + const f_string_static_t f_path_user_downloads_s = macro_f_string_static_t_initialize(F_path_user_downloads_s, 0, F_path_user_downloads_s_length); + #endif // _di_f_path_user_downloads_s_ + + #ifndef _di_f_path_user_desktop_s_ + const f_string_static_t f_path_user_desktop_s = macro_f_string_static_t_initialize(F_path_user_desktop_s, 0, F_path_user_desktop_s_length); + #endif // _di_f_path_user_desktop_s_ + + #ifndef _di_f_path_user_private_s_ + const f_string_static_t f_path_user_private_s = macro_f_string_static_t_initialize(F_path_user_private_s, 0, F_path_user_private_s_length); + #endif // _di_f_path_user_private_s_ + + #ifndef _di_f_path_user_settings_s_ + const f_string_static_t f_path_user_settings_s = macro_f_string_static_t_initialize(F_path_user_settings_s, 0, F_path_user_settings_s_length); + #endif // _di_f_path_user_settings_s_ + + #ifndef _di_f_path_user_data_s_ + const f_string_static_t f_path_user_data_s = macro_f_string_static_t_initialize(F_path_user_data_s, 0, F_path_user_data_s_length); + #endif // _di_f_path_user_data_s_ + + #ifndef _di_f_path_user_temporary_s_ + const f_string_static_t f_path_user_temporary_s = macro_f_string_static_t_initialize(F_path_user_temporary_s, 0, F_path_user_temporary_s_length); + #endif // _di_f_path_user_temporary_s_ + + #ifndef _di_f_path_user_shared_s_ + const f_string_static_t f_path_user_shared_s = macro_f_string_static_t_initialize(F_path_user_shared_s, 0, F_path_user_shared_s_length); + #endif // _di_f_path_user_shared_s_ #endif // defined(_di_f_path_tree_s_) && !defined(_di_f_path_tree_hierarchy_standard_d_) && !defined(_di_f_path_tree_kevux_standard_d_) #ifdef __cplusplus diff --git a/level_0/f_path/c/path/common.h b/level_0/f_path/c/path/common.h index f38de54..238f9a7 100644 --- a/level_0/f_path/c/path/common.h +++ b/level_0/f_path/c/path/common.h @@ -61,16 +61,37 @@ extern "C" { #define F_path_present_working_s_length 3 #define F_path_present_working_old_s_length 6 - extern const f_string_static_t f_path_separator_s; - extern const f_string_static_t f_path_separator_current_s; - extern const f_string_static_t f_path_separator_variable_s; + #ifndef _di_f_path_separator_s_ + extern const f_string_static_t f_path_separator_s; + #endif // _di_f_path_separator_s_ - extern const f_string_static_t f_path_extension_separator_s; + #ifndef _di_f_path_separator_current_s_ + extern const f_string_static_t f_path_separator_current_s; + #endif // _di_f_path_separator_current_s_ - extern const f_string_static_t f_path_environment_s; - extern const f_string_static_t f_path_home_wildcard_s; - extern const f_string_static_t f_path_present_working_s; - extern const f_string_static_t f_path_present_working_old_s; + #ifndef _di_f_path_separator_variable_s_ + extern const f_string_static_t f_path_separator_variable_s; + #endif // _di_f_path_separator_variable_s_ + + #ifndef _di_f_path_extension_separator_s_ + extern const f_string_static_t f_path_extension_separator_s; + #endif // _di_f_path_extension_separator_s_ + + #ifndef _di_f_path_environment_s_ + extern const f_string_static_t f_path_environment_s; + #endif // _di_f_path_environment_s_ + + #ifndef _di_f_path_home_wildcard_s_ + extern const f_string_static_t f_path_home_wildcard_s; + #endif // _di_f_path_home_wildcard_s_ + + #ifndef _di_f_path_present_working_s_ + extern const f_string_static_t f_path_present_working_s; + #endif // _di_f_path_present_working_s_ + + #ifndef _di_f_path_present_working_old_s_ + extern const f_string_static_t f_path_present_working_old_s; + #endif // _di_f_path_present_working_old_s_ #endif // _di_f_path_s_ /** @@ -330,67 +351,200 @@ extern "C" { #if defined(_di_f_path_tree_s_) && !defined(_di_f_path_tree_hierarchy_standard_d_) && !defined(_di_f_path_tree_kevux_standard_d_) // KFS Root Level. - extern const f_string_static_t f_path_tree_devices_s; - extern const f_string_static_t f_path_tree_external_s; - extern const f_string_static_t f_path_tree_libraries_s; - extern const f_string_static_t f_path_tree_programs_s; - extern const f_string_static_t f_path_tree_temporary_s; - extern const f_string_static_t f_path_tree_home_s; - extern const f_string_static_t f_path_tree_run_s; - extern const f_string_static_t f_path_tree_binary_s; + #ifndef _di_f_path_tree_devices_s_ + extern const f_string_static_t f_path_tree_devices_s; + #endif // _di_f_path_tree_devices_s_ + + #ifndef _di_f_path_tree_external_s_ + extern const f_string_static_t f_path_tree_external_s; + #endif // _di_f_path_tree_external_s_ + + #ifndef _di_f_path_tree_libraries_s_ + extern const f_string_static_t f_path_tree_libraries_s; + #endif // _di_f_path_tree_libraries_s_ + + #ifndef _di_f_path_tree_programs_s_ + extern const f_string_static_t f_path_tree_programs_s; + #endif // _di_f_path_tree_programs_s_ + + #ifndef _di_f_path_tree_temporary_s_ + extern const f_string_static_t f_path_tree_temporary_s; + #endif // _di_f_path_tree_temporary_s_ + + #ifndef _di_f_path_tree_home_s_ + extern const f_string_static_t f_path_tree_home_s; + #endif // _di_f_path_tree_home_s_ + + #ifndef _di_f_path_tree_run_s_ + extern const f_string_static_t f_path_tree_run_s; + #endif // _di_f_path_tree_run_s_ + + #ifndef _di_f_path_tree_binary_s_ + extern const f_string_static_t f_path_tree_binary_s; + #endif // _di_f_path_tree_binary_s_ // FHS Root Level. - extern const f_string_static_t f_path_tree_boot_s; - extern const f_string_static_t f_path_tree_hardware_s; - extern const f_string_static_t f_path_tree_processes_s; - extern const f_string_static_t f_path_tree_system_s; + #ifndef _di_f_path_tree_boot_s_ + extern const f_string_static_t f_path_tree_boot_s; + #endif // _di_f_path_tree_boot_s_ + + #ifndef _di_f_path_tree_hardware_s_ + extern const f_string_static_t f_path_tree_hardware_s; + #endif // _di_f_path_tree_hardware_s_ + + #ifndef _di_f_path_tree_processes_s_ + extern const f_string_static_t f_path_tree_processes_s; + #endif // _di_f_path_tree_processes_s_ + + #ifndef _di_f_path_tree_system_s_ + extern const f_string_static_t f_path_tree_system_s; + #endif // _di_f_path_tree_system_s_ // Program Level. - extern const f_string_static_t f_path_tree_programs_public_s; - extern const f_string_static_t f_path_tree_programs_system_s; - extern const f_string_static_t f_path_tree_programs_remote_s; - extern const f_string_static_t f_path_tree_programs_services_s; - extern const f_string_static_t f_path_tree_programs_toolchain_s; - extern const f_string_static_t f_path_tree_programs_users_s; - extern const f_string_static_t f_path_tree_programs_susers_s; - extern const f_string_static_t f_path_tree_programs_boot_s; - extern const f_string_static_t f_path_tree_programs_sboot_s; + #ifndef _di_f_path_tree_programs_public_s_ + extern const f_string_static_t f_path_tree_programs_public_s; + #endif // _di_f_path_tree_programs_public_s_ + + #ifndef _di_f_path_tree_programs_system_s_ + extern const f_string_static_t f_path_tree_programs_system_s; + #endif // _di_f_path_tree_programs_system_s_ + + #ifndef _di_f_path_tree_programs_remote_s_ + extern const f_string_static_t f_path_tree_programs_remote_s; + #endif // _di_f_path_tree_programs_remote_s_ + + #ifndef _di_f_path_tree_programs_services_s_ + extern const f_string_static_t f_path_tree_programs_services_s; + #endif // _di_f_path_tree_programs_services_s_ + + #ifndef _di_f_path_tree_programs_toolchain_s_ + extern const f_string_static_t f_path_tree_programs_toolchain_s; + #endif // _di_f_path_tree_programs_toolchain_s_ + + #ifndef _di_f_path_tree_programs_users_s_ + extern const f_string_static_t f_path_tree_programs_users_s; + #endif // _di_f_path_tree_programs_users_s_ + + #ifndef _di_f_path_tree_programs_susers_s_ + extern const f_string_static_t f_path_tree_programs_susers_s; + #endif // _di_f_path_tree_programs_susers_s_ + + #ifndef _di_f_path_tree_programs_boot_s_ + extern const f_string_static_t f_path_tree_programs_boot_s; + #endif // _di_f_path_tree_programs_boot_s_ + + #ifndef _di_f_path_tree_programs_sboot_s_ + extern const f_string_static_t f_path_tree_programs_sboot_s; + #endif // _di_f_path_tree_programs_sboot_s_ // Library Level. - extern const f_string_static_t f_path_tree_libraries_public_s; - extern const f_string_static_t f_path_tree_libraries_system_s; - extern const f_string_static_t f_path_tree_libraries_remote_s; - extern const f_string_static_t f_path_tree_libraries_services_s; - extern const f_string_static_t f_path_tree_libraries_toolchain_s; - extern const f_string_static_t f_path_tree_libraries_users_s; - extern const f_string_static_t f_path_tree_libraries_boot_s; + #ifndef _di_f_path_tree_libraries_public_s_ + extern const f_string_static_t f_path_tree_libraries_public_s; + #endif // _di_f_path_tree_libraries_public_s_ + + #ifndef _di_f_path_tree_libraries_system_s_ + extern const f_string_static_t f_path_tree_libraries_system_s; + #endif // _di_f_path_tree_libraries_system_s_ + + #ifndef _di_f_path_tree_libraries_remote_s_ + extern const f_string_static_t f_path_tree_libraries_remote_s; + #endif // _di_f_path_tree_libraries_remote_s_ + + #ifndef _di_f_path_tree_libraries_services_s_ + extern const f_string_static_t f_path_tree_libraries_services_s; + #endif // _di_f_path_tree_libraries_services_s_ + + #ifndef _di_f_path_tree_libraries_toolchain_s_ + extern const f_string_static_t f_path_tree_libraries_toolchain_s; + #endif // _di_f_path_tree_libraries_toolchain_s_ + + #ifndef _di_f_path_tree_libraries_users_s_ + extern const f_string_static_t f_path_tree_libraries_users_s; + #endif // _di_f_path_tree_libraries_users_s_ + + #ifndef _di_f_path_tree_libraries_boot_s_ + extern const f_string_static_t f_path_tree_libraries_boot_s; + #endif // _di_f_path_tree_libraries_boot_s_ // Home Level. - extern const f_string_static_t f_path_tree_home_services_s; - extern const f_string_static_t f_path_tree_home_share_s; - extern const f_string_static_t f_path_tree_home_users_s; - extern const f_string_static_t f_path_tree_home_websites_s; - - // system level. - extern const f_string_static_t f_path_tree_system_logs_s; - extern const f_string_static_t f_path_tree_system_settings_s; - extern const f_string_static_t f_path_tree_system_data_s; - extern const f_string_static_t f_path_tree_system_variables_s; - - // temporary level. - extern const f_string_static_t f_path_tree_temporary_public_s; - extern const f_string_static_t f_path_tree_temporary_services_s; - extern const f_string_static_t f_path_tree_temporary_users_s; - extern const f_string_static_t f_path_tree_temporary_variables_s; - - // Private user directories. - extern const f_string_static_t f_path_user_downloads_s; - extern const f_string_static_t f_path_user_desktop_s; - extern const f_string_static_t f_path_user_private_s; - extern const f_string_static_t f_path_user_settings_s; - extern const f_string_static_t f_path_user_data_s; - extern const f_string_static_t f_path_user_temporary_s; - extern const f_string_static_t f_path_user_shared_s; + #ifndef _di_f_path_tree_home_services_s_ + extern const f_string_static_t f_path_tree_home_services_s; + #endif // _di_f_path_tree_home_services_s_ + + #ifndef _di_f_path_tree_home_share_s_ + extern const f_string_static_t f_path_tree_home_share_s; + #endif // _di_f_path_tree_home_share_s_ + + #ifndef _di_f_path_tree_home_users_s_ + extern const f_string_static_t f_path_tree_home_users_s; + #endif // _di_f_path_tree_home_users_s_ + + #ifndef _di_f_path_tree_home_websites_s_ + extern const f_string_static_t f_path_tree_home_websites_s; + #endif // _di_f_path_tree_home_websites_s_ + + // System Level. + #ifndef _di_f_path_tree_system_logs_s_ + extern const f_string_static_t f_path_tree_system_logs_s; + #endif // _di_f_path_tree_system_logs_s_ + + #ifndef _di_f_path_tree_system_settings_s_ + extern const f_string_static_t f_path_tree_system_settings_s; + #endif // _di_f_path_tree_system_settings_s_ + + #ifndef _di_f_path_tree_system_data_s_ + extern const f_string_static_t f_path_tree_system_data_s; + #endif // _di_f_path_tree_system_data_s_ + + #ifndef _di_f_path_tree_system_variables_s_ + extern const f_string_static_t f_path_tree_system_variables_s; + #endif // _di_f_path_tree_system_variables_s_ + + // Temporary Level. + #ifndef _di_f_path_tree_temporary_public_s_ + extern const f_string_static_t f_path_tree_temporary_public_s; + #endif // _di_f_path_tree_temporary_public_s_ + + #ifndef _di_f_path_tree_temporary_services_s_ + extern const f_string_static_t f_path_tree_temporary_services_s; + #endif // _di_f_path_tree_temporary_services_s_ + + #ifndef _di_f_path_tree_temporary_users_s_ + extern const f_string_static_t f_path_tree_temporary_users_s; + #endif // _di_f_path_tree_temporary_users_s_ + + #ifndef _di_f_path_tree_temporary_variables_s_ + extern const f_string_static_t f_path_tree_temporary_variables_s; + #endif // _di_f_path_tree_temporary_variables_s_ + + // Private User Directories. + #ifndef _di_f_path_user_downloads_s_ + extern const f_string_static_t f_path_user_downloads_s; + #endif // _di_f_path_user_downloads_s_ + + #ifndef _di_f_path_user_desktop_s_ + extern const f_string_static_t f_path_user_desktop_s; + #endif // _di_f_path_user_desktop_s_ + + #ifndef _di_f_path_user_private_s_ + extern const f_string_static_t f_path_user_private_s; + #endif // _di_f_path_user_private_s_ + + #ifndef _di_f_path_user_settings_s_ + extern const f_string_static_t f_path_user_settings_s; + #endif // _di_f_path_user_settings_s_ + + #ifndef _di_f_path_user_data_s_ + extern const f_string_static_t f_path_user_data_s; + #endif // _di_f_path_user_data_s_ + + #ifndef _di_f_path_user_temporary_s_ + extern const f_string_static_t f_path_user_temporary_s; + #endif // _di_f_path_user_temporary_s_ + + #ifndef _di_f_path_user_shared_s_ + extern const f_string_static_t f_path_user_shared_s; + #endif // _di_f_path_user_shared_s_ #endif // defined(_di_f_path_tree_s_) && !defined(_di_f_path_tree_hierarchy_standard_d_) && !defined(_di_f_path_tree_kevux_standard_d_) #ifdef __cplusplus diff --git a/level_0/f_print/c/print/common.c b/level_0/f_print/c/print/common.c index e9ad87e..de2456f 100644 --- a/level_0/f_print/c/print/common.c +++ b/level_0/f_print/c/print/common.c @@ -5,42 +5,149 @@ extern "C" { #endif #ifndef _di_f_print_sequence_s_ - const f_string_static_t f_print_sequence_acknowledge_s = macro_f_string_static_t_initialize(F_print_sequence_acknowledge_s, 0, F_print_sequence_acknowledge_s_length); - const f_string_static_t f_print_sequence_acknowledge_negative_s = macro_f_string_static_t_initialize(F_print_sequence_acknowledge_negative_s, 0, F_print_sequence_acknowledge_negative_s_length); - const f_string_static_t f_print_sequence_backspace_s = macro_f_string_static_t_initialize(F_print_sequence_backspace_s, 0, F_print_sequence_backspace_s_length); - const f_string_static_t f_print_sequence_bell_s = macro_f_string_static_t_initialize(F_print_sequence_bell_s, 0, F_print_sequence_bell_s_length); - const f_string_static_t f_print_sequence_cancel_s = macro_f_string_static_t_initialize(F_print_sequence_cancel_s, 0, F_print_sequence_cancel_s_length); - const f_string_static_t f_print_sequence_carriage_return_s = macro_f_string_static_t_initialize(F_print_sequence_carriage_return_s, 0, F_print_sequence_carriage_return_s_length); - const f_string_static_t f_print_sequence_data_link_escape_s = macro_f_string_static_t_initialize(F_print_sequence_data_link_escape_s, 0, F_print_sequence_data_link_escape_s_length); - const f_string_static_t f_print_sequence_delete_s = macro_f_string_static_t_initialize(F_print_sequence_delete_s, 0, F_print_sequence_delete_s_length); - const f_string_static_t f_print_sequence_device_control_1_s = macro_f_string_static_t_initialize(F_print_sequence_device_control_1_s, 0, F_print_sequence_device_control_1_s_length); - const f_string_static_t f_print_sequence_device_control_2_s = macro_f_string_static_t_initialize(F_print_sequence_device_control_2_s, 0, F_print_sequence_device_control_2_s_length); - const f_string_static_t f_print_sequence_device_control_3_s = macro_f_string_static_t_initialize(F_print_sequence_device_control_3_s, 0, F_print_sequence_device_control_3_s_length); - const f_string_static_t f_print_sequence_device_control_4_s = macro_f_string_static_t_initialize(F_print_sequence_device_control_4_s, 0, F_print_sequence_device_control_4_s_length); - const f_string_static_t f_print_sequence_end_of_medium_s = macro_f_string_static_t_initialize(F_print_sequence_end_of_medium_s, 0, F_print_sequence_end_of_medium_s_length); - const f_string_static_t f_print_sequence_end_of_text_s = macro_f_string_static_t_initialize(F_print_sequence_end_of_text_s, 0, F_print_sequence_end_of_text_s_length); - const f_string_static_t f_print_sequence_end_of_transmission_s = macro_f_string_static_t_initialize(F_print_sequence_end_of_transmission_s, 0, F_print_sequence_end_of_transmission_s_length); - const f_string_static_t f_print_sequence_end_of_transmission_block_s = macro_f_string_static_t_initialize(F_print_sequence_end_of_transmission_block_s, 0, F_print_sequence_end_of_transmission_block_s_length); - const f_string_static_t f_print_sequence_enquiry_s = macro_f_string_static_t_initialize(F_print_sequence_enquiry_s, 0, F_print_sequence_enquiry_s_length); - const f_string_static_t f_print_sequence_escape_s = macro_f_string_static_t_initialize(F_print_sequence_escape_s, 0, F_print_sequence_escape_s_length); - const f_string_static_t f_print_sequence_form_feed_s = macro_f_string_static_t_initialize(F_print_sequence_form_feed_s, 0, F_print_sequence_form_feed_s_length); - const f_string_static_t f_print_sequence_line_feed_s = macro_f_string_static_t_initialize(F_print_sequence_line_feed_s, 0, F_print_sequence_line_feed_s_length); - const f_string_static_t f_print_sequence_line_new_s = macro_f_string_static_t_initialize(F_print_sequence_line_new_s, 0, F_print_sequence_line_new_s_length); - const f_string_static_t f_print_sequence_null_s = macro_f_string_static_t_initialize(F_print_sequence_null_s, 0, F_print_sequence_null_s_length); - const f_string_static_t f_print_sequence_separator_file_s = macro_f_string_static_t_initialize(F_print_sequence_separator_file_s, 0, F_print_sequence_separator_file_s_length); - const f_string_static_t f_print_sequence_separator_group_s = macro_f_string_static_t_initialize(F_print_sequence_separator_group_s, 0, F_print_sequence_separator_group_s_length); - const f_string_static_t f_print_sequence_separator_record_s = macro_f_string_static_t_initialize(F_print_sequence_separator_record_s, 0, F_print_sequence_separator_record_s_length); - const f_string_static_t f_print_sequence_separator_unit_s = macro_f_string_static_t_initialize(F_print_sequence_separator_unit_s, 0, F_print_sequence_separator_unit_s_length); - const f_string_static_t f_print_sequence_shift_in_s = macro_f_string_static_t_initialize(F_print_sequence_shift_in_s, 0, F_print_sequence_shift_in_s_length); - const f_string_static_t f_print_sequence_shift_out_s = macro_f_string_static_t_initialize(F_print_sequence_shift_out_s, 0, F_print_sequence_shift_out_s_length); - const f_string_static_t f_print_sequence_space_s = macro_f_string_static_t_initialize(F_print_sequence_space_s, 0, F_print_sequence_space_s_length); - const f_string_static_t f_print_sequence_start_of_header_s = macro_f_string_static_t_initialize(F_print_sequence_start_of_header_s, 0, F_print_sequence_start_of_header_s_length); - const f_string_static_t f_print_sequence_start_of_text_s = macro_f_string_static_t_initialize(F_print_sequence_start_of_text_s, 0, F_print_sequence_start_of_text_s_length); - const f_string_static_t f_print_sequence_substitute_s = macro_f_string_static_t_initialize(F_print_sequence_substitute_s, 0, F_print_sequence_substitute_s_length); - const f_string_static_t f_print_sequence_synchronous_idle_s = macro_f_string_static_t_initialize(F_print_sequence_synchronous_idle_s, 0, F_print_sequence_synchronous_idle_s_length); - const f_string_static_t f_print_sequence_tab_s = macro_f_string_static_t_initialize(F_print_sequence_tab_s, 0, F_print_sequence_tab_s_length); - const f_string_static_t f_print_sequence_tab_vertical_s = macro_f_string_static_t_initialize(F_print_sequence_tab_vertical_s, 0, F_print_sequence_tab_vertical_s_length); - const f_string_static_t f_print_sequence_unknown_s = macro_f_string_static_t_initialize(F_print_sequence_unknown_s, 0, F_print_sequence_unknown_s_length); + #ifndef _di_f_print_sequence_acknowledge_s_ + const f_string_static_t f_print_sequence_acknowledge_s = macro_f_string_static_t_initialize(F_print_sequence_acknowledge_s, 0, F_print_sequence_acknowledge_s_length); + #endif // _di_f_print_sequence_acknowledge_s_ + + #ifndef _di_f_print_sequence_acknowledge_negative_s_ + const f_string_static_t f_print_sequence_acknowledge_negative_s = macro_f_string_static_t_initialize(F_print_sequence_acknowledge_negative_s, 0, F_print_sequence_acknowledge_negative_s_length); + #endif // _di_f_print_sequence_acknowledge_negative_s_ + + #ifndef _di_f_print_sequence_backspace_s_ + const f_string_static_t f_print_sequence_backspace_s = macro_f_string_static_t_initialize(F_print_sequence_backspace_s, 0, F_print_sequence_backspace_s_length); + #endif // _di_f_print_sequence_backspace_s_ + + #ifndef _di_f_print_sequence_bell_s_ + const f_string_static_t f_print_sequence_bell_s = macro_f_string_static_t_initialize(F_print_sequence_bell_s, 0, F_print_sequence_bell_s_length); + #endif // _di_f_print_sequence_bell_s_ + + #ifndef _di_f_print_sequence_cancel_s_ + const f_string_static_t f_print_sequence_cancel_s = macro_f_string_static_t_initialize(F_print_sequence_cancel_s, 0, F_print_sequence_cancel_s_length); + #endif // _di_f_print_sequence_cancel_s_ + + #ifndef _di_f_print_sequence_carriage_return_s_ + const f_string_static_t f_print_sequence_carriage_return_s = macro_f_string_static_t_initialize(F_print_sequence_carriage_return_s, 0, F_print_sequence_carriage_return_s_length); + #endif // _di_f_print_sequence_carriage_return_s_ + + #ifndef _di_f_print_sequence_data_link_escape_s_ + const f_string_static_t f_print_sequence_data_link_escape_s = macro_f_string_static_t_initialize(F_print_sequence_data_link_escape_s, 0, F_print_sequence_data_link_escape_s_length); + #endif // _di_f_print_sequence_data_link_escape_s_ + + #ifndef _di_f_print_sequence_delete_s_ + const f_string_static_t f_print_sequence_delete_s = macro_f_string_static_t_initialize(F_print_sequence_delete_s, 0, F_print_sequence_delete_s_length); + #endif // _di_f_print_sequence_delete_s_ + + #ifndef _di_f_print_sequence_device_control_1_s_ + const f_string_static_t f_print_sequence_device_control_1_s = macro_f_string_static_t_initialize(F_print_sequence_device_control_1_s, 0, F_print_sequence_device_control_1_s_length); + #endif // _di_f_print_sequence_device_control_1_s_ + + #ifndef _di_f_print_sequence_device_control_2_s_ + const f_string_static_t f_print_sequence_device_control_2_s = macro_f_string_static_t_initialize(F_print_sequence_device_control_2_s, 0, F_print_sequence_device_control_2_s_length); + #endif // _di_f_print_sequence_device_control_2_s_ + + #ifndef _di_f_print_sequence_device_control_3_s_ + const f_string_static_t f_print_sequence_device_control_3_s = macro_f_string_static_t_initialize(F_print_sequence_device_control_3_s, 0, F_print_sequence_device_control_3_s_length); + #endif // _di_f_print_sequence_device_control_3_s_ + + #ifndef _di_f_print_sequence_device_control_4_s_ + const f_string_static_t f_print_sequence_device_control_4_s = macro_f_string_static_t_initialize(F_print_sequence_device_control_4_s, 0, F_print_sequence_device_control_4_s_length); + #endif // _di_f_print_sequence_device_control_4_s_ + + #ifndef _di_f_print_sequence_end_of_medium_s_ + const f_string_static_t f_print_sequence_end_of_medium_s = macro_f_string_static_t_initialize(F_print_sequence_end_of_medium_s, 0, F_print_sequence_end_of_medium_s_length); + #endif // _di_f_print_sequence_end_of_medium_s_ + + #ifndef _di_f_print_sequence_end_of_text_s_ + const f_string_static_t f_print_sequence_end_of_text_s = macro_f_string_static_t_initialize(F_print_sequence_end_of_text_s, 0, F_print_sequence_end_of_text_s_length); + #endif // _di_f_print_sequence_end_of_text_s_ + + #ifndef _di_f_print_sequence_end_of_transmission_s_ + const f_string_static_t f_print_sequence_end_of_transmission_s = macro_f_string_static_t_initialize(F_print_sequence_end_of_transmission_s, 0, F_print_sequence_end_of_transmission_s_length); + #endif // _di_f_print_sequence_end_of_transmission_s_ + + #ifndef _di_f_print_sequence_end_of_transmission_block_s_ + const f_string_static_t f_print_sequence_end_of_transmission_block_s = macro_f_string_static_t_initialize(F_print_sequence_end_of_transmission_block_s, 0, F_print_sequence_end_of_transmission_block_s_length); + #endif // _di_f_print_sequence_end_of_transmission_block_s_ + + #ifndef _di_f_print_sequence_enquiry_s_ + const f_string_static_t f_print_sequence_enquiry_s = macro_f_string_static_t_initialize(F_print_sequence_enquiry_s, 0, F_print_sequence_enquiry_s_length); + #endif // _di_f_print_sequence_enquiry_s_ + + #ifndef _di_f_print_sequence_escape_s_ + const f_string_static_t f_print_sequence_escape_s = macro_f_string_static_t_initialize(F_print_sequence_escape_s, 0, F_print_sequence_escape_s_length); + #endif // _di_f_print_sequence_escape_s_ + + #ifndef _di_f_print_sequence_form_feed_s_ + const f_string_static_t f_print_sequence_form_feed_s = macro_f_string_static_t_initialize(F_print_sequence_form_feed_s, 0, F_print_sequence_form_feed_s_length); + #endif // _di_f_print_sequence_form_feed_s_ + + #ifndef _di_f_print_sequence_line_feed_s_ + const f_string_static_t f_print_sequence_line_feed_s = macro_f_string_static_t_initialize(F_print_sequence_line_feed_s, 0, F_print_sequence_line_feed_s_length); + #endif // _di_f_print_sequence_line_feed_s_ + + #ifndef _di_f_print_sequence_line_new_s_ + const f_string_static_t f_print_sequence_line_new_s = macro_f_string_static_t_initialize(F_print_sequence_line_new_s, 0, F_print_sequence_line_new_s_length); + #endif // _di_f_print_sequence_line_new_s_ + + #ifndef _di_f_print_sequence_null_s_ + const f_string_static_t f_print_sequence_null_s = macro_f_string_static_t_initialize(F_print_sequence_null_s, 0, F_print_sequence_null_s_length); + #endif // _di_f_print_sequence_null_s_ + + #ifndef _di_f_print_sequence_separator_file_s_ + const f_string_static_t f_print_sequence_separator_file_s = macro_f_string_static_t_initialize(F_print_sequence_separator_file_s, 0, F_print_sequence_separator_file_s_length); + #endif // _di_f_print_sequence_separator_file_s_ + + #ifndef _di_f_print_sequence_separator_group_s_ + const f_string_static_t f_print_sequence_separator_group_s = macro_f_string_static_t_initialize(F_print_sequence_separator_group_s, 0, F_print_sequence_separator_group_s_length); + #endif // _di_f_print_sequence_separator_group_s_ + + #ifndef _di_f_print_sequence_separator_record_s_ + const f_string_static_t f_print_sequence_separator_record_s = macro_f_string_static_t_initialize(F_print_sequence_separator_record_s, 0, F_print_sequence_separator_record_s_length); + #endif // _di_f_print_sequence_separator_record_s_ + + #ifndef _di_f_print_sequence_separator_unit_s_ + const f_string_static_t f_print_sequence_separator_unit_s = macro_f_string_static_t_initialize(F_print_sequence_separator_unit_s, 0, F_print_sequence_separator_unit_s_length); + #endif // _di_f_print_sequence_separator_unit_s_ + + #ifndef _di_f_print_sequence_shift_in_s_ + const f_string_static_t f_print_sequence_shift_in_s = macro_f_string_static_t_initialize(F_print_sequence_shift_in_s, 0, F_print_sequence_shift_in_s_length); + #endif // _di_f_print_sequence_shift_in_s_ + + #ifndef _di_f_print_sequence_shift_out_s_ + const f_string_static_t f_print_sequence_shift_out_s = macro_f_string_static_t_initialize(F_print_sequence_shift_out_s, 0, F_print_sequence_shift_out_s_length); + #endif // _di_f_print_sequence_shift_out_s_ + + #ifndef _di_f_print_sequence_space_s_ + const f_string_static_t f_print_sequence_space_s = macro_f_string_static_t_initialize(F_print_sequence_space_s, 0, F_print_sequence_space_s_length); + #endif // _di_f_print_sequence_space_s_ + + #ifndef _di_f_print_sequence_start_of_header_s_ + const f_string_static_t f_print_sequence_start_of_header_s = macro_f_string_static_t_initialize(F_print_sequence_start_of_header_s, 0, F_print_sequence_start_of_header_s_length); + #endif // _di_f_print_sequence_start_of_header_s_ + + #ifndef _di_f_print_sequence_start_of_text_s_ + const f_string_static_t f_print_sequence_start_of_text_s = macro_f_string_static_t_initialize(F_print_sequence_start_of_text_s, 0, F_print_sequence_start_of_text_s_length); + #endif // _di_f_print_sequence_start_of_text_s_ + + #ifndef _di_f_print_sequence_substitute_s_ + const f_string_static_t f_print_sequence_substitute_s = macro_f_string_static_t_initialize(F_print_sequence_substitute_s, 0, F_print_sequence_substitute_s_length); + #endif // _di_f_print_sequence_substitute_s_ + + #ifndef _di_f_print_sequence_synchronous_idle_s_ + const f_string_static_t f_print_sequence_synchronous_idle_s = macro_f_string_static_t_initialize(F_print_sequence_synchronous_idle_s, 0, F_print_sequence_synchronous_idle_s_length); + #endif // _di_f_print_sequence_synchronous_idle_s_ + + #ifndef _di_f_print_sequence_tab_s_ + const f_string_static_t f_print_sequence_tab_s = macro_f_string_static_t_initialize(F_print_sequence_tab_s, 0, F_print_sequence_tab_s_length); + #endif // _di_f_print_sequence_tab_s_ + + #ifndef _di_f_print_sequence_tab_vertical_s_ + const f_string_static_t f_print_sequence_tab_vertical_s = macro_f_string_static_t_initialize(F_print_sequence_tab_vertical_s, 0, F_print_sequence_tab_vertical_s_length); + #endif // _di_f_print_sequence_tab_vertical_s_ + + #ifndef _di_f_print_sequence_unknown_s_ + const f_string_static_t f_print_sequence_unknown_s = macro_f_string_static_t_initialize(F_print_sequence_unknown_s, 0, F_print_sequence_unknown_s_length); + #endif // _di_f_print_sequence_unknown_s_ #endif // _di_f_print_sequence_s_ #ifndef _di_f_print_sequences_set_control_s_ diff --git a/level_0/f_print/c/print/common.h b/level_0/f_print/c/print/common.h index c026f7d..84b42b5 100644 --- a/level_0/f_print/c/print/common.h +++ b/level_0/f_print/c/print/common.h @@ -117,42 +117,149 @@ extern "C" { #define F_print_sequence_tab_vertical_s_length 3 #define F_print_sequence_unknown_s_length 3 - extern const f_string_static_t f_print_sequence_acknowledge_s; - extern const f_string_static_t f_print_sequence_acknowledge_negative_s; - extern const f_string_static_t f_print_sequence_backspace_s; - extern const f_string_static_t f_print_sequence_bell_s; - extern const f_string_static_t f_print_sequence_cancel_s; - extern const f_string_static_t f_print_sequence_carriage_return_s; - extern const f_string_static_t f_print_sequence_data_link_escape_s; - extern const f_string_static_t f_print_sequence_delete_s; - extern const f_string_static_t f_print_sequence_device_control_1_s; - extern const f_string_static_t f_print_sequence_device_control_2_s; - extern const f_string_static_t f_print_sequence_device_control_3_s; - extern const f_string_static_t f_print_sequence_device_control_4_s; - extern const f_string_static_t f_print_sequence_end_of_medium_s; - extern const f_string_static_t f_print_sequence_end_of_text_s; - extern const f_string_static_t f_print_sequence_end_of_transmission_s; - extern const f_string_static_t f_print_sequence_end_of_transmission_block_s; - extern const f_string_static_t f_print_sequence_escape_s; - extern const f_string_static_t f_print_sequence_enquiry_s; - extern const f_string_static_t f_print_sequence_form_feed_s; - extern const f_string_static_t f_print_sequence_line_feed_s; - extern const f_string_static_t f_print_sequence_line_new_s; - extern const f_string_static_t f_print_sequence_null_s; - extern const f_string_static_t f_print_sequence_separator_file_s; - extern const f_string_static_t f_print_sequence_separator_group_s; - extern const f_string_static_t f_print_sequence_separator_record_s; - extern const f_string_static_t f_print_sequence_separator_unit_s; - extern const f_string_static_t f_print_sequence_shift_in_s; - extern const f_string_static_t f_print_sequence_shift_out_s; - extern const f_string_static_t f_print_sequence_space_s; - extern const f_string_static_t f_print_sequence_start_of_header_s; - extern const f_string_static_t f_print_sequence_start_of_text_s; - extern const f_string_static_t f_print_sequence_substitute_s; - extern const f_string_static_t f_print_sequence_synchronous_idle_s; - extern const f_string_static_t f_print_sequence_tab_s; - extern const f_string_static_t f_print_sequence_tab_vertical_s; - extern const f_string_static_t f_print_sequence_unknown_s; + #ifndef _di_f_print_sequence_acknowledge_s_ + extern const f_string_static_t f_print_sequence_acknowledge_s; + #endif // _di_f_print_sequence_acknowledge_s_ + + #ifndef _di_f_print_sequence_acknowledge_negative_s_ + extern const f_string_static_t f_print_sequence_acknowledge_negative_s; + #endif // _di_f_print_sequence_acknowledge_negative_s_ + + #ifndef _di_f_print_sequence_backspace_s_ + extern const f_string_static_t f_print_sequence_backspace_s; + #endif // _di_f_print_sequence_backspace_s_ + + #ifndef _di_f_print_sequence_bell_s_ + extern const f_string_static_t f_print_sequence_bell_s; + #endif // _di_f_print_sequence_bell_s_ + + #ifndef _di_f_print_sequence_cancel_s_ + extern const f_string_static_t f_print_sequence_cancel_s; + #endif // _di_f_print_sequence_cancel_s_ + + #ifndef _di_f_print_sequence_carriage_return_s_ + extern const f_string_static_t f_print_sequence_carriage_return_s; + #endif // _di_f_print_sequence_carriage_return_s_ + + #ifndef _di_f_print_sequence_data_link_escape_s_ + extern const f_string_static_t f_print_sequence_data_link_escape_s; + #endif // _di_f_print_sequence_data_link_escape_s_ + + #ifndef _di_f_print_sequence_delete_s_ + extern const f_string_static_t f_print_sequence_delete_s; + #endif // _di_f_print_sequence_delete_s_ + + #ifndef _di_f_print_sequence_device_control_1_s_ + extern const f_string_static_t f_print_sequence_device_control_1_s; + #endif // _di_f_print_sequence_device_control_1_s_ + + #ifndef _di_f_print_sequence_device_control_2_s_ + extern const f_string_static_t f_print_sequence_device_control_2_s; + #endif // _di_f_print_sequence_device_control_2_s_ + + #ifndef _di_f_print_sequence_device_control_3_s_ + extern const f_string_static_t f_print_sequence_device_control_3_s; + #endif // _di_f_print_sequence_device_control_3_s_ + + #ifndef _di_f_print_sequence_device_control_4_s_ + extern const f_string_static_t f_print_sequence_device_control_4_s; + #endif // _di_f_print_sequence_device_control_4_s_ + + #ifndef _di_f_print_sequence_end_of_medium_s_ + extern const f_string_static_t f_print_sequence_end_of_medium_s; + #endif // _di_f_print_sequence_end_of_medium_s_ + + #ifndef _di_f_print_sequence_end_of_text_s_ + extern const f_string_static_t f_print_sequence_end_of_text_s; + #endif // _di_f_print_sequence_end_of_text_s_ + + #ifndef _di_f_print_sequence_end_of_transmission_s_ + extern const f_string_static_t f_print_sequence_end_of_transmission_s; + #endif // _di_f_print_sequence_end_of_transmission_s_ + + #ifndef _di_f_print_sequence_end_of_transmission_block_s_ + extern const f_string_static_t f_print_sequence_end_of_transmission_block_s; + #endif // _di_f_print_sequence_end_of_transmission_block_s_ + + #ifndef _di_f_print_sequence_enquiry_s_ + extern const f_string_static_t f_print_sequence_enquiry_s; + #endif // _di_f_print_sequence_enquiry_s_ + + #ifndef _di_f_print_sequence_escape_s_ + extern const f_string_static_t f_print_sequence_escape_s; + #endif // _di_f_print_sequence_escape_s_ + + #ifndef _di_f_print_sequence_form_feed_s_ + extern const f_string_static_t f_print_sequence_form_feed_s; + #endif // _di_f_print_sequence_form_feed_s_ + + #ifndef _di_f_print_sequence_line_feed_s_ + extern const f_string_static_t f_print_sequence_line_feed_s; + #endif // _di_f_print_sequence_line_feed_s_ + + #ifndef _di_f_print_sequence_line_new_s_ + extern const f_string_static_t f_print_sequence_line_new_s; + #endif // _di_f_print_sequence_line_new_s_ + + #ifndef _di_f_print_sequence_null_s_ + extern const f_string_static_t f_print_sequence_null_s; + #endif // _di_f_print_sequence_null_s_ + + #ifndef _di_f_print_sequence_separator_file_s_ + extern const f_string_static_t f_print_sequence_separator_file_s; + #endif // _di_f_print_sequence_separator_file_s_ + + #ifndef _di_f_print_sequence_separator_group_s_ + extern const f_string_static_t f_print_sequence_separator_group_s; + #endif // _di_f_print_sequence_separator_group_s_ + + #ifndef _di_f_print_sequence_separator_record_s_ + extern const f_string_static_t f_print_sequence_separator_record_s; + #endif // _di_f_print_sequence_separator_record_s_ + + #ifndef _di_f_print_sequence_separator_unit_s_ + extern const f_string_static_t f_print_sequence_separator_unit_s; + #endif // _di_f_print_sequence_separator_unit_s_ + + #ifndef _di_f_print_sequence_shift_in_s_ + extern const f_string_static_t f_print_sequence_shift_in_s; + #endif // _di_f_print_sequence_shift_in_s_ + + #ifndef _di_f_print_sequence_shift_out_s_ + extern const f_string_static_t f_print_sequence_shift_out_s; + #endif // _di_f_print_sequence_shift_out_s_ + + #ifndef _di_f_print_sequence_space_s_ + extern const f_string_static_t f_print_sequence_space_s; + #endif // _di_f_print_sequence_space_s_ + + #ifndef _di_f_print_sequence_start_of_header_s_ + extern const f_string_static_t f_print_sequence_start_of_header_s; + #endif // _di_f_print_sequence_start_of_header_s_ + + #ifndef _di_f_print_sequence_start_of_text_s_ + extern const f_string_static_t f_print_sequence_start_of_text_s; + #endif // _di_f_print_sequence_start_of_text_s_ + + #ifndef _di_f_print_sequence_substitute_s_ + extern const f_string_static_t f_print_sequence_substitute_s; + #endif // _di_f_print_sequence_substitute_s_ + + #ifndef _di_f_print_sequence_synchronous_idle_s_ + extern const f_string_static_t f_print_sequence_synchronous_idle_s; + #endif // _di_f_print_sequence_synchronous_idle_s_ + + #ifndef _di_f_print_sequence_tab_s_ + extern const f_string_static_t f_print_sequence_tab_s; + #endif // _di_f_print_sequence_tab_s_ + + #ifndef _di_f_print_sequence_tab_vertical_s_ + extern const f_string_static_t f_print_sequence_tab_vertical_s; + #endif // _di_f_print_sequence_tab_vertical_s_ + + #ifndef _di_f_print_sequence_unknown_s_ + extern const f_string_static_t f_print_sequence_unknown_s; + #endif // _di_f_print_sequence_unknown_s_ #endif // _di_f_print_sequence_s_ /** @@ -160,6 +267,8 @@ extern "C" { * * The key should represents the ASCII code. * With the exception being ASCII code 127, which is not present in this map. + * + * This is requires all of the sequence strings from the _di_f_print_sequence_s_ block above. */ #ifndef _di_f_print_sequences_set_control_s_ extern const f_string_static_t f_print_sequence_set_control_s[32]; @@ -207,7 +316,7 @@ extern "C" { #define F_print_format_flag_width_d 0x4000 #define F_print_format_flag_width_value_d 0x8000 #define F_print_format_flag_zeros_leading_d 0x10000 -#endif // _di_f_print_format_flags_ +#endif // _di_f_print_format_flag_d_ /** * Provide type format flags. @@ -268,7 +377,7 @@ extern "C" { f_print_format_type_unsigned_64_e, f_print_format_type_unsigned_128_e, f_print_format_type_unsigned_number_e, - }; + }; // enum #endif // _di_f_print_format_type_e_ #ifdef __cplusplus diff --git a/level_0/f_serialize/c/serialize/common.c b/level_0/f_serialize/c/serialize/common.c index e80c31d..c99a48b 100644 --- a/level_0/f_serialize/c/serialize/common.c +++ b/level_0/f_serialize/c/serialize/common.c @@ -5,9 +5,17 @@ extern "C" { #endif #ifndef _di_f_serialize_splitter_s_ - const f_string_static_t f_serialize_delimited_delimiter_s = macro_f_string_static_t_initialize(F_serialize_delimited_delimiter_s, 0, F_serialize_delimited_delimiter_s_length); - const f_string_static_t f_serialize_delimited_splitter_s = macro_f_string_static_t_initialize(F_serialize_delimited_splitter_s, 0, F_serialize_delimited_splitter_s_length); - const f_string_static_t f_serialize_to_simple_splitter_s = macro_f_string_static_t_initialize(F_serialize_simple_splitter_s, 0, F_serialize_simple_splitter_s_length); + #ifndef _di_f_serialize_delimited_delimiter_s_ + const f_string_static_t f_serialize_delimited_delimiter_s = macro_f_string_static_t_initialize(F_serialize_delimited_delimiter_s, 0, F_serialize_delimited_delimiter_s_length); + #endif // _di_f_serialize_delimited_delimiter_s_ + + #ifndef _di_f_serialize_delimited_splitter_s_ + const f_string_static_t f_serialize_delimited_splitter_s = macro_f_string_static_t_initialize(F_serialize_delimited_splitter_s, 0, F_serialize_delimited_splitter_s_length); + #endif // _di_f_serialize_delimited_splitter_s_ + + #ifndef _di_f_serialize_to_simple_splitter_s_ + const f_string_static_t f_serialize_to_simple_splitter_s = macro_f_string_static_t_initialize(F_serialize_simple_splitter_s, 0, F_serialize_simple_splitter_s_length); + #endif // _di_f_serialize_to_simple_splitter_s_ #endif // _di_f_serialize_splitter_s_ #ifdef __cplusplus diff --git a/level_0/f_serialize/c/serialize/common.h b/level_0/f_serialize/c/serialize/common.h index f69e851..d54df27 100644 --- a/level_0/f_serialize/c/serialize/common.h +++ b/level_0/f_serialize/c/serialize/common.h @@ -25,9 +25,17 @@ extern "C" { #define F_serialize_delimited_splitter_s_length 1 #define F_serialize_simple_splitter_s_length 1 - extern const f_string_static_t f_serialize_delimited_delimiter_s; - extern const f_string_static_t f_serialize_delimited_splitter_s; - extern const f_string_static_t f_serialize_to_simple_splitter_s; + #ifndef _di_f_serialize_delimited_delimiter_s_ + extern const f_string_static_t f_serialize_delimited_delimiter_s; + #endif // _di_f_serialize_delimited_delimiter_s_ + + #ifndef _di_f_serialize_delimited_splitter_s_ + extern const f_string_static_t f_serialize_delimited_splitter_s; + #endif // _di_f_serialize_delimited_splitter_s_ + + #ifndef _di_f_serialize_to_simple_splitter_s_ + extern const f_string_static_t f_serialize_to_simple_splitter_s; + #endif // _di_f_serialize_to_simple_splitter_s_ #endif // _di_f_serialize_splitter_s_ #ifdef __cplusplus diff --git a/level_0/f_utf/c/utf/common.c b/level_0/f_utf/c/utf/common.c index 65fe501..decd1d8 100644 --- a/level_0/f_utf/c/utf/common.c +++ b/level_0/f_utf/c/utf/common.c @@ -4,51 +4,124 @@ extern "C" { #endif -#ifndef _di_f_utf_char_s_ - const f_utf_char_t f_utf_char_t_eol_s = (f_utf_char_t) F_utf_char_t_eol_s; - const f_utf_char_t f_utf_char_t_eos_s = (f_utf_char_t) F_utf_char_t_eol_s; - const f_utf_char_t f_utf_char_t_placeholder_s = (f_utf_char_t) F_utf_char_t_eol_s; -#endif // _di_f_utf_char_s_ - #ifndef _di_f_utf_space_s_ - const f_char_t f_utf_space_em_s[F_utf_space_em_s_length] = { 0xe2, 0x80, 0x83 }; - const f_char_t f_utf_space_em_quad_s[F_utf_space_em_quad_s_length] = { 0xe2, 0x80, 0x81 }; - const f_char_t f_utf_space_em_per_three_s[F_utf_space_em_per_three_s_length] = { 0xe2, 0x80, 0x84 }; - const f_char_t f_utf_space_em_per_four_s[F_utf_space_em_per_four_s_length] = { 0xe2, 0x80, 0x85 }; - const f_char_t f_utf_space_em_per_six_s[F_utf_space_em_per_six_s_length] = { 0xe2, 0x80, 0x86 }; + #ifndef _di_f_utf_space_em_s_ + const f_char_t f_utf_space_em_s[F_utf_space_em_s_length] = { 0xe2, 0x80, 0x83 }; + #endif // _di_f_f_utf_space_em_s_ + + #ifndef _di_f_utf_space_em_quad_s_ + const f_char_t f_utf_space_em_quad_s[F_utf_space_em_quad_s_length] = { 0xe2, 0x80, 0x81 }; + #endif // _di_f_f_utf_space_em_quad_s_ + + #ifndef _di_f_utf_space_em_per_three_s_ + const f_char_t f_utf_space_em_per_three_s[F_utf_space_em_per_three_s_length] = { 0xe2, 0x80, 0x84 }; + #endif // _di_f_f_utf_space_em_per_three_s_ + + #ifndef _di_f_utf_space_em_per_four_s_ + const f_char_t f_utf_space_em_per_four_s[F_utf_space_em_per_four_s_length] = { 0xe2, 0x80, 0x85 }; + #endif // _di_f_f_utf_space_em_per_four_s_ + + #ifndef _di_f_utf_space_em_per_six_s_ + const f_char_t f_utf_space_em_per_six_s[F_utf_space_em_per_six_s_length] = { 0xe2, 0x80, 0x86 }; + #endif // _di_f_f_utf_space_em_per_six_s_ + + #ifndef _di_f_utf_space_en_s_ + const f_char_t f_utf_space_en_s[F_utf_space_en_s_length] = { 0xe2, 0x80, 0x82 }; + #endif // _di_f_f_utf_space_en_s_ + + #ifndef _di_f_utf_space_en_quad_s_ + const f_char_t f_utf_space_en_quad_s[F_utf_space_en_quad_s_length] = { 0xe2, 0x80, 0x80 }; + #endif // _di_f_f_utf_space_en_quad_s_ + + #ifndef _di_f_utf_space_line_feed_reverse_s_ + const f_char_t f_utf_space_line_feed_reverse_s[F_utf_space_line_feed_reverse_s_length] = { 0xc2, 0x8d }; + #endif // _di_f_f_utf_space_line_feed_reverse_s_ + + #ifndef _di_f_utf_space_line_next_s_ + const f_char_t f_utf_space_line_next_s[F_utf_space_line_next_s_length] = { 0xc2, 0x85 }; + #endif // _di_f_f_utf_space_line_next_s_ + + #ifndef _di_f_utf_space_medium_mathematical_s_ + const f_char_t f_utf_space_medium_mathematical_s[F_utf_space_medium_mathematical_s_length] = { 0xe2, 0x81, 0x9f }; + #endif // _di_f_f_utf_space_medium_mathematical_s_ - const f_char_t f_utf_space_en_s[F_utf_space_en_s_length] = { 0xe2, 0x80, 0x82 }; - const f_char_t f_utf_space_en_quad_s[F_utf_space_en_quad_s_length] = { 0xe2, 0x80, 0x80 }; + #ifndef _di_f_utf_space_no_break_s_ + const f_char_t f_utf_space_no_break_s[F_utf_space_no_break_s_length] = { 0xc2, 0xa0 }; + #endif // _di_f_f_utf_space_no_break_s_ - const f_char_t f_utf_space_line_feed_reverse_s[F_utf_space_line_feed_reverse_s_length] = { 0xc2, 0x8d }; - const f_char_t f_utf_space_line_next_s[F_utf_space_line_next_s_length] = { 0xc2, 0x85 }; + #ifndef _di_f_utf_space_no_break_narrow_s_ + const f_char_t f_utf_space_no_break_narrow_s[F_utf_space_no_break_narrow_s_length] = { 0xe2, 0x80, 0xaf }; + #endif // _di_f_f_utf_space_no_break_narrow_s_ - const f_char_t f_utf_space_medium_mathematical_s[F_utf_space_medium_mathematical_s_length] = { 0xe2, 0x81, 0x9f }; + #ifndef _di_f_utf_space_ogham_s_ + const f_char_t f_utf_space_ogham_s[F_utf_space_ogham_s_length] = { 0xe1, 0x9a, 0x80 }; + #endif // _di_f_f_utf_space_ogham_s_ - const f_char_t f_utf_space_no_break_s[F_utf_space_no_break_s_length] = { 0xc2, 0xa0 }; - const f_char_t f_utf_space_no_break_narrow_s[F_utf_space_no_break_narrow_s_length] = { 0xe2, 0x80, 0xaf }; + #ifndef _di_f_utf_space_figure_s_ + const f_char_t f_utf_space_figure_s[F_utf_space_figure_s_length] = { 0xe2, 0x80, 0x87 }; + #endif // _di_f_f_utf_space_figure_s_ - const f_char_t f_utf_space_ogham_s[F_utf_space_ogham_s_length] = { 0xe1, 0x9a, 0x80 }; - const f_char_t f_utf_space_figure_s[F_utf_space_figure_s_length] = { 0xe2, 0x80, 0x87 }; - const f_char_t f_utf_space_punctuation_s[F_utf_space_punctuation_s_length] = { 0xe2, 0x80, 0x88 }; - const f_char_t f_utf_space_thin_s[F_utf_space_thin_s_length] = { 0xe2, 0x80, 0x89 }; - const f_char_t f_utf_space_hair_s[F_utf_space_hair_s_length] = { 0xe2, 0x80, 0x8a }; - const f_char_t f_utf_space_ideographic_s[F_utf_space_ideographic_s_length] = { 0xe3, 0x80, 0x80 }; + #ifndef _di_f_utf_space_punctuation_s_ + const f_char_t f_utf_space_punctuation_s[F_utf_space_punctuation_s_length] = { 0xe2, 0x80, 0x88 }; + #endif // _di_f_f_utf_space_punctuation_s_ - const f_char_t f_utf_space_separator_line_s[F_utf_space_separator_line_s_length] = { 0xe2, 0x80, 0xa8 }; - const f_char_t f_utf_space_separator_paragraph_s[F_utf_space_separator_paragraph_s_length] = { 0xe2, 0x80, 0xa8 }; + #ifndef _di_f_utf_space_thin_s_ + const f_char_t f_utf_space_thin_s[F_utf_space_thin_s_length] = { 0xe2, 0x80, 0x89 }; + #endif // _di_f_f_utf_space_thin_s_ + + #ifndef _di_f_utf_space_hair_s_ + const f_char_t f_utf_space_hair_s[F_utf_space_hair_s_length] = { 0xe2, 0x80, 0x8a }; + #endif // _di_f_f_utf_space_hair_s_ + + #ifndef _di_f_utf_space_ideographic_s_ + const f_char_t f_utf_space_ideographic_s[F_utf_space_ideographic_s_length] = { 0xe3, 0x80, 0x80 }; + #endif // _di_f_f_utf_space_ideographic_s_ + + #ifndef _di_f_utf_space_separator_line_s_ + const f_char_t f_utf_space_separator_line_s[F_utf_space_separator_line_s_length] = { 0xe2, 0x80, 0xa8 }; + #endif // _di_f_f_utf_space_separator_line_s_ + + #ifndef _di_f_utf_space_separator_paragraph_s_ + const f_char_t f_utf_space_separator_paragraph_s[F_utf_space_separator_paragraph_s_length] = { 0xe2, 0x80, 0xa8 }; + #endif // _di_f_f_utf_space_separator_paragraph_s_ #endif // _di_f_utf_space_s_ #ifndef _di_f_utf_substitute_s_ - const f_char_t f_utf_substitute_symbol_blank_s[F_utf_substitute_symbol_blank_s_length] = { 0xe2, 0x90, 0xa2 }; - const f_char_t f_utf_substitute_symbol_space_s[F_utf_substitute_symbol_space_s_length] = { 0xe2, 0x90, 0xa0 }; + #ifndef _di_f_utf_substitute_symbol_blank_s_ + const f_char_t f_utf_substitute_symbol_blank_s[F_utf_substitute_symbol_blank_s_length] = { 0xe2, 0x90, 0xa2 }; + #endif // _di_f_f_utf_substitute_symbol_blank_s_ + + #ifndef _di_f_utf_substitute_symbol_space_s_ + const f_char_t f_utf_substitute_symbol_space_s[F_utf_substitute_symbol_space_s_length] = { 0xe2, 0x90, 0xa0 }; + #endif // _di_f_f_utf_substitute_symbol_space_s_ + + #ifndef _di_f_utf_substitute_middle_dot_s_ + const f_char_t f_utf_substitute_middle_dot_s[F_utf_substitute_middle_dot_s_length] = { 0xc2, 0xb7 }; + #endif // _di_f_f_utf_substitute_middle_dot_s_ - const f_char_t f_utf_substitute_middle_dot_s[F_utf_substitute_middle_dot_s_length] = { 0xc2, 0xb7 }; + #ifndef _di_f_utf_substitute_open_box_s_ + const f_char_t f_utf_substitute_open_box_s[F_utf_substitute_open_box_s_length] = { 0xe2, 0x90, 0xa3 }; + #endif // _di_f_f_utf_substitute_open_box_s_ - const f_char_t f_utf_substitute_open_box_s[F_utf_substitute_open_box_s_length] = { 0xe2, 0x90, 0xa3 }; - const f_char_t f_utf_substitute_open_box_shouldered_s[F_utf_substitute_open_box_shouldered_s_length] = { 0xe2, 0x8d, 0xbd }; + #ifndef _di_f_utf_substitute_open_box_shouldered_s_ + const f_char_t f_utf_substitute_open_box_shouldered_s[F_utf_substitute_open_box_shouldered_s_length] = { 0xe2, 0x8d, 0xbd }; + #endif // _di_f_f_utf_substitute_open_box_shouldered_s_ #endif // _di_f_utf_substitute_s_ +#ifndef _di_f_utf_char_s_ + #ifndef _di_f_utf_char_eol_s_ + const f_utf_char_t f_utf_char_eol_s = (f_utf_char_t) F_utf_char_eol_s; + #endif // _di_f_utf_char_eol_s_ + + #ifndef _di_f_utf_char_eos_s_ + const f_utf_char_t f_utf_char_eos_s = (f_utf_char_t) F_utf_char_eol_s; + #endif // _di_f_utf_char_eos_s_ + + #ifndef _di_f_utf_char_placeholder_s_ + const f_utf_char_t f_utf_char_t_placeholder_s = (f_utf_char_t) F_utf_char_eol_s; + #endif // _di_f_utf_char_placeholder_s_ +#endif // _di_f_utf_char_s_ + #ifdef __cplusplus } // extern "C" #endif diff --git a/level_0/f_utf/c/utf/common.h b/level_0/f_utf/c/utf/common.h index 89c9afc..a716245 100644 --- a/level_0/f_utf/c/utf/common.h +++ b/level_0/f_utf/c/utf/common.h @@ -90,32 +90,85 @@ extern "C" { #define F_utf_space_separator_line_s_length 3 #define F_utf_space_separator_paragraph_s_length 3 - extern const f_char_t f_utf_space_em_s[]; - extern const f_char_t f_utf_space_em_quad_s[]; - extern const f_char_t f_utf_space_em_per_three_s[]; - extern const f_char_t f_utf_space_em_per_four_s[]; - extern const f_char_t f_utf_space_em_per_six_s[]; + #ifndef _di_f_utf_space_em_s_ + extern const f_char_t f_utf_space_em_s[]; + #endif // _di_f_f_utf_space_em_s_ - extern const f_char_t f_utf_space_en_s[]; - extern const f_char_t f_utf_space_en_quad_s[]; + #ifndef _di_f_utf_space_em_quad_s_ + extern const f_char_t f_utf_space_em_quad_s[]; + #endif // _di_f_f_utf_space_em_quad_s_ - extern const f_char_t f_utf_space_line_feed_reverse_s[]; - extern const f_char_t f_utf_space_line_next_s[]; + #ifndef _di_f_utf_space_em_per_three_s_ + extern const f_char_t f_utf_space_em_per_three_s[]; + #endif // _di_f_f_utf_space_em_per_three_s_ - extern const f_char_t f_utf_space_medium_mathematical_s[]; + #ifndef _di_f_utf_space_em_per_four_s_ + extern const f_char_t f_utf_space_em_per_four_s[]; + #endif // _di_f_f_utf_space_em_per_four_s_ - extern const f_char_t f_utf_space_no_break_s[]; - extern const f_char_t f_utf_space_no_break_narrow_s[]; + #ifndef _di_f_utf_space_em_per_six_s_ + extern const f_char_t f_utf_space_em_per_six_s[]; + #endif // _di_f_f_utf_space_em_per_six_s_ - extern const f_char_t f_utf_space_ogham_s[]; - extern const f_char_t f_utf_space_figure_s[]; - extern const f_char_t f_utf_space_punctuation_s[]; - extern const f_char_t f_utf_space_thin_s[]; - extern const f_char_t f_utf_space_hair_s[]; - extern const f_char_t f_utf_space_ideographic_s[]; + #ifndef _di_f_utf_space_en_s_ + extern const f_char_t f_utf_space_en_s[]; + #endif // _di_f_f_utf_space_en_s_ - extern const f_char_t f_utf_space_separator_line_s[]; - extern const f_char_t f_utf_space_separator_paragraph_s[]; + #ifndef _di_f_utf_space_en_quad_s_ + extern const f_char_t f_utf_space_en_quad_s[]; + #endif // _di_f_f_utf_space_en_quad_s_ + + #ifndef _di_f_utf_space_line_feed_reverse_s_ + extern const f_char_t f_utf_space_line_feed_reverse_s[]; + #endif // _di_f_f_utf_space_line_feed_reverse_s_ + + #ifndef _di_f_utf_space_line_next_s_ + extern const f_char_t f_utf_space_line_next_s[]; + #endif // _di_f_f_utf_space_line_next_s_ + + #ifndef _di_f_utf_space_medium_mathematical_s_ + extern const f_char_t f_utf_space_medium_mathematical_s[]; + #endif // _di_f_f_utf_space_medium_mathematical_s_ + + #ifndef _di_f_utf_space_no_break_s_ + extern const f_char_t f_utf_space_no_break_s[]; + #endif // _di_f_f_utf_space_no_break_s_ + + #ifndef _di_f_utf_space_no_break_narrow_s_ + extern const f_char_t f_utf_space_no_break_narrow_s[]; + #endif // _di_f_f_utf_space_no_break_narrow_s_ + + #ifndef _di_f_utf_space_ogham_s_ + extern const f_char_t f_utf_space_ogham_s[]; + #endif // _di_f_f_utf_space_ogham_s_ + + #ifndef _di_f_utf_space_figure_s_ + extern const f_char_t f_utf_space_figure_s[]; + #endif // _di_f_f_utf_space_figure_s_ + + #ifndef _di_f_utf_space_punctuation_s_ + extern const f_char_t f_utf_space_punctuation_s[]; + #endif // _di_f_f_utf_space_punctuation_s_ + + #ifndef _di_f_utf_space_thin_s_ + extern const f_char_t f_utf_space_thin_s[]; + #endif // _di_f_f_utf_space_thin_s_ + + #ifndef _di_f_utf_space_hair_s_ + extern const f_char_t f_utf_space_hair_s[]; + #endif // _di_f_f_utf_space_hair_s_ + + #ifndef _di_f_utf_space_ideographic_s_ + extern const f_char_t f_utf_space_ideographic_s[]; + #endif // _di_f_f_utf_space_ideographic_s_ + + #ifndef _di_f_utf_space_separator_line_s_ + extern const f_char_t f_utf_space_separator_line_s[]; + #endif // _di_f_f_utf_space_separator_line_s_ + + #ifndef _di_f_utf_space_separator_paragraph_s_ + extern const f_char_t f_utf_space_separator_paragraph_s[]; + #endif // _di_f_f_utf_space_separator_paragraph_s_ #endif // _di_f_utf_space_s_ /** @@ -136,13 +189,25 @@ extern "C" { #define F_utf_substitute_open_box_s_length 3 #define F_utf_substitute_open_box_shouldered_s_length 3 - extern const f_char_t f_utf_substitute_symbol_blank_s[]; - extern const f_char_t f_utf_substitute_symbol_space_s[]; + #ifndef _di_f_utf_substitute_symbol_blank_s_ + extern const f_char_t f_utf_substitute_symbol_blank_s[]; + #endif // _di_f_f_utf_substitute_symbol_blank_s_ - extern const f_char_t f_utf_substitute_middle_dot_s[]; + #ifndef _di_f_utf_substitute_symbol_space_s_ + extern const f_char_t f_utf_substitute_symbol_space_s[]; + #endif // _di_f_f_utf_substitute_symbol_space_s_ - extern const f_char_t f_utf_substitute_open_box_s[]; - extern const f_char_t f_utf_substitute_open_box_shouldered_s[]; + #ifndef _di_f_utf_substitute_middle_dot_s_ + extern const f_char_t f_utf_substitute_middle_dot_s[]; + #endif // _di_f_f_utf_substitute_middle_dot_s_ + + #ifndef _di_f_utf_substitute_open_box_s_ + extern const f_char_t f_utf_substitute_open_box_s[]; + #endif // _di_f_f_utf_substitute_open_box_s_ + + #ifndef _di_f_utf_substitute_open_box_shouldered_s_ + extern const f_char_t f_utf_substitute_open_box_shouldered_s[]; + #endif // _di_f_f_utf_substitute_open_box_shouldered_s_ #endif // _di_f_utf_substitute_s_ /** @@ -262,22 +327,30 @@ extern "C" { #ifndef _di_f_utf_char_s_ // Big Endian. - #define F_utf_char_t_eol_be_s 0x0a000000 // 0000 1010, 0000 0000, 0000 0000, 0000 0000 - #define F_utf_char_t_eos_be_s 0x00000000 // 0000 0000, 0000 0000, 0000 0000, 0000 0000 - #define F_utf_char_t_placeholder_be_s 0x00000000 // 0000 0000, 0000 0000, 0000 0000, 0000 0000 + #define F_utf_char_eol_be_s 0x0a000000 // 0000 1010, 0000 0000, 0000 0000, 0000 0000 + #define F_utf_char_eos_be_s 0x00000000 // 0000 0000, 0000 0000, 0000 0000, 0000 0000 + #define F_utf_char_placeholder_be_s 0x00000000 // 0000 0000, 0000 0000, 0000 0000, 0000 0000 // Little Endian. - #define F_utf_char_t_eol_le_s 0x0000000a // 0000 0000, 0000 0000, 0000 0000, 0000 1010 - #define F_utf_char_t_eos_le_s 0x00000000 // 0000 0000, 0000 0000, 0000 0000, 0000 0000 - #define F_utf_char_t_placeholder_le_s 0x00000000 // 0000 0000, 0000 0000, 0000 0000, 0000 0000 + #define F_utf_char_eol_le_s 0x0000000a // 0000 0000, 0000 0000, 0000 0000, 0000 1010 + #define F_utf_char_eos_le_s 0x00000000 // 0000 0000, 0000 0000, 0000 0000, 0000 0000 + #define F_utf_char_placeholder_le_s 0x00000000 // 0000 0000, 0000 0000, 0000 0000, 0000 0000 + + #define F_utf_char_eol_s F_utf_char_eol_be_s + #define F_utf_char_eos_s F_utf_char_eos_be_s + #define F_utf_char_placeholder_s F_utf_char_placeholder_be_s + + #ifndef _di_f_utf_char_eol_s_ + extern const f_utf_char_t f_utf_char_eol_s; + #endif // _di_f_utf_char_eol_s_ - #define F_utf_char_t_eol_s F_utf_char_t_eol_be_s - #define F_utf_char_t_eos_s F_utf_char_t_eos_be_s - #define F_utf_char_t_placeholder_s F_utf_char_t_placeholder_be_s + #ifndef _di_f_utf_char_eos_s_ + extern const f_utf_char_t f_utf_char_eos_s; + #endif // _di_f_utf_char_eos_s_ - extern const f_utf_char_t f_utf_char_t_eol_s; - extern const f_utf_char_t f_utf_char_t_eos_s; - extern const f_utf_char_t f_utf_char_t_placeholder_s; + #ifndef _di_f_utf_char_placeholder_s_ + extern const f_utf_char_t f_utf_char_t_placeholder_s; + #endif // _di_f_utf_char_placeholder_s_ #endif // _di_f_utf_char_s_ /** @@ -320,7 +393,7 @@ extern "C" { F_utf_width_narrow_e, F_utf_width_nuetral_e, F_utf_width_wide_e, - }; + }; // enum #endif // _di_f_utf_width_e_ #ifdef __cplusplus diff --git a/level_0/f_utf/c/utf/dynamic.c b/level_0/f_utf/c/utf/dynamic.c index c5cdf2d..5c873a8 100644 --- a/level_0/f_utf/c/utf/dynamic.c +++ b/level_0/f_utf/c/utf/dynamic.c @@ -679,7 +679,7 @@ extern "C" { if (!buffer.used) return F_data_not; if (range->start > range->stop) return F_data_not_stop; - while (buffer.string[range->start] != f_utf_char_t_eol_s) { + while (buffer.string[range->start] != f_utf_char_eol_s) { if (macro_f_utf_char_t_width_is(buffer.string[range->start]) == 1) { return F_status_set_error(F_utf_fragment); @@ -710,7 +710,7 @@ extern "C" { return F_status_set_error(F_utf_fragment); } - if (buffer.string[range->start] == f_utf_char_t_eol_s) return F_none_eol; + if (buffer.string[range->start] == f_utf_char_eol_s) return F_none_eol; ++range->start; diff --git a/level_0/f_utf/c/utf/string.c b/level_0/f_utf/c/utf/string.c index cb40e7b..1beceb3 100644 --- a/level_0/f_utf/c/utf/string.c +++ b/level_0/f_utf/c/utf/string.c @@ -298,7 +298,7 @@ extern "C" { return F_data_not_stop; } - while (string[range->start] != f_utf_char_t_eol_s) { + while (string[range->start] != f_utf_char_eol_s) { if (macro_f_utf_char_t_width_is(string[range->start]) == 1) { return F_status_set_error(F_utf_fragment); @@ -327,7 +327,7 @@ extern "C" { while (string[range->start] != seek_to) { - if (string[range->start] == f_utf_char_t_eol_s) { + if (string[range->start] == f_utf_char_eol_s) { return F_none_eol; } diff --git a/level_1/fl_conversion/c/conversion/common.c b/level_1/fl_conversion/c/conversion/common.c index 255ad5a..6289e98 100644 --- a/level_1/fl_conversion/c/conversion/common.c +++ b/level_1/fl_conversion/c/conversion/common.c @@ -5,13 +5,33 @@ extern "C" { #endif #ifndef _di_fl_conversion_data_c_ - const fl_conversion_data_t fl_conversion_data_base_2_c = macro_fl_conversion_data_t_initialize(2, 0); - const fl_conversion_data_t fl_conversion_data_base_8_c = macro_fl_conversion_data_t_initialize(8, 0); - const fl_conversion_data_t fl_conversion_data_base_10_c = macro_fl_conversion_data_t_initialize(10, 0); - const fl_conversion_data_t fl_conversion_data_base_12_c = macro_fl_conversion_data_t_initialize(12, 0); - const fl_conversion_data_t fl_conversion_data_base_16_c = macro_fl_conversion_data_t_initialize(16, 0); - const fl_conversion_data_t fl_conversion_data_endian_big_c = macro_fl_conversion_data_t_initialize(10, FL_conversion_data_flag_endian_big_d); - const fl_conversion_data_t fl_conversion_data_endian_little_c = macro_fl_conversion_data_t_initialize(10, FL_conversion_data_flag_endian_little_d); + #ifndef _di_fl_conversion_data_base_2_c_ + const fl_conversion_data_t fl_conversion_data_base_2_c = macro_fl_conversion_data_t_initialize(2, 0); + #endif // _di_fl_conversion_data_base_2_c_ + + #ifndef _di_fl_conversion_data_base_8_c_ + const fl_conversion_data_t fl_conversion_data_base_8_c = macro_fl_conversion_data_t_initialize(8, 0); + #endif // _di_fl_conversion_data_base_8_c_ + + #ifndef _di_fl_conversion_data_base_10_c_ + const fl_conversion_data_t fl_conversion_data_base_10_c = macro_fl_conversion_data_t_initialize(10, 0); + #endif // _di_fl_conversion_data_base_10_c_ + + #ifndef _di_fl_conversion_data_base_12_c_ + const fl_conversion_data_t fl_conversion_data_base_12_c = macro_fl_conversion_data_t_initialize(12, 0); + #endif // _di_fl_conversion_data_base_12_c_ + + #ifndef _di_fl_conversion_data_base_16_c_ + const fl_conversion_data_t fl_conversion_data_base_16_c = macro_fl_conversion_data_t_initialize(16, 0); + #endif // _di_fl_conversion_data_base_16_c_ + + #ifndef _di_fl_conversion_data_endian_big_c_ + const fl_conversion_data_t fl_conversion_data_endian_big_c = macro_fl_conversion_data_t_initialize(10, FL_conversion_data_flag_endian_big_d); + #endif // _di_fl_conversion_data_endian_big_c_ + + #ifndef _di_fl_conversion_data_endian_little_c_ + const fl_conversion_data_t fl_conversion_data_endian_little_c = macro_fl_conversion_data_t_initialize(10, FL_conversion_data_flag_endian_little_d); + #endif // _di_fl_conversion_data_endian_little_c_ #endif // _di_fl_conversion_data_c_ #ifdef __cplusplus diff --git a/level_1/fl_conversion/c/conversion/common.h b/level_1/fl_conversion/c/conversion/common.h index d92832f..214038a 100644 --- a/level_1/fl_conversion/c/conversion/common.h +++ b/level_1/fl_conversion/c/conversion/common.h @@ -40,7 +40,7 @@ extern "C" { /** * The defines for conversion data. * - * fl_conversion_data_*: + * fl_conversion_data_*_c: * - base_2: Basic base-2 conversion structure. * - base_8: Basic base-8 conversion structure. * - base_10: Basic base-10 conversion structure. @@ -51,14 +51,33 @@ extern "C" { * - shift_left: Basic base-10 conversion with shift left flag. */ #ifndef _di_fl_conversion_data_c_ - extern const fl_conversion_data_t fl_conversion_data_base_2_c; - extern const fl_conversion_data_t fl_conversion_data_base_8_c; - extern const fl_conversion_data_t fl_conversion_data_base_10_c; - extern const fl_conversion_data_t fl_conversion_data_base_12_c; - extern const fl_conversion_data_t fl_conversion_data_base_16_c; - extern const fl_conversion_data_t fl_conversion_data_endian_big_c; - extern const fl_conversion_data_t fl_conversion_data_endian_little_c; - extern const fl_conversion_data_t fl_conversion_data_shift_left_c; + #ifndef _di_fl_conversion_data_base_2_c_ + extern const fl_conversion_data_t fl_conversion_data_base_2_c; + #endif // _di_fl_conversion_data_base_2_c_ + + #ifndef _di_fl_conversion_data_base_8_c_ + extern const fl_conversion_data_t fl_conversion_data_base_8_c; + #endif // _di_fl_conversion_data_base_8_c_ + + #ifndef _di_fl_conversion_data_base_10_c_ + extern const fl_conversion_data_t fl_conversion_data_base_10_c; + #endif // _di_fl_conversion_data_base_10_c_ + + #ifndef _di_fl_conversion_data_base_12_c_ + extern const fl_conversion_data_t fl_conversion_data_base_12_c; + #endif // _di_fl_conversion_data_base_12_c_ + + #ifndef _di_fl_conversion_data_base_16_c_ + extern const fl_conversion_data_t fl_conversion_data_base_16_c; + #endif // _di_fl_conversion_data_base_16_c_ + + #ifndef _di_fl_conversion_data_endian_big_c_ + extern const fl_conversion_data_t fl_conversion_data_endian_big_c; + #endif // _di_fl_conversion_data_endian_big_c_ + + #ifndef _di_fl_conversion_data_endian_little_c_ + extern const fl_conversion_data_t fl_conversion_data_endian_little_c; + #endif // _di_fl_conversion_data_endian_little_c_ #endif // _di_fl_conversion_data_c_ /** diff --git a/level_1/fl_execute/c/execute/common.h b/level_1/fl_execute/c/execute/common.h index 7e40dc5..5096162 100644 --- a/level_1/fl_execute/c/execute/common.h +++ b/level_1/fl_execute/c/execute/common.h @@ -19,14 +19,6 @@ extern "C" { /** * A structure for containing additional parameters for the execute functions that call the execv() family of functions. * - * FL_execute_parameter_option_*: - * - exit: Used to desginate to exit after calling child otherwise child process will return. - * - path: Used to designate that the full path to the program is to be passed in argument[0] instead of the program name (such as '/bin/bash' instead of 'bash'). - * - return: Used to designate that the parent process will immediately return instead of waiting for the child process to complete. - * - session: Start a new session, set the process of the child as the controlling terminal. - * - terminal: (Not Implemented) open() a terminal (tty) before executing. @todo determine if and how to setup the terminal properly (this needs research and planning and may require further structural changes). - * - threadsafe: Used to designate that threadsafe functions are to be used (such as: f_thread_signal_mask instead of f_signal_mask). - * * option: Accepts the bitwise options * wait: Represents options passed to waitpid(), such as WUNTRACED. * environment: The environment variable name and value pairs, set to 0 to not use. @@ -34,13 +26,6 @@ extern "C" { * data: The data to pipe to the child process, set to 0 to not use. */ #ifndef _di_fl_execute_parameter_t_ - #define FL_execute_parameter_option_exit_d 0x1 - #define FL_execute_parameter_option_path_d 0x2 - #define FL_execute_parameter_option_return_d 0x4 - #define FL_execute_parameter_option_session_d 0x8 - #define FL_execute_parameter_option_terminal_d 0x10 - #define FL_execute_parameter_option_threadsafe_d 0x20 - typedef struct { uint8_t option; int wait; @@ -63,6 +48,26 @@ extern "C" { #endif // _di_fl_execute_parameter_t_ /** + * Defnes asspciated with fl_execute_parameter_t. + * + * FL_execute_parameter_option_*_d: + * - exit: Used to desginate to exit after calling child otherwise child process will return. + * - path: Used to designate that the full path to the program is to be passed in argument[0] instead of the program name (such as '/bin/bash' instead of 'bash'). + * - return: Used to designate that the parent process will immediately return instead of waiting for the child process to complete. + * - session: Start a new session, set the process of the child as the controlling terminal. + * - terminal: (Not Implemented) open() a terminal (tty) before executing. @todo determine if and how to setup the terminal properly (this needs research and planning and may require further structural changes). + * - threadsafe: Used to designate that threadsafe functions are to be used (such as: f_thread_signal_mask instead of f_signal_mask). + */ +#ifndef _di_fl_execute_parameter_option_d_ + #define FL_execute_parameter_option_exit_d 0x1 + #define FL_execute_parameter_option_path_d 0x2 + #define FL_execute_parameter_option_return_d 0x4 + #define FL_execute_parameter_option_session_d 0x8 + #define FL_execute_parameter_option_terminal_d 0x10 + #define FL_execute_parameter_option_threadsafe_d 0x20 +#endif // _di_fl_execute_parameter_option_d_ + +/** * A structure for containing identity and access related parameters for the execute functions that call the execv() family of functions. * * There are likely many more identity and access related things that can be done but this focuses on a small core set of those. diff --git a/level_1/fl_print/c/print/common.c b/level_1/fl_print/c/print/common.c index 290e9ee..6693910 100644 --- a/level_1/fl_print/c/print/common.c +++ b/level_1/fl_print/c/print/common.c @@ -5,9 +5,17 @@ extern "C" { #endif #ifndef _di_fl_print_s_ - const f_string_static_t fl_print_debug_s = macro_f_string_static_t_initialize(FL_print_debug_s, 0, FL_print_debug_s_length); - const f_string_static_t fl_print_error_s = macro_f_string_static_t_initialize(FL_print_error_s, 0, FL_print_error_s_length); - const f_string_static_t fl_print_warning_s = macro_f_string_static_t_initialize(FL_print_warning_s, 0, FL_print_warning_s_length); + #ifndef _di_fl_print_debug_s_ + const f_string_static_t fl_print_debug_s = macro_f_string_static_t_initialize(FL_print_debug_s, 0, FL_print_debug_s_length); + #endif // _di_fl_print_debug_s_ + + #ifndef _di_fl_print_error_s_ + const f_string_static_t fl_print_error_s = macro_f_string_static_t_initialize(FL_print_error_s, 0, FL_print_error_s_length); + #endif // _di_fl_print_error_s_ + + #ifndef _di_fl_print_warning_s_ + const f_string_static_t fl_print_warning_s = macro_f_string_static_t_initialize(FL_print_warning_s, 0, FL_print_warning_s_length); + #endif // _di_fl_print_warning_s_ #endif // _di_fl_print_s_ #ifdef __cplusplus diff --git a/level_1/fl_print/c/print/common.h b/level_1/fl_print/c/print/common.h index 5f2d84b..ef39aad 100644 --- a/level_1/fl_print/c/print/common.h +++ b/level_1/fl_print/c/print/common.h @@ -33,9 +33,17 @@ extern "C" { #define FL_print_error_s_length 7 #define FL_print_warning_s_length 9 - extern const f_string_static_t fl_print_debug_s; - extern const f_string_static_t fl_print_error_s; - extern const f_string_static_t fl_print_warning_s; + #ifndef _di_fl_print_debug_s_ + extern const f_string_static_t fl_print_debug_s; + #endif // _di_fl_print_debug_s_ + + #ifndef _di_fl_print_error_s_ + extern const f_string_static_t fl_print_error_s; + #endif // _di_fl_print_error_s_ + + #ifndef _di_fl_print_warning_s_ + extern const f_string_static_t fl_print_warning_s; + #endif // _di_fl_print_warning_s_ #endif // _di_fl_print_s_ /** diff --git a/level_1/fl_utf/c/utf.c b/level_1/fl_utf/c/utf.c index 364c74d..2d9cf3f 100644 --- a/level_1/fl_utf/c/utf.c +++ b/level_1/fl_utf/c/utf.c @@ -99,7 +99,7 @@ extern "C" { while (buffer.string[range->start] != seek_to_character) { - if (buffer.string[range->start++] == f_utf_char_t_eol_s) { + if (buffer.string[range->start++] == f_utf_char_eol_s) { return F_none_eol; } @@ -142,7 +142,7 @@ extern "C" { return status; } - if (buffer.string[range->start++] == f_utf_char_t_eol_s) { + if (buffer.string[range->start++] == f_utf_char_eol_s) { return F_none_eol; } @@ -186,7 +186,7 @@ extern "C" { while (buffer.string[range->start] == placeholder || (status = f_utf_character_is_whitespace(buffer.string[range->start], F_false)) == F_false) { if (F_status_is_error(status)) return status; - if (buffer.string[range->start] == f_utf_char_t_eol_s) return F_none_eol; + if (buffer.string[range->start] == f_utf_char_eol_s) return F_none_eol; ++range->start; @@ -309,7 +309,7 @@ extern "C" { return F_status_set_error(F_utf_fragment); } - if (string[range->start] == f_utf_char_t_eol_s) { + if (string[range->start] == f_utf_char_eol_s) { return F_none_eol; } @@ -344,7 +344,7 @@ extern "C" { return status; } - if (string[range->start++] == f_utf_char_t_eol_s) { + if (string[range->start++] == f_utf_char_eol_s) { return F_none_eol; } @@ -387,7 +387,7 @@ extern "C" { return status; } - if (string[range->start++] == f_utf_char_t_eol_s) { + if (string[range->start++] == f_utf_char_eol_s) { return F_none_eol; } diff --git a/level_2/fll_error/c/error/common.c b/level_2/fll_error/c/error/common.c index f568569..0dd2e51 100644 --- a/level_2/fll_error/c/error/common.c +++ b/level_2/fll_error/c/error/common.c @@ -5,11 +5,25 @@ extern "C" { #endif #ifndef _di_fll_error_file_type_s_ - const f_string_static_t fll_error_file_type_directory_s = macro_f_string_static_t_initialize(FLL_error_file_type_directory_s, 0, FLL_error_file_type_directory_s_length); - const f_string_static_t fll_error_file_type_file_s = macro_f_string_static_t_initialize(FLL_error_file_type_file_s, 0, FLL_error_file_type_file_s_length); - const f_string_static_t fll_error_file_type_path_s = macro_f_string_static_t_initialize(FLL_error_file_type_path_s, 0, FLL_error_file_type_path_s_length); - const f_string_static_t fll_error_file_type_pipe_s = macro_f_string_static_t_initialize(FLL_error_file_type_pipe_s, 0, FLL_error_file_type_pipe_s_length); - const f_string_static_t fll_error_file_type_socket_s = macro_f_string_static_t_initialize(FLL_error_file_type_socket_s, 0, FLL_error_file_type_socket_s_length); + #ifndef _di_fll_error_file_type_directory_s_ + const f_string_static_t fll_error_file_type_directory_s = macro_f_string_static_t_initialize(FLL_error_file_type_directory_s, 0, FLL_error_file_type_directory_s_length); + #endif // _di_fll_error_file_type_directory_s_ + + #ifndef _di_fll_error_file_type_file_s_ + const f_string_static_t fll_error_file_type_file_s = macro_f_string_static_t_initialize(FLL_error_file_type_file_s, 0, FLL_error_file_type_file_s_length); + #endif // _di_fll_error_file_type_file_s_ + + #ifndef _di_fll_error_file_type_path_s_ + const f_string_static_t fll_error_file_type_path_s = macro_f_string_static_t_initialize(FLL_error_file_type_path_s, 0, FLL_error_file_type_path_s_length); + #endif // _di_fll_error_file_type_path_s_ + + #ifndef _di_fll_error_file_type_pipe_s_ + const f_string_static_t fll_error_file_type_pipe_s = macro_f_string_static_t_initialize(FLL_error_file_type_pipe_s, 0, FLL_error_file_type_pipe_s_length); + #endif // _di_fll_error_file_type_pipe_s_ + + #ifndef _di_fll_error_file_type_socket_s_ + const f_string_static_t fll_error_file_type_socket_s = macro_f_string_static_t_initialize(FLL_error_file_type_socket_s, 0, FLL_error_file_type_socket_s_length); + #endif // _di_fll_error_file_type_socket_s_ #endif // _di_fll_error_file_type_s_ #ifdef __cplusplus diff --git a/level_2/fll_error/c/error/common.h b/level_2/fll_error/c/error/common.h index b5ffc2b..3028dc2 100644 --- a/level_2/fll_error/c/error/common.h +++ b/level_2/fll_error/c/error/common.h @@ -59,11 +59,25 @@ extern "C" { #define FLL_error_file_type_pipe_s_length 4 #define FLL_error_file_type_socket_s_length 6 - extern const f_string_static_t fll_error_file_type_directory_s; - extern const f_string_static_t fll_error_file_type_file_s; - extern const f_string_static_t fll_error_file_type_path_s; - extern const f_string_static_t fll_error_file_type_pipe_s; - extern const f_string_static_t fll_error_file_type_socket_s; + #ifndef _di_fll_error_file_type_directory_s_ + extern const f_string_static_t fll_error_file_type_directory_s; + #endif // _di_fll_error_file_type_directory_s_ + + #ifndef _di_fll_error_file_type_file_s_ + extern const f_string_static_t fll_error_file_type_file_s; + #endif // _di_fll_error_file_type_file_s_ + + #ifndef _di_fll_error_file_type_path_s_ + extern const f_string_static_t fll_error_file_type_path_s; + #endif // _di_fll_error_file_type_path_s_ + + #ifndef _di_fll_error_file_type_pipe_s_ + extern const f_string_static_t fll_error_file_type_pipe_s; + #endif // _di_fll_error_file_type_pipe_s_ + + #ifndef _di_fll_error_file_type_socket_s_ + extern const f_string_static_t fll_error_file_type_socket_s; + #endif // _di_fll_error_file_type_socket_s_ #endif // _di_fll_error_file_type_s_ #ifdef __cplusplus diff --git a/level_2/fll_fss/c/fss/payload.c b/level_2/fll_fss/c/fss/payload.c index 710fa06..7d4e959 100644 --- a/level_2/fll_fss/c/fss/payload.c +++ b/level_2/fll_fss/c/fss/payload.c @@ -34,7 +34,7 @@ extern "C" { if (range->start >= range->stop || range->start >= buffer.used) { if (status == F_fss_found_object || status == F_fss_found_object_content_not) { - if (fl_string_dynamic_partial_compare_string(f_fss_string_payload_s.string, buffer, f_fss_string_payload_s.used, objects->array[objects->used]) == F_equal_to) { + if (fl_string_dynamic_partial_compare_string(f_fss_payload_s.string, buffer, f_fss_payload_s.used, objects->array[objects->used]) == F_equal_to) { status = F_fss_found_object_content_not; } @@ -70,7 +70,7 @@ extern "C" { contents->array[contents->used].used = 0; - if (fl_string_dynamic_partial_compare_string(f_fss_string_payload_s.string, buffer, f_fss_string_payload_s.used, objects->array[objects->used]) == F_equal_to) { + if (fl_string_dynamic_partial_compare_string(f_fss_payload_s.string, buffer, f_fss_payload_s.used, objects->array[objects->used]) == F_equal_to) { status2 = f_string_ranges_increase(state.step_small, &contents->array[contents->used]); if (F_status_is_error(status)) return status; @@ -107,7 +107,7 @@ extern "C" { contents->array[contents->used].used = 0; - if (fl_string_dynamic_partial_compare_string(f_fss_string_payload_s.string, buffer, f_fss_string_payload_s.used, objects->array[objects->used]) == F_equal_to) { + if (fl_string_dynamic_partial_compare_string(f_fss_payload_s.string, buffer, f_fss_payload_s.used, objects->array[objects->used]) == F_equal_to) { ++objects->used; status2 = f_string_ranges_increase(state.step_small, &contents->array[contents->used]); @@ -196,7 +196,7 @@ extern "C" { } if (status == F_none || status == F_none_stop || status == F_none_eos || status == F_none_eol) { - if (fl_string_dynamic_compare(f_fss_string_payload_s, object) == F_equal_to) { + if (fl_string_dynamic_compare(f_fss_payload_s, object) == F_equal_to) { status = f_string_dynamic_increase_by(content.used, destination); if (F_status_is_error(status)) return status; diff --git a/level_2/fll_program/c/program/common.c b/level_2/fll_program/c/program/common.c index 222a2c5..2a82c60 100644 --- a/level_2/fll_program/c/program/common.c +++ b/level_2/fll_program/c/program/common.c @@ -5,8 +5,13 @@ extern "C" { #endif #ifndef _di_fll_program_parameter_s_ - const f_string_static_t fll_program_parameter_filename_s = macro_f_string_static_t_initialize(FLL_program_parameter_filename_s, 0, FLL_program_parameter_filename_s_length); - const f_string_static_t fll_program_parameter_filenames_s = macro_f_string_static_t_initialize(FLL_program_parameter_filenames_s, 0, FLL_program_parameter_filenames_s_length); + #ifndef _di_fll_program_parameter_filename_s_ + const f_string_static_t fll_program_parameter_filename_s = macro_f_string_static_t_initialize(FLL_program_parameter_filename_s, 0, FLL_program_parameter_filename_s_length); + #endif // _di_fll_program_parameter_filename_s_ + + #ifndef _di_fll_program_parameter_filenames_s_ + const f_string_static_t fll_program_parameter_filenames_s = macro_f_string_static_t_initialize(FLL_program_parameter_filenames_s, 0, FLL_program_parameter_filenames_s_length); + #endif // _di_fll_program_parameter_filenames_s_ #endif // _di_fll_program_parameter_s_ #ifndef _di_fll_program_data_delete_ diff --git a/level_2/fll_program/c/program/common.h b/level_2/fll_program/c/program/common.h index 1bb9022..eebc492 100644 --- a/level_2/fll_program/c/program/common.h +++ b/level_2/fll_program/c/program/common.h @@ -23,8 +23,13 @@ extern "C" { #define FLL_program_parameter_filename_s_length 8 #define FLL_program_parameter_filenames_s_length 11 - extern const f_string_static_t fll_program_parameter_filename_s; - extern const f_string_static_t fll_program_parameter_filenames_s; + #ifndef _di_fll_program_parameter_filename_s_ + extern const f_string_static_t fll_program_parameter_filename_s; + #endif // _di_fll_program_parameter_filename_s_ + + #ifndef _di_fll_program_parameter_filenames_s_ + extern const f_string_static_t fll_program_parameter_filenames_s; + #endif // _di_fll_program_parameter_filenames_s_ #endif // _di_fll_program_parameter_s_ /** diff --git a/level_3/control/c/private-control.c b/level_3/control/c/private-control.c index 2b238d0..fe4fb5d 100644 --- a/level_3/control/c/private-control.c +++ b/level_3/control/c/private-control.c @@ -141,7 +141,7 @@ extern "C" { f_status_t status = F_none; { - f_array_length_t length = 5 + f_fss_string_header_s.used + f_fss_string_payload_s.used; + f_array_length_t length = 5 + f_fss_header_s.used + f_fss_payload_s.used; length += control_action_s.used + control_length_s.used + control_type_s.used; length += (f_fss_payload_list_open_s.used + f_fss_payload_list_close_s.used) * 2; length += (f_fss_payload_header_open_s.used + f_fss_payload_header_close_s.used) * 3; @@ -216,13 +216,13 @@ extern "C" { if (F_status_is_error(status)) return status; // Payload Packet: Header. - status = fll_fss_payload_write(f_fss_string_header_s, data->cache.large, F_false, 0, state, &data->cache.packet); + status = fll_fss_payload_write(f_fss_header_s, data->cache.large, F_false, 0, state, &data->cache.packet); if (F_status_is_error(status)) return status; // Payload Packet: Payload. data->cache.large.used = 0; - status = fll_fss_payload_write(f_fss_string_payload_s, data->cache.large, F_false, 0, state, &data->cache.packet); + status = fll_fss_payload_write(f_fss_payload_s, data->cache.large, F_false, 0, state, &data->cache.packet); if (F_status_is_error(status)) return status; // Construct Packet Size Block. @@ -349,28 +349,28 @@ extern "C" { for (; i < data->cache.packet_objects.used; ++i) { - if (fl_string_dynamic_partial_compare_string(f_fss_string_header_s.string, data->cache.large, f_fss_string_header_s.used, data->cache.packet_objects.array[i]) == F_equal_to) { + if (fl_string_dynamic_partial_compare_string(f_fss_header_s.string, data->cache.large, f_fss_header_s.used, data->cache.packet_objects.array[i]) == F_equal_to) { // The FSS-000E (Payload) standard does not prohibit multiple "header", but such cases are not supported by the controller and the control programs. if (content_header) { - control_print_debug_packet_message(main, "Multiple %[" F_fss_string_header_s "%] found in response packet", 0, 0, 0); + control_print_debug_packet_message(main, "Multiple %[" F_fss_header_s "%] found in response packet", 0, 0, 0); return F_status_set_error(F_payload_not); } content_header = &data->cache.packet_contents.array[i]; } - else if (fl_string_dynamic_partial_compare_string(f_fss_string_payload_s.string, data->cache.large, f_fss_string_payload_s.used, data->cache.packet_objects.array[i]) == F_equal_to) { + else if (fl_string_dynamic_partial_compare_string(f_fss_payload_s.string, data->cache.large, f_fss_payload_s.used, data->cache.packet_objects.array[i]) == F_equal_to) { // Only a single "payload" is supported by the FSS-000E (Payload) standard. if (content_payload) { - control_print_debug_packet_message(main, "Multiple %[" F_fss_string_payload_s "%] found in response packet", 0, 0, 0); + control_print_debug_packet_message(main, "Multiple %[" F_fss_payload_s "%] found in response packet", 0, 0, 0); return F_status_set_error(F_payload_not); } if (i + 1 < data->cache.packet_contents.used) { - control_print_debug_packet_message(main, "Invalid FSS Payload format, the %[" F_fss_string_payload_s "%] is required to be the last FSS Basic List Object", 0, 0, 0); + control_print_debug_packet_message(main, "Invalid FSS Payload format, the %[" F_fss_payload_s "%] is required to be the last FSS Basic List Object", 0, 0, 0); return F_status_set_error(F_payload_not); } @@ -380,13 +380,13 @@ extern "C" { } // for if (!content_header) { - control_print_debug_packet_message(main, "Did not find a %[" F_fss_string_header_s "%] in the response packet", 0, 0, 0); + control_print_debug_packet_message(main, "Did not find a %[" F_fss_header_s "%] in the response packet", 0, 0, 0); return F_status_set_error(F_payload_not); } if (!content_payload) { - control_print_debug_packet_message(main, "Did not find a %[" F_fss_string_payload_s "%] in the response packet", 0, 0, 0); + control_print_debug_packet_message(main, "Did not find a %[" F_fss_payload_s "%] in the response packet", 0, 0, 0); return F_status_set_error(F_payload_not); } @@ -422,7 +422,7 @@ extern "C" { } if (!data->cache.header_contents.used) { - control_print_debug_packet_message(main, "Did not find any Content within the %[" F_fss_string_header_s "%]", 0, 0, 0); + control_print_debug_packet_message(main, "Did not find any Content within the %[" F_fss_header_s "%]", 0, 0, 0); return F_status_set_error(F_header_not); } diff --git a/level_3/fake/c/private-build-load.c b/level_3/fake/c/private-build-load.c index 85ad81e..15480b2 100644 --- a/level_3/fake/c/private-build-load.c +++ b/level_3/fake/c/private-build-load.c @@ -42,7 +42,7 @@ extern "C" { } if (environment->used + data_build->setting.environment.used > environment->size) { - if (environment->used + data_build->setting.environment.used > f_environment_max_length) { + if (environment->used + data_build->setting.environment.used > f_environment_max_length_d) { if (data->main->error.verbosity > f_console_verbosity_quiet_e) { f_file_stream_lock(data->main->error); diff --git a/level_3/fss_payload_read/c/print.c b/level_3/fss_payload_read/c/print.c index e137488..1aa15e0 100644 --- a/level_3/fss_payload_read/c/print.c +++ b/level_3/fss_payload_read/c/print.c @@ -108,11 +108,11 @@ extern "C" { fl_print_format(" As an exceptional case, a %[%r%r%] of", print.to, print.set->notable, f_console_symbol_long_normal_s, fss_payload_read_long_depth_s, print.set->notable); fl_print_format(" %[1%] applies only to the explicit Object of", print.to, print.set->notable, print.set->notable); - fl_print_format(" '%[%r%]'.%r", print.to, print.set->notable, f_fss_string_header_s, print.set->notable, f_string_eol_s); + fl_print_format(" '%[%r%]'.%r", print.to, print.set->notable, f_fss_header_s, print.set->notable, f_string_eol_s); fl_print_format(" Content at this depth is processed as FSS-0001 Extended.%r%r", print.to, f_string_eol_s, f_string_eol_s); fl_print_format(" The Content of the explicit Object of", print.to); - fl_print_format(" '%[%r%]'", print.to, print.set->notable, f_fss_string_payload_s, print.set->notable, f_string_eol_s); + fl_print_format(" '%[%r%]'", print.to, print.set->notable, f_fss_payload_s, print.set->notable, f_string_eol_s); fl_print_format(" will not contain any Content close pipe control codes when using", print.to); fl_print_format(" %[%r%r%].%r", print.to, print.set->notable, f_console_symbol_long_normal_s, fss_payload_read_long_pipe_s, print.set->notable, f_string_eol_s); diff --git a/level_3/fss_payload_read/c/private-read.c b/level_3/fss_payload_read/c/private-read.c index 9529332..4923ed9 100644 --- a/level_3/fss_payload_read/c/private-read.c +++ b/level_3/fss_payload_read/c/private-read.c @@ -257,7 +257,7 @@ extern "C" { fl_print_format("%r%[%QThe file '%]", main->error.to, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); fl_print_format("%[%r%]", main->error.to, main->error.notable, file_name, main->error.notable); fl_print_format("%[' does not have the required Object '%]", main->error.to, main->error.context, main->error.context); - fl_print_format("%[%r%]", main->error.to, main->error.notable, f_fss_string_payload_s, main->error.notable); + fl_print_format("%[%r%]", main->error.to, main->error.notable, f_fss_payload_s, main->error.notable); fl_print_format("%['.%]%r", main->error.to, main->error.context, main->error.context, f_string_eol_s); f_file_stream_unlock(main->error.to); @@ -279,7 +279,7 @@ extern "C" { // Load the "header" information. for (f_array_length_t i = 0; i < data->objects.used; ++i) { - if (fl_string_dynamic_partial_compare_string(F_fss_string_header_s, data->buffer, F_fss_string_header_s_length, data->objects.array[i]) == F_equal_to) { + if (fl_string_dynamic_partial_compare_string(F_fss_header_s, data->buffer, F_fss_string_header_s_length, data->objects.array[i]) == F_equal_to) { f_string_range_t input_header = data->contents.array[i].array[0]; status = fll_fss_extended_read(data->buffer, state, &input_header, &data->objects_header, &data->contents_header, &data->quotes_object_header, &data->quotes_content_header, &data->delimits_object_header, &data->delimits_content_header); @@ -353,7 +353,7 @@ extern "C" { // For "headers" FSS-0001 Extended, only operate if the "header" name is true. for (f_array_length_t i = 0; i < data->objects.used; ++i) { - if (fl_string_dynamic_partial_compare_string(F_fss_string_header_s, data->buffer, F_fss_string_header_s_length, data->objects.array[i]) == F_equal_to) { + if (fl_string_dynamic_partial_compare_string(F_fss_header_s, data->buffer, F_fss_string_header_s_length, data->objects.array[i]) == F_equal_to) { if (names[i]) break; if (main->parameters.array[fss_payload_read_parameter_total_e].result & f_console_result_found_e) { @@ -448,7 +448,7 @@ extern "C" { main->signal_check = 0; } - is_payload = fl_string_dynamic_partial_compare_string(f_fss_string_payload_s.string, data->buffer, f_fss_string_payload_s.used, data->objects.array[i]) == F_equal_to; + is_payload = fl_string_dynamic_partial_compare_string(f_fss_payload_s.string, data->buffer, f_fss_payload_s.used, data->objects.array[i]) == F_equal_to; fss_payload_read_print_at(main, is_payload, i, *delimits_object, *delimits_content, data); } // for @@ -522,7 +522,7 @@ extern "C" { f_file_stream_unlock(main->output.to); } else { - is_payload = fl_string_dynamic_partial_compare_string(f_fss_string_payload_s.string, data->buffer, f_fss_string_payload_s.used, data->objects.array[i]) == F_equal_to; + is_payload = fl_string_dynamic_partial_compare_string(f_fss_payload_s.string, data->buffer, f_fss_payload_s.used, data->objects.array[i]) == F_equal_to; fss_payload_read_print_at(main, is_payload, i, *delimits_object, *delimits_content, data); } diff --git a/level_3/fss_write/c/payload/fss_write.c b/level_3/fss_write/c/payload/fss_write.c index f293460..f6e672b 100644 --- a/level_3/fss_write/c/payload/fss_write.c +++ b/level_3/fss_write/c/payload/fss_write.c @@ -188,7 +188,7 @@ extern "C" { } // When payload is provided, all data at this point is part of the payload until the end of the pipe. - if (fl_string_dynamic_compare(f_fss_string_payload_s, setting->objects.array[used_objects]) == F_equal_to) { + if (fl_string_dynamic_compare(f_fss_payload_s, setting->objects.array[used_objects]) == F_equal_to) { if (total > 1) { setting->status = f_string_dynamic_increase_by(total, &setting->contentss.array[used_contentss].array[0]); -- 1.8.3.1