From 9b97ae514954a1ff73caff7f8522e2321ff60bda Mon Sep 17 00:00:00 2001 From: Kevin Day Date: Tue, 6 Dec 2022 21:20:29 -0600 Subject: [PATCH] Bugfix: Incorrect ifndef defines for some functions and structures. The _di_string_ascii_s_ is incorrect and should instead be _di_f_string_ascii_s_. These have been exposed while building the stand alone which is very sensitive to the defines. --- level_0/f_file/c/private-file.c | 8 ++++---- level_0/f_string/c/string/static.h | 4 ++-- level_0/f_utf/c/utf/private-dynamic.c | 4 ++-- level_0/f_utf/c/utf/private-dynamic.h | 9 +++++++-- 4 files changed, 15 insertions(+), 10 deletions(-) diff --git a/level_0/f_file/c/private-file.c b/level_0/f_file/c/private-file.c index acaa20e..72764dd 100644 --- a/level_0/f_file/c/private-file.c +++ b/level_0/f_file/c/private-file.c @@ -670,7 +670,7 @@ extern "C" { } #endif // !defined(_di_f_file_role_change_at_) || !defined(_di_f_file_copy_at_) -#if !defined(_di_f_file_stat_) || !defined(_di_f_file_copy_) +#if !defined(_di_f_file_stat_) || !defined(_di_f_file_copy_) || !defined(_di_f_file_exists_) || !defined(_di_f_file_is_) || !defined(_di_f_file_touch_) f_status_t private_f_file_stat(const f_string_static_t path, const bool dereference, struct stat * const file_stat) { if ((dereference ? stat(path.string, file_stat) : lstat(path.string, file_stat)) < 0) { @@ -689,9 +689,9 @@ extern "C" { return F_none; } -#endif // !defined(_di_f_file_stat_) || !defined(_di_f_file_copy_) +#endif // !defined(_di_f_file_stat_) || !defined(_di_f_file_copy_) || !defined(_di_f_file_exists_) || !defined(_di_f_file_is_) || !defined(_di_f_file_touch_) -#if !defined(_di_f_file_stat_at_) || !defined(_di_f_file_copy_at_) +#if !defined(_di_f_file_stat_at_) || !defined(_di_f_file_exists_at_) || !defined(_di_f_file_touch_at_) f_status_t private_f_file_stat_at(const int at_id, const f_string_static_t path, const int flag, struct stat * const file_stat) { if (fstatat(at_id, path.string, file_stat, flag) < 0) { @@ -711,7 +711,7 @@ extern "C" { return F_none; } -#endif // !defined(_di_f_file_stat_at_) || !defined(_di_f_file_copy_at_) +#endif // !defined(_di_f_file_stat_at_) || !defined(_di_f_file_exists_at_) || !defined(_di_f_file_touch_at_) #if !defined(_di_f_file_stat_by_id_) || !defined(_di_f_file_size_by_id_) f_status_t private_f_file_stat_by_id(const int id, struct stat * const file_stat) { diff --git a/level_0/f_string/c/string/static.h b/level_0/f_string/c/string/static.h index e314f53..68d5c0c 100644 --- a/level_0/f_string/c/string/static.h +++ b/level_0/f_string/c/string/static.h @@ -145,7 +145,7 @@ extern "C" { * The NULL ASCII string can be represented by the integer 0; however, given that these are all NULL-terminated strings the NULL character is represented with a NULL termination as well. * The NULL ASCII string therefore has two NULLs, first the NULL represents the NULL and the second represents the NULL termination. */ -#ifndef _di_string_ascii_s_ +#ifndef _di_f_string_ascii_s_ #define F_string_ascii_0_s "0" #define F_string_ascii_1_s "1" #define F_string_ascii_2_s "2" @@ -541,7 +541,7 @@ extern "C" { extern const f_string_static_t f_string_ascii_text_stop_s; extern const f_string_static_t f_string_ascii_transmission_stop_s; extern const f_string_static_t f_string_ascii_transmission_block_end_s; -#endif // _di_string_ascii_s_ +#endif // _di_f_string_ascii_s_ /** * Define the end of line character. diff --git a/level_0/f_utf/c/utf/private-dynamic.c b/level_0/f_utf/c/utf/private-dynamic.c index f2564a7..34c43fa 100644 --- a/level_0/f_utf/c/utf/private-dynamic.c +++ b/level_0/f_utf/c/utf/private-dynamic.c @@ -130,7 +130,7 @@ extern "C" { } #endif // !defined(_di_f_utf_string_dynamics_append_all_) || !defined(_di_f_utf_string_map_multis_append_) || !defined(_di_f_utf_string_map_multis_append_all_) -#if !defined(_di_f_utf_string_dynamics_decrease_by_) || !defined(_di_f_utf_string_dynamics_increase_) || !defined(_di_f_utf_string_dynamics_increase_by_) || !defined(_di_f_utf_string_map_multis_append_) +#if !defined(_di_f_utf_string_dynamics_decrease_by_) || !defined(_di_f_utf_string_dynamics_increase_) || !defined(_di_f_utf_string_dynamics_increase_by_) || !defined(_di_f_utf_string_map_multis_append_) || !defined(_di_f_utf_string_map_multis_decrease_by_) || !defined(_di_f_utf_string_map_multis_increase_) || !defined(_di_f_utf_string_map_multis_increase_by_) || !defined(_di_f_utf_string_map_multis_terminate_) || !defined(_di_f_utf_string_map_multis_terminate_after_) f_status_t private_f_utf_string_dynamics_resize(const f_array_length_t length, f_utf_string_dynamics_t * const dynamics) { if (dynamics->used + length > F_array_length_t_size_d) { @@ -156,7 +156,7 @@ extern "C" { return F_none; } -#endif // !defined(_di_f_utf_string_dynamics_decrease_by_) || !defined(_di_f_utf_string_dynamics_increase_) || !defined(_di_f_utf_string_dynamics_increase_by_) || !defined(_di_f_utf_string_map_multis_append_) +#endif // !defined(_di_f_utf_string_dynamics_decrease_by_) || !defined(_di_f_utf_string_dynamics_increase_) || !defined(_di_f_utf_string_dynamics_increase_by_) || !defined(_di_f_utf_string_map_multis_append_) || !defined(_di_f_utf_string_map_multis_decrease_by_) || !defined(_di_f_utf_string_map_multis_increase_) || !defined(_di_f_utf_string_map_multis_increase_by_) || !defined(_di_f_utf_string_map_multis_terminate_) || !defined(_di_f_utf_string_map_multis_terminate_after_) #if !defined(_di_f_utf_string_dynamicss_adjust_) || !defined(_di_f_utf_string_dynamicss_append_) || !defined(_di_f_utf_string_dynamicss_decimate_by_) || !defined(_di_f_utf_string_map_multis_adjust_) || !defined(_di_f_utf_string_map_multis_append_) f_status_t private_f_utf_string_dynamicss_adjust(const f_array_length_t length, f_utf_string_dynamicss_t * const dynamicss) { diff --git a/level_0/f_utf/c/utf/private-dynamic.h b/level_0/f_utf/c/utf/private-dynamic.h index 41689b5..c7f5837 100644 --- a/level_0/f_utf/c/utf/private-dynamic.h +++ b/level_0/f_utf/c/utf/private-dynamic.h @@ -244,10 +244,15 @@ extern "C" { * @see f_utf_string_dynamics_increase() * @see f_utf_string_dynamics_increase_by() * @see f_utf_string_map_multis_append() + * @see f_utf_string_map_multis_decrease_by() + * @see f_utf_string_map_multis_increase() + * @see f_utf_string_map_multis_increase_by() + * @see f_utf_string_map_multis_terminate() + * @see f_utf_string_map_multis_terminate_after() */ -#if !defined(_di_f_utf_string_dynamics_decrease_by_) || !defined(_di_f_utf_string_dynamics_increase_) || !defined(_di_f_utf_string_dynamics_increase_by_) || !defined(_di_f_utf_string_map_multis_append_) +#if !defined(_di_f_utf_string_dynamics_decrease_by_) || !defined(_di_f_utf_string_dynamics_increase_) || !defined(_di_f_utf_string_dynamics_increase_by_) || !defined(_di_f_utf_string_map_multis_append_) || !defined(_di_f_utf_string_map_multis_decrease_by_) || !defined(_di_f_utf_string_map_multis_increase_) || !defined(_di_f_utf_string_map_multis_increase_by_) || !defined(_di_f_utf_string_map_multis_terminate_) || !defined(_di_f_utf_string_map_multis_terminate_after_) extern f_status_t private_f_utf_string_dynamics_resize(const f_array_length_t length, f_utf_string_dynamics_t * const dynamics) F_attribute_visibility_internal_d; -#endif // !defined(_di_f_utf_string_dynamics_decrease_by_) || !defined(_di_f_utf_string_dynamics_increase_) || !defined(_di_f_utf_string_dynamics_increase_by_) || !defined(_di_f_utf_string_map_multis_append_) +#endif // !defined(_di_f_utf_string_dynamics_decrease_by_) || !defined(_di_f_utf_string_dynamics_increase_) || !defined(_di_f_utf_string_dynamics_increase_by_) || !defined(_di_f_utf_string_map_multis_append_) || !defined(_di_f_utf_string_map_multis_decrease_by_) || !defined(_di_f_utf_string_map_multis_increase_) || !defined(_di_f_utf_string_map_multis_increase_by_) || !defined(_di_f_utf_string_map_multis_terminate_) || !defined(_di_f_utf_string_map_multis_terminate_after_) /** * Private implementation for resizing. -- 1.8.3.1