From a2e1999a3e5c02a980fcbe9977b059c4639ea741 Mon Sep 17 00:00:00 2001 From: Kevin Day Date: Fri, 2 Aug 2024 00:13:24 -0500 Subject: [PATCH] Bugfix: Missing define wrapper for private_f_rip_find_range(), private_f_abstruses_delete_switch(), and private_fl_payload_header_map_maps(). --- level_0/f_abstruse/c/abstruse/private-abstruse.c | 4 ++-- level_0/f_abstruse/c/abstruse/private-abstruse.h | 4 ++-- level_0/f_rip/c/private-rip.c | 4 ++-- level_0/f_rip/c/private-rip.h | 9 +++++---- level_1/fl_fss/c/fss/private-payload.c | 4 ++-- level_1/fl_fss/c/fss/private-payload.h | 5 +++-- 6 files changed, 16 insertions(+), 14 deletions(-) diff --git a/level_0/f_abstruse/c/abstruse/private-abstruse.c b/level_0/f_abstruse/c/abstruse/private-abstruse.c index b37e918..32afa22 100644 --- a/level_0/f_abstruse/c/abstruse/private-abstruse.c +++ b/level_0/f_abstruse/c/abstruse/private-abstruse.c @@ -5,7 +5,7 @@ extern "C" { #endif -#if !defined(_di_f_abstruses_delete_callback_) || !defined(_di_f_abstrusess_delete_callback_) || !defined(_di_f_abstruse_maps_delete_callback_) || !defined(_di_f_abstruse_mapss_delete_callback_) +#if !defined(_di_f_abstruses_delete_) || !defined(_di_f_abstruses_delete_callback_) || !defined(_di_f_abstrusess_delete_callback_) || !defined(_di_f_abstruse_maps_delete_callback_) || !defined(_di_f_abstruse_mapss_delete_callback_) f_status_t private_f_abstruses_delete_switch(f_abstruse_t * const abstruse) { switch (abstruse->type) { @@ -176,7 +176,7 @@ extern "C" { return F_okay; } -#endif // !defined(_di_f_abstruses_delete_callback_) || !defined(_di_f_abstrusess_delete_callback_) || !defined(_di_f_abstruse_maps_delete_callback_) || !defined(_di_f_abstruse_mapss_delete_callback_) +#endif // !defined(_di_f_abstruses_delete_) || !defined(_di_f_abstruses_delete_callback_) || !defined(_di_f_abstrusess_delete_callback_) || !defined(_di_f_abstruse_maps_delete_callback_) || !defined(_di_f_abstruse_mapss_delete_callback_) #if !defined(_di_f_abstruses_destroy_callback_) || !defined(_di_f_abstrusess_destroy_callback_) || !defined(_di_f_abstruse_maps_destroy_callback_) || !defined(_di_f_abstruse_mapss_destroy_callback_) f_status_t private_f_abstruses_destroy_switch(f_abstruse_t * const abstruse) { diff --git a/level_0/f_abstruse/c/abstruse/private-abstruse.h b/level_0/f_abstruse/c/abstruse/private-abstruse.h index 7d3d98f..45003fb 100644 --- a/level_0/f_abstruse/c/abstruse/private-abstruse.h +++ b/level_0/f_abstruse/c/abstruse/private-abstruse.h @@ -32,9 +32,9 @@ extern "C" { * @see f_memory_array_resize() * @see f_memory_arrays_resize() */ -#if !defined(_di_f_abstruses_delete_callback_) || !defined(_di_f_abstrusess_delete_callback_) || !defined(_di_f_abstruse_maps_delete_callback_) || !defined(_di_f_abstruse_mapss_delete_callback_) +#if !defined(_di_f_abstruses_delete_) || !defined(_di_f_abstruses_delete_callback_) || !defined(_di_f_abstrusess_delete_callback_) || !defined(_di_f_abstruse_maps_delete_callback_) || !defined(_di_f_abstruse_mapss_delete_callback_) extern f_status_t private_f_abstruses_delete_switch(f_abstruse_t * const abstruse) F_attribute_visibility_internal_d; -#endif // !defined(_di_f_abstruses_delete_callback_) || !defined(_di_f_abstrusess_delete_callback_) || !defined(_di_f_abstruse_maps_delete_callback_) || !defined(_di_f_abstruse_mapss_delete_callback_) +#endif // !defined(_di_f_abstruses_delete_) || !defined(_di_f_abstruses_delete_callback_) || !defined(_di_f_abstrusess_delete_callback_) || !defined(_di_f_abstruse_maps_delete_callback_) || !defined(_di_f_abstruse_mapss_delete_callback_) /** * Helper function for abstruse destroy callbacks, performing the switch logic against the abstruse type. diff --git a/level_0/f_rip/c/private-rip.c b/level_0/f_rip/c/private-rip.c index 969bd54..e8d8777 100644 --- a/level_0/f_rip/c/private-rip.c +++ b/level_0/f_rip/c/private-rip.c @@ -5,7 +5,7 @@ extern "C" { #endif -#if !defined(_di_f_rip_dynamic_partial_) || !defined(_di_f_rip_dynamic_partial_nulless_) || !defined(_di_f_rip_dynamic_) || !defined(_di_f_rip_) || !defined(_di_f_rip_nulless_) +#if !defined(_di_f_rip_) || !defined(_di_f_rip_dynamic_) || !defined(_di_f_rip_dynamic_nulless_) || !defined(_di_f_rip_dynamic_partial_) || !defined(_di_f_rip_dynamic_partial_nulless_) || !defined(_di_f_rip_nulless_) f_status_t private_f_rip_find_range(const f_string_t string, f_number_unsigned_t * const start, f_number_unsigned_t * const stop) { const f_number_unsigned_t stop_original = *stop; @@ -112,7 +112,7 @@ extern "C" { return F_okay; } -#endif // !defined(_di_f_rip_dynamic_partial_) || !defined(_di_f_rip_dynamic_partial_nulless_) || !defined(_di_f_rip_dynamic_) || !defined(_di_f_rip_) || !defined(_di_f_rip_nulless_) +#endif // !defined(_di_f_rip_) || !defined(_di_f_rip_dynamic_) || !defined(_di_f_rip_dynamic_nulless_) || !defined(_di_f_rip_dynamic_partial_) || !defined(_di_f_rip_dynamic_partial_nulless_) || !defined(_di_f_rip_nulless_) #ifdef __cplusplus } // extern "C" diff --git a/level_0/f_rip/c/private-rip.h b/level_0/f_rip/c/private-rip.h index 924aadd..f53f9cc 100644 --- a/level_0/f_rip/c/private-rip.h +++ b/level_0/f_rip/c/private-rip.h @@ -41,15 +41,16 @@ extern "C" { * @see f_utf_is_combining() * @see f_utf_is_whitespace() * + * @see f_rip() + * @see f_rip_dynamic() + * @see f_rip_dynamic_nulless() * @see f_rip_dynamic_partial() * @see f_rip_dynamic_partial_nulless() - * @see f_rip_dynamic() - * @see f_rip() * @see f_rip_nulless() */ -#if !defined(_di_f_rip_dynamic_partial_) || !defined(_di_f_rip_dynamic_partial_nulless_) || !defined(_di_f_rip_dynamic_) || !defined(_di_f_rip_) || !defined(_di_f_rip_nulless_) +#if !defined(_di_f_rip_) || !defined(_di_f_rip_dynamic_) || !defined(_di_f_rip_dynamic_nulless_) || !defined(_di_f_rip_dynamic_partial_) || !defined(_di_f_rip_dynamic_partial_nulless_) || !defined(_di_f_rip_nulless_) extern f_status_t private_f_rip_find_range(const f_string_t string, f_number_unsigned_t * const start, f_number_unsigned_t * const stop) F_attribute_visibility_internal_d; -#endif // !defined(_di_f_rip_dynamic_partial_) || !defined(_di_f_rip_dynamic_partial_nulless_) || !defined(_di_f_rip_dynamic_) || !defined(_di_f_rip_) || !defined(_di_f_rip_nulless_) +#endif // !defined(_di_f_rip_) || !defined(_di_f_rip_dynamic_) || !defined(_di_f_rip_dynamic_nulless_) || !defined(_di_f_rip_dynamic_partial_) || !defined(_di_f_rip_dynamic_partial_nulless_) || !defined(_di_f_rip_nulless_) #ifdef __cplusplus } // extern "C" diff --git a/level_1/fl_fss/c/fss/private-payload.c b/level_1/fl_fss/c/fss/private-payload.c index 7ce936d..7344551 100644 --- a/level_1/fl_fss/c/fss/private-payload.c +++ b/level_1/fl_fss/c/fss/private-payload.c @@ -667,7 +667,7 @@ extern "C" { } #endif // !defined(_di_fl_fss_payload_header_maps_) -#if !defined(_di_fl_fss_payload_header_maps_) +#if !defined(_di_fl_fss_payload_header_map_) || !defined(_di_fl_fss_payload_header_maps_) uint8_t private_fl_payload_header_map_maps(fl_fss_payload_header_state_t * const data, f_state_t * const state, fl_fss_payload_header_internal_t * const internal, f_string_maps_t * const maps, f_string_maps_t * const destinations) { if (maps->used) { @@ -919,7 +919,7 @@ extern "C" { return F_false; } -#endif // !defined(_di_fl_fss_payload_header_maps_) +#endif // !defined(_di_fl_fss_payload_header_map_) || !defined(_di_fl_fss_payload_header_maps_) #if !defined(_di_fl_fss_payload_header_map_) uint8_t private_fl_payload_header_map_number_signed(fl_fss_payload_header_state_t * const data, f_state_t * const state, fl_fss_payload_header_internal_t * const internal, const f_number_signed_t number) { diff --git a/level_1/fl_fss/c/fss/private-payload.h b/level_1/fl_fss/c/fss/private-payload.h index 553787f..dacfd2a 100644 --- a/level_1/fl_fss/c/fss/private-payload.h +++ b/level_1/fl_fss/c/fss/private-payload.h @@ -252,10 +252,11 @@ extern "C" { * @see private_fl_fss_basic_write() * * @see fl_fss_payload_header_map() + * @see fl_fss_payload_header_maps() */ -#if !defined(_di_fl_fss_payload_header_maps_) +#if !defined(_di_fl_fss_payload_header_map_) || !defined(_di_fl_fss_payload_header_maps_) extern uint8_t private_fl_payload_header_map_maps(fl_fss_payload_header_state_t * const data, f_state_t * const state, fl_fss_payload_header_internal_t * const internal, f_string_maps_t * const maps, f_string_maps_t * const destinations) F_attribute_visibility_internal_d; -#endif // !defined(_di_fl_fss_payload_header_maps_) +#endif // !defined(_di_fl_fss_payload_header_map_) || !defined(_di_fl_fss_payload_header_maps_) /** * Process the signed number, converting it to a string and appending that string onto data->cache. -- 1.8.3.1