From 28f9f777565585158058a0ac2aad124209fa816f Mon Sep 17 00:00:00 2001 From: Kevin Day Date: Thu, 9 Jul 2020 22:44:06 -0500 Subject: [PATCH] Update: f_fss_quoted to use the f_uint8_t types. --- level_0/f_fss/c/fss-quoted.h | 50 ++++++++++++++++++-------------------------- level_0/f_fss/c/fss.h | 1 + 2 files changed, 21 insertions(+), 30 deletions(-) diff --git a/level_0/f_fss/c/fss-quoted.h b/level_0/f_fss/c/fss-quoted.h index faaf307..ed9493c 100644 --- a/level_0/f_fss/c/fss-quoted.h +++ b/level_0/f_fss/c/fss-quoted.h @@ -41,27 +41,22 @@ extern "C" { * used: total number of allocated spaces used. */ #ifndef _di_f_fss_quoteds_ - typedef struct { - f_fss_quoted *array; + typedef f_uint8_ts f_fss_quoteds; - f_array_length size; - f_array_length used; - } f_fss_quoteds; + #define f_fss_quoteds_initialize f_uint8_ts_initialize - #define f_fss_quoteds_initialize {0, 0, 0} + #define f_macro_fss_quoteds_clear(quoteds) f_macro_uint8_ts_clear(quoteds) - #define f_macro_fss_quoteds_clear(quoteds) f_macro_memory_structure_clear(quoteds) + #define f_macro_fss_quoteds_new(status, quoteds, length) f_macro_uint8_ts_new(status, quoteds, length) - #define f_macro_fss_quoteds_new(status, quoteds, length) f_macro_memory_structure_new(status, quoteds, f_fss_quoted, length) + #define f_macro_fss_quoteds_delete(status, quoteds) f_macro_uint8_ts_delete(status, quoteds) + #define f_macro_fss_quoteds_destroy(status, quoteds) f_macro_uint8_ts_destroy(status, quoteds) - #define f_macro_fss_quoteds_delete(status, quoteds) f_macro_memory_structure_delete(status, quoteds, f_fss_quoted) - #define f_macro_fss_quoteds_destroy(status, quoteds) f_macro_memory_structure_destroy(status, quoteds, f_fss_quoted) + #define f_macro_fss_quoteds_delete_simple(quoteds) f_macro_uint8_ts_delete_simple(quoteds) + #define f_macro_fss_quoteds_destroy_simple(quoteds) f_macro_uint8_ts_destroy_simple(quoteds) - #define f_macro_fss_quoteds_delete_simple(quoteds) f_macro_memory_structure_delete_simple(quoteds, f_fss_quoted) - #define f_macro_fss_quoteds_destroy_simple(quoteds) f_macro_memory_structure_destroy_simple(quoteds, f_fss_quoted) - - #define f_macro_fss_quoteds_resize(status, quoteds, new_length) f_macro_memory_structure_resize(status, quoteds, f_fss_quoted, new_length) - #define f_macro_fss_quoteds_adjust(status, quoteds, new_length) f_macro_memory_structure_adjust(status, quoteds, f_fss_quoted, new_length) + #define f_macro_fss_quoteds_resize(status, quoteds, new_length) f_macro_uint8_ts_resize(status, quoteds, new_length) + #define f_macro_fss_quoteds_adjust(status, quoteds, new_length) f_macro_uint8_ts_adjust(status, quoteds, new_length) #endif // _di_f_fss_quoteds_ /** @@ -72,27 +67,22 @@ extern "C" { * used: total number of allocated spaces used. */ #ifndef _di_f_fss_quotedss_ - typedef struct { - f_fss_quoteds *array; - - f_array_length size; - f_array_length used; - } f_fss_quotedss; + typedef f_uint8_tss f_fss_quotedss; - #define f_fss_quotedss_initialize {0, 0, 0} + #define f_fss_quotedss_initialize f_uint8_tss_initialize - #define f_macro_fss_quotedss_clear(quotedss) f_macro_memory_structures_clear(quotedss) + #define f_macro_fss_quotedss_clear(quotedss) f_macro_uint8_tss_clear(quotedss) - #define f_macro_fss_quotedss_new(status, quotedss, length) f_macro_memory_structures_new(status, quotedss, f_fss_quoteds, length) + #define f_macro_fss_quotedss_new(status, quotedss, length) f_macro_uint8_tss_new(status, quotedss, length) - #define f_macro_fss_quotedss_delete(status, quotedss) f_macro_memory_structures_delete(status, quotedss, f_fss_quoted, f_fss_quoteds) - #define f_macro_fss_quotedss_destroy(status, quotedss) f_macro_memory_structures_destroy(status, quotedss, f_fss_quoted, f_fss_quoteds) + #define f_macro_fss_quotedss_delete(status, quotedss) f_macro_uint8_tss_delete(status, quotedss) + #define f_macro_fss_quotedss_destroy(status, quotedss) f_macro_uint8_tss_destroy(status, quotedss) - #define f_macro_fss_quotedss_delete_simple(quotedss) f_macro_memory_structures_delete_simple(quotedss, f_fss_quoted, f_fss_quoteds) - #define f_macro_fss_quotedss_destroy_simple(quotedss) f_macro_memory_structures_destroy_simple(quotedss, f_fss_quoted, f_fss_quoteds) + #define f_macro_fss_quotedss_delete_simple(quotedss) f_macro_uint8_tss_delete_simple(quotedss) + #define f_macro_fss_quotedss_destroy_simple(quotedss) f_macro_uint8_tss_destroy_simple(quotedss) - #define f_macro_fss_quotedss_resize(status, quotedss, new_length) f_macro_memory_structures_resize(status, quotedss, f_fss_quoted, f_fss_quoteds, new_length, f_array_length) - #define f_macro_fss_quotedss_adjust(status, quotedss, new_length) f_macro_memory_structures_adjust(status, quotedss, f_fss_quoted, f_fss_quoteds, new_length, f_array_length) + #define f_macro_fss_quotedss_resize(status, quotedss, new_length) f_macro_uint8_tss_resize(status, quotedss, new_length) + #define f_macro_fss_quotedss_adjust(status, quotedss, new_length) f_macro_uint8_tss_adjust(status, quotedss, new_length) #endif // _di_f_fss_quotedss_ #ifdef __cplusplus diff --git a/level_0/f_fss/c/fss.h b/level_0/f_fss/c/fss.h index bc4726b..a7d39c6 100644 --- a/level_0/f_fss/c/fss.h +++ b/level_0/f_fss/c/fss.h @@ -18,6 +18,7 @@ // fll-0 includes #include #include +#include #include #include #include -- 1.8.3.1