From 5ca6578b6d11413c739dad641674de62a43ebfe0 Mon Sep 17 00:00:00 2001 From: Kevin Day Date: Sat, 14 May 2022 16:34:48 -0500 Subject: [PATCH] Bugfix: Incorrect and missing initializer macros in f_fss. --- level_0/f_fss/c/fss/common.h | 2 +- level_0/f_fss/c/fss/named.h | 6 +++--- level_0/f_fss/c/fss/quote.h | 8 ++++---- level_0/f_fss/c/fss/set.h | 3 +++ 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/level_0/f_fss/c/fss/common.h b/level_0/f_fss/c/fss/common.h index 5f8d9e9..9a8cb12 100644 --- a/level_0/f_fss/c/fss/common.h +++ b/level_0/f_fss/c/fss/common.h @@ -356,7 +356,7 @@ enum { #define macro_f_fss_contents_t_delete_simple(contents) macro_f_string_rangess_t_delete_simple(contents) #define macro_f_fss_contents_t_destroy_simple(contents) macro_f_string_rangess_t_destroy_simple(contents) - #define macro_f_fss_contents_t_increase(status, step, contents) macro_f_string_rangess_t_increase(status, step, contents) + #define macro_f_fss_contents_t_increase(status, step, contents) macro_f_string_rangess_t_increase(status, step, contents) #define macro_f_fss_contents_t_increase_by(status, contents, amount) macro_f_string_rangess_t_increase_by(status, contents, amount) #define macro_f_fss_contents_t_decrease_by(status, contents, amount) macro_f_string_rangess_t_decrease_by(status, contents, amount) #define macro_f_fss_contents_t_decimate_by(status, contents, amount) macro_f_string_rangess_t_decimate_by(status, contents, amount) diff --git a/level_0/f_fss/c/fss/named.h b/level_0/f_fss/c/fss/named.h index b07ccd4..f7110dc 100644 --- a/level_0/f_fss/c/fss/named.h +++ b/level_0/f_fss/c/fss/named.h @@ -52,7 +52,7 @@ extern "C" { #define macro_f_fss_named_t_delete_simple(named) f_fss_named_resize(0, &named); #define macro_f_fss_named_t_destroy_simple(named) f_fss_named_adjust(0, &named); - #define macro_f_fss_named_t_increase(status, step, named) status = f_fss_named_increase(step, &named); + #define macro_f_fss_named_t_increase(status, step, named) status = f_fss_named_increase(step, &named); #define macro_f_fss_named_t_increase_by(status, named, amount) status = f_fss_named_increase_by(amount, &named); #define macro_f_fss_named_t_decrease_by(status, named, amount) status = f_fss_named_decrease_by(amount, &named); #define macro_f_fss_named_t_decimate_by(status, named, amount) status = f_fss_named_decimate_by(amount, &named); @@ -75,8 +75,8 @@ extern "C" { #define f_fss_nameds_t_initialize { 0, 0, 0 } - #define macro_f_fss_nameds_t_initialize(array, size, used) macro_f_fss_nameds_t_initialize(array, size, used) - #define macro_f_fss_nameds_t_initialize2(array, length) macro_f_fss_nameds_t_initialize2(array, length) + #define macro_f_fss_nameds_t_initialize(array, size, used) { array, size, used } + #define macro_f_fss_nameds_t_initialize2(array, length) { array, length, length } #define macro_f_fss_nameds_t_clear(nameds) macro_f_memory_structure_clear(nameds); diff --git a/level_0/f_fss/c/fss/quote.h b/level_0/f_fss/c/fss/quote.h index 0d2b3ab..1741b0a 100644 --- a/level_0/f_fss/c/fss/quote.h +++ b/level_0/f_fss/c/fss/quote.h @@ -51,8 +51,8 @@ extern "C" { #define f_fss_quotes_t_initialize f_uint8s_t_initialize - #define macro_f_fss_quotes_t_initialize(array, size, used) macro_f_uint8s_t_initialize(array, size, used) - #define macro_f_fss_quotes_t_initialize2(array, length) macro_f_uint8s_t_initialize2(array, length) + #define macro_f_fss_quotes_t_initialize(array, size, used) { array, size, used } + #define macro_f_fss_quotes_t_initialize2(array, length) { array, length, length } #define macro_f_fss_quotes_t_clear(quotes) macro_f_uint8s_t_clear(quotes) @@ -80,8 +80,8 @@ extern "C" { #define f_fss_quotess_t_initialize f_uint8ss_t_initialize - #define macro_f_fss_quotess_t_initialize(array, size, used) macro_f_uint8ss_t_initialize(array, size, used) - #define macro_f_fss_quotess_t_initialize2(array, length) macro_f_uint8ss_t_initialize2(array, length) + #define macro_f_fss_quotess_t_initialize(array, size, used) { array, size, used } + #define macro_f_fss_quotess_t_initialize2(array, length) { array, length, length } #define macro_f_fss_quotess_t_clear(quotess) macro_f_uint8ss_t_clear(quotess) diff --git a/level_0/f_fss/c/fss/set.h b/level_0/f_fss/c/fss/set.h index 060b355..8fc48c6 100644 --- a/level_0/f_fss/c/fss/set.h +++ b/level_0/f_fss/c/fss/set.h @@ -68,6 +68,9 @@ extern "C" { #define f_fss_sets_t_initialize { 0, 0, 0 } + #define macro_f_fss_sets_t_initialize(array, size, used) { array, size, used } + #define macro_f_fss_sets_t_initialize2(array, length) { array, length, length } + #define macro_f_fss_sets_t_clear(sets) macro_f_memory_structure_t_clear(set.objects) #define macro_f_fss_sets_t_resize(status, sets, length) status = f_fss_sets_resize(length, &sets); -- 1.8.3.1