From f24632b2f93d3441661765603d19c1ee3ba4ceb2 Mon Sep 17 00:00:00 2001 From: Kevin Day Date: Fri, 2 Aug 2024 19:43:04 -0500 Subject: [PATCH] Bugfix: The private_f_abstruses_delete_switch() and private_f_abstruses_destroy_switch() both need wrapping defines. The previous commit a2e1999a3e5c02a980fcbe9977b059c4639ea741 has a wrong define wrapper added. The _di_f_abstruses_delete_ was added when it should instead be _di_f_abstruse_map_delete_. The private_f_abstruses_destroy_switch() is also overlooked by that commit. This adds the _di_f_abstruse_map_destroy_ to the private_f_abstruses_destroy_switch(). --- level_0/f_abstruse/c/abstruse/private-abstruse.c | 8 ++++---- level_0/f_abstruse/c/abstruse/private-abstruse.h | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/level_0/f_abstruse/c/abstruse/private-abstruse.c b/level_0/f_abstruse/c/abstruse/private-abstruse.c index 32afa22..20bfb9d 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_) || !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_abstruse_map_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,9 +176,9 @@ extern "C" { return F_okay; } -#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_) +#endif // !defined(_di_f_abstruse_map_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_) +#if !defined(_di_f_abstruse_map_destroy_) || !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) { switch (abstruse->type) { @@ -344,7 +344,7 @@ extern "C" { return F_okay; } -#endif // !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_) +#endif // !defined(_di_f_abstruse_map_destroy_) || !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_) #ifdef __cplusplus } // extern "C" diff --git a/level_0/f_abstruse/c/abstruse/private-abstruse.h b/level_0/f_abstruse/c/abstruse/private-abstruse.h index 45003fb..c9eea03 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_) || !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_abstruse_map_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_) || !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_abstruse_map_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. @@ -53,9 +53,9 @@ extern "C" { * @see f_memory_array_adjust() * @see f_memory_arrays_adjust() */ -#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_) +#if !defined(_di_f_abstruse_map_destroy_) || !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_) extern f_status_t private_f_abstruses_destroy_switch(f_abstruse_t * const abstruse) F_attribute_visibility_internal_d; -#endif // !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_) +#endif // !defined(_di_f_abstruse_map_destroy_) || !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_) #ifdef __cplusplus } // extern "C" -- 1.8.3.1