From: Kevin Day Date: Sun, 10 May 2020 05:47:04 +0000 (-0500) Subject: Feature: add f_utf_string_static as a non-allocated alternative to f_utf_string_dynamic X-Git-Tag: 0.5.0~267 X-Git-Url: https://git.kevux.org/?a=commitdiff_plain;h=f9a07dd92f99638fd7aa278879772e4fad28f0cf;p=fll Feature: add f_utf_string_static as a non-allocated alternative to f_utf_string_dynamic The is the UTF-8 string equivalent of the f_string_static type. --- diff --git a/level_0/f_utf/c/utf.h b/level_0/f_utf/c/utf.h index a866d32..f030854 100644 --- a/level_0/f_utf/c/utf.h +++ b/level_0/f_utf/c/utf.h @@ -257,26 +257,43 @@ extern "C" { #endif // _di_f_utf_string_ranges_ /** - * A string that supports contains a size attribute to handle dynamic allocations and deallocations. - * save the string size along with the string, so that strlen(..) commands can be avoided as much as possible. + * A string that is analogous to f_utf_string_dynamic but intended for static-only uses. * - * size: total amount of allocated space. - * used: total number of allocated spaces used. + * The f_utf_string_static type should never be directly allocated or deallocated. + * + * string: the string. + * size: total amount of space available. + * used: total number of space used. */ -#ifndef _di_f_utf_string_dynamic_ +#ifndef _di_f_utf_string_static_ typedef struct { f_utf_string string; f_utf_string_length size; f_utf_string_length used; - } f_utf_string_dynamic; + } f_utf_string_static; + + #define f_utf_string_static_initialize { f_utf_string_initialize, 0, 0 } + + #define f_macro_utf_string_static_clear(string_static) \ + string_static.string = 0; \ + string_static.size = 0; \ + string_static.used = 0; +#endif // _di_f_string_static_ + +/** + * A string that supports contains a size attribute to handle dynamic allocations and deallocations. + * save the string size along with the string, so that strlen(..) commands can be avoided as much as possible. + * + * size: total amount of allocated space. + * used: total number of allocated spaces used. + */ +#ifndef _di_f_utf_string_dynamic_ + typedef f_utf_string_static f_utf_string_dynamic; - #define f_utf_string_dynamic_initialize { f_utf_string_initialize, 0, 0 } + #define f_utf_string_dynamic_initialize f_utf_string_static_initialize - #define f_clear_utf_string_dynamic(dynamic) \ - dynamic.string = 0; \ - dynamic.size = 0; \ - dynamic.used = 0; + #define f_clear_utf_string_dynamic(dynamic) f_macro_utf_string_static_clear(dynamic) #define f_macro_utf_string_dynamic_new(status, dynamic, new_length) \ f_clear_utf_string_dynamic(dynamic) \ diff --git a/level_1/fl_print/c/print.c b/level_1/fl_print/c/print.c index 801dbc7..27a1435 100644 --- a/level_1/fl_print/c/print.c +++ b/level_1/fl_print/c/print.c @@ -366,7 +366,7 @@ extern "C" { #endif // _di_fl_print_trim_utf_string_ #ifndef _di_fl_print_trim_utf_string_dynamic_ - f_return_status fl_print_trim_utf_string_dynamic(FILE *output, const f_utf_string_dynamic buffer) { + f_return_status fl_print_trim_utf_string_dynamic(FILE *output, const f_utf_string_static buffer) { #ifndef _di_level_1_parameter_checking_ if (buffer.used <= 0) return f_status_set_error(f_invalid_parameter); #endif // _di_level_1_parameter_checking_ @@ -448,7 +448,7 @@ extern "C" { #endif // _di_fl_print_trim_utf_string_dynamic_ #ifndef _di_fl_print_trim_utf_string_dynamic_partial_ - f_return_status fl_print_trim_utf_string_dynamic_partial(FILE *output, const f_utf_string_dynamic buffer, const f_utf_string_range range) { + f_return_status fl_print_trim_utf_string_dynamic_partial(FILE *output, const f_utf_string_static buffer, const f_utf_string_range range) { #ifndef _di_level_1_parameter_checking_ if (range.start < 0) return f_status_set_error(f_invalid_parameter); if (range.stop < range.start) return f_status_set_error(f_invalid_parameter); diff --git a/level_1/fl_print/c/print.h b/level_1/fl_print/c/print.h index 153fbad..a4cb36e 100644 --- a/level_1/fl_print/c/print.h +++ b/level_1/fl_print/c/print.h @@ -154,7 +154,7 @@ extern "C" { * f_incomplete_utf (with error bit) if character is an incomplete UTF-8 fragment. */ #ifndef _di_fl_print_trim_utf_string_dynamic_ - extern f_return_status fl_print_trim_utf_string_dynamic(FILE *output, const f_utf_string_dynamic buffer); + extern f_return_status fl_print_trim_utf_string_dynamic(FILE *output, const f_utf_string_static buffer); #endif // _di_fl_print_trim_utf_string_dynamic_ /** @@ -181,7 +181,7 @@ extern "C" { * f_incomplete_utf (with error bit) if character is an incomplete UTF-8 fragment. */ #ifndef _di_fl_print_trim_utf_string_dynamic_partial_ - extern f_return_status fl_print_trim_utf_string_dynamic_partial(FILE *output, const f_utf_string_dynamic buffer, const f_utf_string_range range); + extern f_return_status fl_print_trim_utf_string_dynamic_partial(FILE *output, const f_utf_string_static buffer, const f_utf_string_range range); #endif // _di_fl_print_trim_utf_string_dynamic_partial_ #ifdef __cplusplus diff --git a/level_1/fl_utf/c/utf.c b/level_1/fl_utf/c/utf.c index 0d82090..d3f99b1 100644 --- a/level_1/fl_utf/c/utf.c +++ b/level_1/fl_utf/c/utf.c @@ -128,7 +128,7 @@ extern "C" { #endif // _di_fl_utf_string_compare_trim_ #ifndef _di_fl_utf_string_dynamic_append_ - f_return_status fl_utf_string_dynamic_append(const f_utf_string_dynamic source, f_utf_string_dynamic *destination) { + f_return_status fl_utf_string_dynamic_append(const f_utf_string_static source, f_utf_string_dynamic *destination) { #ifndef _di_level_1_parameter_checking_ if (destination == 0) return f_status_set_error(f_invalid_parameter); #endif // _di_level_1_parameter_checking_ @@ -140,7 +140,7 @@ extern "C" { #endif // _di_fl_utf_string_dynamic_append_ #ifndef _di_fl_utf_string_dynamic_append_assure_ - f_return_status fl_utf_string_dynamic_append_assure(const f_utf_string_dynamic source, f_utf_string_dynamic *destination) { + f_return_status fl_utf_string_dynamic_append_assure(const f_utf_string_static source, f_utf_string_dynamic *destination) { #ifndef _di_level_1_parameter_checking_ if (destination == 0) return f_status_set_error(f_invalid_parameter); #endif // _di_level_1_parameter_checking_ @@ -178,7 +178,7 @@ extern "C" { #endif // _di_fl_utf_string_dynamic_append_assure_ #ifndef _di_fl_utf_string_dynamic_append_assure_nulless_ - f_return_status fl_utf_string_dynamic_append_assure_nulless(const f_utf_string_dynamic source, f_utf_string_dynamic *destination) { + f_return_status fl_utf_string_dynamic_append_assure_nulless(const f_utf_string_static source, f_utf_string_dynamic *destination) { #ifndef _di_level_1_parameter_checking_ if (destination == 0) return f_status_set_error(f_invalid_parameter); #endif // _di_level_1_parameter_checking_ @@ -216,7 +216,7 @@ extern "C" { #endif // _di_fl_utf_string_dynamic_append_assure_nulless_ #ifndef _di_fl_utf_string_dynamic_append_nulless_ - f_return_status fl_utf_string_dynamic_append_nulless(const f_utf_string_dynamic source, f_utf_string_dynamic *destination) { + f_return_status fl_utf_string_dynamic_append_nulless(const f_utf_string_static source, f_utf_string_dynamic *destination) { #ifndef _di_level_1_parameter_checking_ if (destination == 0) return f_status_set_error(f_invalid_parameter); #endif // _di_level_1_parameter_checking_ @@ -228,7 +228,7 @@ extern "C" { #endif // _di_fl_utf_string_dynamic_append_nulless_ #ifndef _di_fl_utf_string_dynamic_mash_ - f_return_status fl_utf_string_dynamic_mash(const f_utf_string glue, const f_utf_string_length glue_length, const f_utf_string_dynamic source, f_utf_string_dynamic *destination) { + f_return_status fl_utf_string_dynamic_mash(const f_utf_string glue, const f_utf_string_length glue_length, const f_utf_string_static source, f_utf_string_dynamic *destination) { #ifndef _di_level_1_parameter_checking_ if (destination == 0) return f_status_set_error(f_invalid_parameter); #endif // _di_level_1_parameter_checking_ @@ -248,7 +248,7 @@ extern "C" { #endif // _di_fl_utf_string_dynamic_mash_ #ifndef _di_fl_utf_string_dynamic_mash_nulless_ - f_return_status fl_utf_string_dynamic_mash_nulless(const f_utf_string glue, const f_utf_string_length glue_length, const f_utf_string_dynamic source, f_utf_string_dynamic *destination) { + f_return_status fl_utf_string_dynamic_mash_nulless(const f_utf_string glue, const f_utf_string_length glue_length, const f_utf_string_static source, f_utf_string_dynamic *destination) { #ifndef _di_level_1_parameter_checking_ if (destination == 0) return f_status_set_error(f_invalid_parameter); #endif // _di_level_1_parameter_checking_ @@ -268,7 +268,7 @@ extern "C" { #endif // _di_fl_utf_string_dynamic_mash_nulless_ #ifndef _di_fl_utf_string_dynamic_mish_ - f_return_status fl_utf_string_dynamic_mish(const f_utf_string glue, const f_utf_string_length glue_length, const f_utf_string_dynamic source, f_utf_string_dynamic *destination) { + f_return_status fl_utf_string_dynamic_mish(const f_utf_string glue, const f_utf_string_length glue_length, const f_utf_string_static source, f_utf_string_dynamic *destination) { #ifndef _di_level_1_parameter_checking_ if (destination == 0) return f_status_set_error(f_invalid_parameter); #endif // _di_level_1_parameter_checking_ @@ -288,7 +288,7 @@ extern "C" { #endif // _di_fl_utf_string_dynamic_mish_ #ifndef _di_fl_utf_string_dynamic_mish_nulless_ - f_return_status fl_utf_string_dynamic_mish_nulless(const f_utf_string glue, const f_utf_string_length glue_length, const f_utf_string_dynamic source, f_utf_string_dynamic *destination) { + f_return_status fl_utf_string_dynamic_mish_nulless(const f_utf_string glue, const f_utf_string_length glue_length, const f_utf_string_static source, f_utf_string_dynamic *destination) { #ifndef _di_level_1_parameter_checking_ if (destination == 0) return f_status_set_error(f_invalid_parameter); #endif // _di_level_1_parameter_checking_ @@ -308,19 +308,19 @@ extern "C" { #endif // _di_fl_utf_string_dynamic_mish_nulless_ #ifndef _di_fl_utf_string_dynamic_compare_ - f_return_status fl_utf_string_dynamic_compare(const f_utf_string_dynamic string1, const f_utf_string_dynamic string2) { + f_return_status fl_utf_string_dynamic_compare(const f_utf_string_static string1, const f_utf_string_static string2) { return private_fl_utf_string_compare(string1.string, string2.string, 0, 0, string1.used, string2.used); } #endif // _di_fl_utf_string_dynamic_compare_ #ifndef _di_f_utf_string_dynamic_compare_trim_ - f_return_status f_utf_string_dynamic_compare_trim(const f_utf_string_dynamic string1, const f_utf_string_dynamic string2) { + f_return_status f_utf_string_dynamic_compare_trim(const f_utf_string_static string1, const f_utf_string_static string2) { return private_fl_utf_string_compare_trim(string1.string, string2.string, 0, 0, string1.used, string2.used); } #endif // _di_f_utf_string_dynamic_compare_trim_ #ifndef _di_fl_utf_string_dynamic_partial_append_ - f_return_status fl_utf_string_dynamic_partial_append(const f_utf_string_dynamic source, const f_utf_string_range range, f_utf_string_dynamic *destination) { + f_return_status fl_utf_string_dynamic_partial_append(const f_utf_string_static source, const f_utf_string_range range, f_utf_string_dynamic *destination) { #ifndef _di_level_1_parameter_checking_ if (source.used <= range.stop) return f_status_set_error(f_invalid_parameter); if (destination == 0) return f_status_set_error(f_invalid_parameter); @@ -334,7 +334,7 @@ extern "C" { #endif // _di_fl_utf_string_dynamic_partial_append_ #ifndef _di_fl_utf_string_dynamic_partial_append_assure_ - f_return_status fl_utf_string_dynamic_partial_append_assure(const f_utf_string_dynamic source, const f_utf_string_range range, f_utf_string_dynamic *destination) { + f_return_status fl_utf_string_dynamic_partial_append_assure(const f_utf_string_static source, const f_utf_string_range range, f_utf_string_dynamic *destination) { #ifndef _di_level_1_parameter_checking_ if (source.used <= range.stop) return f_status_set_error(f_invalid_parameter); if (destination == 0) return f_status_set_error(f_invalid_parameter); @@ -374,7 +374,7 @@ extern "C" { #endif // _di_fl_utf_string_dynamic_partial_append_assure_ #ifndef _di_fl_utf_string_dynamic_partial_append_assure_nulless_ - f_return_status fl_utf_string_dynamic_partial_append_assure_nulless(const f_utf_string_dynamic source, const f_utf_string_range range, f_utf_string_dynamic *destination) { + f_return_status fl_utf_string_dynamic_partial_append_assure_nulless(const f_utf_string_static source, const f_utf_string_range range, f_utf_string_dynamic *destination) { #ifndef _di_level_1_parameter_checking_ if (source.used <= range.stop) return f_status_set_error(f_invalid_parameter); if (destination == 0) return f_status_set_error(f_invalid_parameter); @@ -414,7 +414,7 @@ extern "C" { #endif // _di_fl_utf_string_dynamic_partial_append_assure_nulless_ #ifndef _di_fl_utf_string_dynamic_partial_append_nulless_ - f_return_status fl_utf_string_dynamic_partial_append_nulless(const f_utf_string_dynamic source, const f_utf_string_range range, f_utf_string_dynamic *destination) { + f_return_status fl_utf_string_dynamic_partial_append_nulless(const f_utf_string_static source, const f_utf_string_range range, f_utf_string_dynamic *destination) { #ifndef _di_level_1_parameter_checking_ if (source.used <= range.stop) return f_status_set_error(f_invalid_parameter); if (destination == 0) return f_status_set_error(f_invalid_parameter); @@ -428,7 +428,7 @@ extern "C" { #endif // _di_fl_utf_string_dynamic_partial_append_nulless_ #ifndef _di_fl_utf_string_dynamic_partial_compare_ - f_return_status fl_utf_string_dynamic_partial_compare(const f_utf_string_dynamic string1, const f_utf_string_dynamic string2, const f_utf_string_range range1, const f_utf_string_range range2) { + f_return_status fl_utf_string_dynamic_partial_compare(const f_utf_string_static string1, const f_utf_string_static string2, const f_utf_string_range range1, const f_utf_string_range range2) { #ifndef _di_level_1_parameter_checking_ if (string1.used <= range1.stop) return f_status_set_error(f_invalid_parameter); if (string2.used <= range2.stop) return f_status_set_error(f_invalid_parameter); @@ -439,7 +439,7 @@ extern "C" { #endif // _di_fl_utf_string_dynamic_partial_compare_ #ifndef _di_fl_utf_string_dynamic_partial_compare_trim_ - f_return_status fl_utf_string_dynamic_partial_comparetrim(const f_utf_string_dynamic string1, const f_utf_string_dynamic string2, const f_utf_string_range range1, const f_utf_string_range range2) { + f_return_status fl_utf_string_dynamic_partial_comparetrim(const f_utf_string_static string1, const f_utf_string_static string2, const f_utf_string_range range1, const f_utf_string_range range2) { #ifndef _di_level_1_parameter_checking_ if (string1.used <= range1.stop) return f_status_set_error(f_invalid_parameter); if (string2.used <= range2.stop) return f_status_set_error(f_invalid_parameter); @@ -450,7 +450,7 @@ extern "C" { #endif // _di_fl_utf_string_dynamic_partial_compare_trim_ #ifndef _di_fl_utf_string_dynamic_partial_mash_ - f_return_status fl_utf_string_dynamic_partial_mash(const f_utf_string glue, const f_utf_string_length glue_length, const f_utf_string_dynamic source, const f_utf_string_range range, f_utf_string_dynamic *destination) { + f_return_status fl_utf_string_dynamic_partial_mash(const f_utf_string glue, const f_utf_string_length glue_length, const f_utf_string_static source, const f_utf_string_range range, f_utf_string_dynamic *destination) { #ifndef _di_level_1_parameter_checking_ if (source.used <= range.stop) return f_status_set_error(f_invalid_parameter); if (destination == 0) return f_status_set_error(f_invalid_parameter); @@ -472,7 +472,7 @@ extern "C" { #endif // _di_fl_utf_string_dynamic_partial_mash_ #ifndef _di_fl_utf_string_dynamic_partial_mash_nulless_ - f_return_status fl_utf_string_dynamic_partial_mash_nulless(const f_utf_string glue, const f_utf_string_length glue_length, const f_utf_string_dynamic source, const f_utf_string_range range, f_utf_string_dynamic *destination) { + f_return_status fl_utf_string_dynamic_partial_mash_nulless(const f_utf_string glue, const f_utf_string_length glue_length, const f_utf_string_static source, const f_utf_string_range range, f_utf_string_dynamic *destination) { #ifndef _di_level_1_parameter_checking_ if (source.used <= range.stop) return f_status_set_error(f_invalid_parameter); if (destination == 0) return f_status_set_error(f_invalid_parameter); @@ -494,7 +494,7 @@ extern "C" { #endif // _di_fl_utf_string_dynamic_partial_mash_nulless_ #ifndef _di_fl_utf_string_dynamic_partial_mish_ - f_return_status fl_utf_string_dynamic_partial_mish(const f_utf_string glue, const f_utf_string_length glue_length, const f_utf_string_dynamic source, const f_utf_string_range range, f_utf_string_dynamic *destination) { + f_return_status fl_utf_string_dynamic_partial_mish(const f_utf_string glue, const f_utf_string_length glue_length, const f_utf_string_static source, const f_utf_string_range range, f_utf_string_dynamic *destination) { #ifndef _di_level_1_parameter_checking_ if (source.used <= range.stop) return f_status_set_error(f_invalid_parameter); if (destination == 0) return f_status_set_error(f_invalid_parameter); @@ -516,7 +516,7 @@ extern "C" { #endif // _di_fl_utf_string_dynamic_partial_mish_ #ifndef _di_fl_utf_string_dynamic_partial_mish_nulless_ - f_return_status fl_utf_string_dynamic_partial_mish_nulless(const f_utf_string glue, const f_utf_string_length glue_length, const f_utf_string_dynamic source, const f_utf_string_range range, f_utf_string_dynamic *destination) { + f_return_status fl_utf_string_dynamic_partial_mish_nulless(const f_utf_string glue, const f_utf_string_length glue_length, const f_utf_string_static source, const f_utf_string_range range, f_utf_string_dynamic *destination) { #ifndef _di_level_1_parameter_checking_ if (source.used <= range.stop) return f_status_set_error(f_invalid_parameter); if (destination == 0) return f_status_set_error(f_invalid_parameter); @@ -538,7 +538,7 @@ extern "C" { #endif // _di_fl_utf_string_dynamic_partial_mish_nulless_ #ifndef _di_fl_utf_string_dynamic_partial_prepend_ - f_return_status fl_utf_string_dynamic_partial_prepend(const f_utf_string_dynamic source, const f_utf_string_range range, f_utf_string_dynamic *destination) { + f_return_status fl_utf_string_dynamic_partial_prepend(const f_utf_string_static source, const f_utf_string_range range, f_utf_string_dynamic *destination) { #ifndef _di_level_1_parameter_checking_ if (source.used <= range.stop) return f_status_set_error(f_invalid_parameter); if (destination == 0) return f_status_set_error(f_invalid_parameter); @@ -552,7 +552,7 @@ extern "C" { #endif // _di_fl_utf_string_dynamic_partial_prepend_ #ifndef _di_fl_utf_string_dynamic_partial_prepend_assure_ - f_return_status fl_utf_string_dynamic_partial_prepend_assure(const f_utf_string_dynamic source, const f_utf_string_range range, f_utf_string_dynamic *destination) { + f_return_status fl_utf_string_dynamic_partial_prepend_assure(const f_utf_string_static source, const f_utf_string_range range, f_utf_string_dynamic *destination) { #ifndef _di_level_1_parameter_checking_ if (source.used <= range.stop) return f_status_set_error(f_invalid_parameter); if (destination == 0) return f_status_set_error(f_invalid_parameter); @@ -594,7 +594,7 @@ extern "C" { #endif // _di_fl_utf_string_dynamic_partial_prepend_assure_ #ifndef _di_fl_utf_string_dynamic_partial_prepend_assure_nulless_ - f_return_status fl_utf_string_dynamic_partial_prepend_assure_nulless(const f_utf_string_dynamic source, const f_utf_string_range range, f_utf_string_dynamic *destination) { + f_return_status fl_utf_string_dynamic_partial_prepend_assure_nulless(const f_utf_string_static source, const f_utf_string_range range, f_utf_string_dynamic *destination) { #ifndef _di_level_1_parameter_checking_ if (source.used <= range.stop) return f_status_set_error(f_invalid_parameter); if (destination == 0) return f_status_set_error(f_invalid_parameter); @@ -636,7 +636,7 @@ extern "C" { #endif // _di_fl_utf_string_dynamic_partial_prepend_assure_nulless_ #ifndef _di_fl_utf_string_dynamic_partial_prepend_nulless_ - f_return_status fl_utf_string_dynamic_partial_prepend_nulless(const f_utf_string_dynamic source, const f_utf_string_range range, f_utf_string_dynamic *destination) { + f_return_status fl_utf_string_dynamic_partial_prepend_nulless(const f_utf_string_static source, const f_utf_string_range range, f_utf_string_dynamic *destination) { #ifndef _di_level_1_parameter_checking_ if (source.used <= range.stop) return f_status_set_error(f_invalid_parameter); if (destination == 0) return f_status_set_error(f_invalid_parameter); @@ -650,7 +650,7 @@ extern "C" { #endif // _di_fl_utf_string_dynamic_partial_prepend_nulless_ #ifndef _di_fl_utf_string_dynamic_prepend_ - f_return_status fl_utf_string_dynamic_prepend(const f_utf_string_dynamic source, f_utf_string_dynamic *destination) { + f_return_status fl_utf_string_dynamic_prepend(const f_utf_string_static source, f_utf_string_dynamic *destination) { #ifndef _di_level_1_parameter_checking_ if (destination == 0) return f_status_set_error(f_invalid_parameter); #endif // _di_level_1_parameter_checking_ @@ -662,7 +662,7 @@ extern "C" { #endif // _di_fl_utf_string_dynamic_prepend_ #ifndef _di_fl_utf_string_dynamic_prepend_assure_ - f_return_status fl_utf_string_dynamic_prepend_assure(const f_utf_string_dynamic source, f_utf_string_dynamic *destination) { + f_return_status fl_utf_string_dynamic_prepend_assure(const f_utf_string_static source, f_utf_string_dynamic *destination) { #ifndef _di_level_1_parameter_checking_ if (destination == 0) return f_status_set_error(f_invalid_parameter); #endif // _di_level_1_parameter_checking_ @@ -700,7 +700,7 @@ extern "C" { #endif // _di_fl_utf_string_dynamic_prepend_assure_ #ifndef _di_fl_utf_string_dynamic_prepend_assure_nulless_ - f_return_status fl_utf_string_dynamic_prepend_assure_nulless(const f_utf_string_dynamic source, f_utf_string_dynamic *destination) { + f_return_status fl_utf_string_dynamic_prepend_assure_nulless(const f_utf_string_static source, f_utf_string_dynamic *destination) { #ifndef _di_level_1_parameter_checking_ if (destination == 0) return f_status_set_error(f_invalid_parameter); #endif // _di_level_1_parameter_checking_ @@ -738,7 +738,7 @@ extern "C" { #endif // _di_fl_utf_string_dynamic_prepend_assure_nulless_ #ifndef _di_fl_utf_string_dynamic_prepend_nulless_ - f_return_status fl_utf_string_dynamic_prepend_nulless(const f_utf_string_dynamic source, f_utf_string_dynamic *destination) { + f_return_status fl_utf_string_dynamic_prepend_nulless(const f_utf_string_static source, f_utf_string_dynamic *destination) { #ifndef _di_level_1_parameter_checking_ if (destination == 0) return f_status_set_error(f_invalid_parameter); #endif // _di_level_1_parameter_checking_ @@ -750,7 +750,7 @@ extern "C" { #endif // _di_fl_utf_string_dynamic_prepend_nulless_ #ifndef _di_fl_utf_string_dynamic_rip_ - f_return_status fl_utf_string_dynamic_rip(const f_utf_string_dynamic source, const f_utf_string_range range, f_utf_string_dynamic *destination) { + f_return_status fl_utf_string_dynamic_rip(const f_utf_string_static source, const f_utf_string_range range, f_utf_string_dynamic *destination) { #ifndef _di_level_1_parameter_checking_ if (source.used <= range.start) return f_status_set_error(f_invalid_parameter); if (source.used <= range.stop) return f_status_set_error(f_invalid_parameter); @@ -765,7 +765,7 @@ extern "C" { #endif // _di_fl_utf_string_dynamic_rip_ #ifndef _di_fl_utf_string_dynamic_rip_nulless_ - f_return_status fl_utf_string_dynamic_rip_nulless(const f_utf_string_dynamic source, const f_utf_string_range range, f_utf_string_dynamic *destination) { + f_return_status fl_utf_string_dynamic_rip_nulless(const f_utf_string_static source, const f_utf_string_range range, f_utf_string_dynamic *destination) { #ifndef _di_level_1_parameter_checking_ if (source.used <= range.start) return f_status_set_error(f_invalid_parameter); if (source.used <= range.stop) return f_status_set_error(f_invalid_parameter); @@ -780,7 +780,7 @@ extern "C" { #endif // _di_fl_utf_string_dynamic_rip_nulless_ #ifndef _di_fl_utf_string_dynamic_seek_line_to_ - f_return_status fl_utf_string_dynamic_seek_line_to(const f_utf_string_dynamic buffer, f_utf_string_range *range, const f_utf_character seek_to_this) { + f_return_status fl_utf_string_dynamic_seek_line_to(const f_utf_string_static buffer, f_utf_string_range *range, const f_utf_character seek_to_this) { #ifndef _di_level_1_parameter_checking_ if (range == 0) return f_status_set_error(f_invalid_parameter); if (buffer.used <= range->start) return f_status_set_error(f_invalid_parameter); @@ -812,7 +812,7 @@ extern "C" { #endif // _di_fl_utf_string_dynamic_seek_line_to_ #ifndef _di_fl_utf_string_dynamic_seek_line_to_char_ - f_return_status fl_utf_string_dynamic_seek_line_to_char(const f_utf_string_dynamic buffer, f_utf_string_range *range, const int8_t seek_to_this) { + f_return_status fl_utf_string_dynamic_seek_line_to_char(const f_utf_string_static buffer, f_utf_string_range *range, const int8_t seek_to_this) { #ifndef _di_level_1_parameter_checking_ if (range == 0) return f_status_set_error(f_invalid_parameter); if (buffer.used <= range->start) return f_status_set_error(f_invalid_parameter); @@ -846,7 +846,7 @@ extern "C" { #endif // _di_fl_utf_string_dynamic_seek_line_to_character_ #ifndef _di_fl_utf_string_dynamic_seek_line_until_graph_ - f_return_status fl_utf_string_dynamic_seek_line_until_graph(const f_utf_string_dynamic buffer, f_utf_string_range *range, const f_utf_character placeholder) { + f_return_status fl_utf_string_dynamic_seek_line_until_graph(const f_utf_string_static buffer, f_utf_string_range *range, const f_utf_character placeholder) { #ifndef _di_level_1_parameter_checking_ if (range == 0) return f_status_set_error(f_invalid_parameter); if (buffer.used <= range->start) return f_status_set_error(f_invalid_parameter); @@ -888,7 +888,7 @@ extern "C" { #endif // _di_fl_utf_string_dynamic_seek_line_until_graph_ #ifndef _di_fl_utf_string_dynamic_seek_line_until_non_graph_ - f_return_status fl_utf_string_dynamic_seek_line_until_non_graph(const f_utf_string_dynamic buffer, f_utf_string_range *range, const f_utf_character placeholder) { + f_return_status fl_utf_string_dynamic_seek_line_until_non_graph(const f_utf_string_static buffer, f_utf_string_range *range, const f_utf_character placeholder) { #ifndef _di_level_1_parameter_checking_ if (range == 0) return f_status_set_error(f_invalid_parameter); if (buffer.used <= range->start) return f_status_set_error(f_invalid_parameter); @@ -930,7 +930,7 @@ extern "C" { #endif // _di_fl_utf_string_dynamic_seek_line_until_non_graph_ #ifndef _di_fl_utf_string_dynamic_seek_to_ - f_return_status fl_utf_string_dynamic_seek_to(const f_utf_string_dynamic buffer, f_utf_string_range *range, const f_utf_character seek_to_this) { + f_return_status fl_utf_string_dynamic_seek_to(const f_utf_string_static buffer, f_utf_string_range *range, const f_utf_character seek_to_this) { #ifndef _di_level_1_parameter_checking_ if (range == 0) return f_status_set_error(f_invalid_parameter); if (buffer.used <= range->start) return f_status_set_error(f_invalid_parameter); @@ -960,7 +960,7 @@ extern "C" { #endif // _di_fl_utf_string_dynamic_seek_to_ #ifndef _di_fl_utf_string_dynamic_seek_to_char_ - f_return_status fl_utf_string_dynamic_seek_to_char(const f_utf_string_dynamic buffer, f_utf_string_range *range, const int8_t seek_to_this) { + f_return_status fl_utf_string_dynamic_seek_to_char(const f_utf_string_static buffer, f_utf_string_range *range, const int8_t seek_to_this) { #ifndef _di_level_1_parameter_checking_ if (range == 0) return f_status_set_error(f_invalid_parameter); if (buffer.used <= range->start) return f_status_set_error(f_invalid_parameter); diff --git a/level_1/fl_utf/c/utf.h b/level_1/fl_utf/c/utf.h index de840ad..253940f 100644 --- a/level_1/fl_utf/c/utf.h +++ b/level_1/fl_utf/c/utf.h @@ -225,7 +225,7 @@ extern "C" { * @see fl_utf_string_dynamic_append_nulless() */ #ifndef _di_fl_utf_string_dynamic_append_ - extern f_return_status fl_utf_string_dynamic_append(const f_utf_string_dynamic source, f_utf_string_dynamic *destination); + extern f_return_status fl_utf_string_dynamic_append(const f_utf_string_static source, f_utf_string_dynamic *destination); #endif // _di_fl_utf_string_dynamic_append_ /** @@ -249,7 +249,7 @@ extern "C" { * @see fl_utf_string_dynamic_append_assure_nulless() */ #ifndef _di_fl_utf_string_dynamic_append_assure_ - extern f_return_status fl_utf_string_dynamic_append_assure(const f_utf_string_dynamic source, f_utf_string_dynamic *destination); + extern f_return_status fl_utf_string_dynamic_append_assure(const f_utf_string_static source, f_utf_string_dynamic *destination); #endif // _di_fl_utf_string_dynamic_append_assure_ /** @@ -274,7 +274,7 @@ extern "C" { * @see fl_utf_string_dynamic_append_assure() */ #ifndef _di_fl_utf_string_dynamic_append_assure_nulless_ - extern f_return_status fl_utf_string_dynamic_append_assure_nulless(const f_utf_string_dynamic source, f_utf_string_dynamic *destination); + extern f_return_status fl_utf_string_dynamic_append_assure_nulless(const f_utf_string_static source, f_utf_string_dynamic *destination); #endif // _di_fl_utf_string_dynamic_append_assure_nulless_ /** @@ -298,7 +298,7 @@ extern "C" { * @see fl_utf_string_dynamic_append() */ #ifndef _di_fl_utf_string_dynamic_append_nulless_ - extern f_return_status fl_utf_string_dynamic_append_nulless(const f_utf_string_dynamic source, f_utf_string_dynamic *destination); + extern f_return_status fl_utf_string_dynamic_append_nulless(const f_utf_string_static source, f_utf_string_dynamic *destination); #endif // _di_fl_utf_string_dynamic_append_nulless_ /** @@ -324,7 +324,7 @@ extern "C" { * @see fl_utf_string_dynamic_partial_compare_trim() */ #ifndef _di_fl_utf_string_dynamic_compare_ - extern f_return_status fl_utf_string_dynamic_compare(const f_utf_string_dynamic string1, const f_utf_string_dynamic string2); + extern f_return_status fl_utf_string_dynamic_compare(const f_utf_string_static string1, const f_utf_string_static string2); #endif // _di_fl_utf_string_dynamic_compare_ /** @@ -351,7 +351,7 @@ extern "C" { * @see fl_utf_string_dynamic_partial_compare_trim() */ #ifndef _di_f_utf_string_dynamic_compare_trim_ - extern f_return_status f_utf_string_dynamic_compare_trim(const f_utf_string_dynamic string1, const f_utf_string_dynamic string2); + extern f_return_status f_utf_string_dynamic_compare_trim(const f_utf_string_static string1, const f_utf_string_static string2); #endif // _di_f_utf_string_dynamic_compare_trim_ /** @@ -380,7 +380,7 @@ extern "C" { * @see fl_utf_string_dynamic_mash() */ #ifndef _di_fl_utf_string_dynamic_mash_ - extern f_return_status fl_utf_string_dynamic_mash(const f_utf_string glue, const f_utf_string_length glue_length, const f_utf_string_dynamic source, f_utf_string_dynamic *destination); + extern f_return_status fl_utf_string_dynamic_mash(const f_utf_string glue, const f_utf_string_length glue_length, const f_utf_string_static source, f_utf_string_dynamic *destination); #endif // _di_fl_utf_string_dynamic_mash_ /** @@ -411,7 +411,7 @@ extern "C" { * @see fl_utf_string_dynamic_mash_nulless() */ #ifndef _di_fl_utf_string_dynamic_mash_nulless_ - extern f_return_status fl_utf_string_dynamic_mash_nulless(const f_utf_string glue, const f_utf_string_length glue_length, const f_utf_string_dynamic source, f_utf_string_dynamic *destination); + extern f_return_status fl_utf_string_dynamic_mash_nulless(const f_utf_string glue, const f_utf_string_length glue_length, const f_utf_string_static source, f_utf_string_dynamic *destination); #endif // _di_fl_utf_string_dynamic_mash_nulless_ /** @@ -440,7 +440,7 @@ extern "C" { * @see fl_utf_string_dynamic_mish() */ #ifndef _di_fl_utf_string_dynamic_mish_ - extern f_return_status fl_utf_string_dynamic_mish(const f_utf_string glue, const f_utf_string_length glue_length, const f_utf_string_dynamic source, f_utf_string_dynamic *destination); + extern f_return_status fl_utf_string_dynamic_mish(const f_utf_string glue, const f_utf_string_length glue_length, const f_utf_string_static source, f_utf_string_dynamic *destination); #endif // _di_fl_utf_string_dynamic_mish_ /** @@ -471,7 +471,7 @@ extern "C" { * @see fl_utf_string_dynamic_mish_nulless() */ #ifndef _di_fl_utf_string_dynamic_mish_nulless_ - extern f_return_status fl_utf_string_dynamic_mish_nulless(const f_utf_string glue, const f_utf_string_length glue_length, const f_utf_string_dynamic source, f_utf_string_dynamic *destination); + extern f_return_status fl_utf_string_dynamic_mish_nulless(const f_utf_string glue, const f_utf_string_length glue_length, const f_utf_string_static source, f_utf_string_dynamic *destination); #endif // _di_fl_utf_string_dynamic_mish_nulless_ /** @@ -495,7 +495,7 @@ extern "C" { * @see fl_utf_string_dynamic_partial_append_nulless() */ #ifndef _di_fl_utf_string_dynamic_partial_append_ - extern f_return_status fl_utf_string_dynamic_partial_append(const f_utf_string_dynamic source, const f_utf_string_range range, f_utf_string_dynamic *destination); + extern f_return_status fl_utf_string_dynamic_partial_append(const f_utf_string_static source, const f_utf_string_range range, f_utf_string_dynamic *destination); #endif // _di_fl_utf_string_dynamic_partial_append_ /** @@ -519,7 +519,7 @@ extern "C" { * @see fl_utf_string_dynamic_partial_append_assure_nulless() */ #ifndef _di_fl_utf_string_dynamic_partial_append_assure_ - extern f_return_status fl_utf_string_dynamic_partial_append_assure(const f_utf_string_dynamic source, const f_utf_string_range range, f_utf_string_dynamic *destination); + extern f_return_status fl_utf_string_dynamic_partial_append_assure(const f_utf_string_static source, const f_utf_string_range range, f_utf_string_dynamic *destination); #endif // _di_fl_utf_string_dynamic_partial_append_assure_ /** @@ -546,7 +546,7 @@ extern "C" { * @see fl_utf_string_dynamic_partial_append_assure() */ #ifndef _di_fl_utf_string_dynamic_partial_append_assure_nulless_ - extern f_return_status fl_utf_string_dynamic_partial_append_assure_nulless(const f_utf_string_dynamic source, const f_utf_string_range range, f_utf_string_dynamic *destination); + extern f_return_status fl_utf_string_dynamic_partial_append_assure_nulless(const f_utf_string_static source, const f_utf_string_range range, f_utf_string_dynamic *destination); #endif // _di_fl_utf_string_dynamic_partial_append_assure_nulless_ /** @@ -573,7 +573,7 @@ extern "C" { * @see fl_utf_string_dynamic_partial_append() */ #ifndef _di_fl_utf_string_dynamic_partial_append_nulless_ - extern f_return_status fl_utf_string_dynamic_partial_append_nulless(const f_utf_string_dynamic source, const f_utf_string_range range, f_utf_string_dynamic *destination); + extern f_return_status fl_utf_string_dynamic_partial_append_nulless(const f_utf_string_static source, const f_utf_string_range range, f_utf_string_dynamic *destination); #endif // _di_fl_utf_string_dynamic_partial_append_nulless_ /** @@ -603,7 +603,7 @@ extern "C" { * @see fl_utf_string_dynamic_compare_trim() */ #ifndef _di_fl_utf_string_dynamic_partial_compare_ - extern f_return_status fl_utf_string_dynamic_partial_compare(const f_utf_string_dynamic string1, const f_utf_string_dynamic string2, const f_utf_string_range range1, const f_utf_string_range range2); + extern f_return_status fl_utf_string_dynamic_partial_compare(const f_utf_string_static string1, const f_utf_string_static string2, const f_utf_string_range range1, const f_utf_string_range range2); #endif // _di_fl_utf_string_dynamic_partial_compare_ /** @@ -634,7 +634,7 @@ extern "C" { * @see fl_utf_string_dynamic_compare_trim() */ #ifndef _di_fl_utf_string_dynamic_partial_compare_trim_ - extern f_return_status fl_utf_string_dynamic_partial_compare_trim(const f_utf_string_dynamic string1, const f_utf_string_dynamic string2, const f_utf_string_range range1, const f_utf_string_range range2); + extern f_return_status fl_utf_string_dynamic_partial_compare_trim(const f_utf_string_static string1, const f_utf_string_static string2, const f_utf_string_range range1, const f_utf_string_range range2); #endif // _di_fl_utf_string_dynamic_partial_compare_trim_ /** @@ -664,7 +664,7 @@ extern "C" { * @see fl_utf_string_dynamic_mash_nulless() */ #ifndef _di_fl_utf_string_dynamic_partial_mash_ - extern f_return_status fl_utf_string_dynamic_partial_mash(const f_utf_string glue, const f_utf_string_length glue_length, const f_utf_string_dynamic source, const f_utf_string_range range, f_utf_string_dynamic *destination); + extern f_return_status fl_utf_string_dynamic_partial_mash(const f_utf_string glue, const f_utf_string_length glue_length, const f_utf_string_static source, const f_utf_string_range range, f_utf_string_dynamic *destination); #endif // _di_fl_utf_string_dynamic_partial_mash_ /** @@ -696,7 +696,7 @@ extern "C" { * @see fl_utf_string_dynamic_partial_mash() */ #ifndef _di_fl_utf_string_dynamic_partial_mash_nulless_ - extern f_return_status fl_utf_string_dynamic_partial_mash_nulless(const f_utf_string glue, const f_utf_string_length glue_length, const f_utf_string_dynamic source, const f_utf_string_range range, f_utf_string_dynamic *destination); + extern f_return_status fl_utf_string_dynamic_partial_mash_nulless(const f_utf_string glue, const f_utf_string_length glue_length, const f_utf_string_static source, const f_utf_string_range range, f_utf_string_dynamic *destination); #endif // _di_fl_utf_string_dynamic_partial_mash_nulless_ /** @@ -726,7 +726,7 @@ extern "C" { * @see fl_utf_string_dynamic_partial_mish_nulless() */ #ifndef _di_fl_utf_string_dynamic_partial_mish_ - extern f_return_status fl_utf_string_dynamic_partial_mish(const f_utf_string glue, const f_utf_string_length glue_length, const f_utf_string_dynamic source, const f_utf_string_range range, f_utf_string_dynamic *destination); + extern f_return_status fl_utf_string_dynamic_partial_mish(const f_utf_string glue, const f_utf_string_length glue_length, const f_utf_string_static source, const f_utf_string_range range, f_utf_string_dynamic *destination); #endif // _di_fl_utf_string_dynamic_partial_mish_ /** @@ -758,7 +758,7 @@ extern "C" { * @see fl_utf_string_dynamic_partial_mish() */ #ifndef _di_fl_utf_string_dynamic_partial_mish_nulless_ - extern f_return_status fl_utf_string_dynamic_partial_mish_nulless(const f_utf_string glue, const f_utf_string_length glue_length, const f_utf_string_dynamic source, const f_utf_string_range range, f_utf_string_dynamic *destination); + extern f_return_status fl_utf_string_dynamic_partial_mish_nulless(const f_utf_string glue, const f_utf_string_length glue_length, const f_utf_string_static source, const f_utf_string_range range, f_utf_string_dynamic *destination); #endif // _di_fl_utf_string_dynamic_partial_mish_nulless_ /** @@ -784,7 +784,7 @@ extern "C" { * @see fl_utf_string_dynamic_partial_prepend_nulless() */ #ifndef _di_fl_utf_string_dynamic_partial_prepend_ - extern f_return_status fl_utf_string_dynamic_partial_prepend(const f_utf_string_dynamic source, const f_utf_string_range range, f_utf_string_dynamic *destination); + extern f_return_status fl_utf_string_dynamic_partial_prepend(const f_utf_string_static source, const f_utf_string_range range, f_utf_string_dynamic *destination); #endif // _di_fl_utf_string_dynamic_partial_prepend_ /** @@ -812,7 +812,7 @@ extern "C" { * @see fl_utf_string_dynamic_partial_prepend_assure_nulless() */ #ifndef _di_fl_utf_string_dynamic_partial_prepend_assure_ - extern f_return_status fl_utf_string_dynamic_partial_prepend_assure(const f_utf_string_dynamic source, const f_utf_string_range range, f_utf_string_dynamic *destination); + extern f_return_status fl_utf_string_dynamic_partial_prepend_assure(const f_utf_string_static source, const f_utf_string_range range, f_utf_string_dynamic *destination); #endif // _di_fl_utf_string_dynamic_partial_prepend_assure_ /** @@ -840,7 +840,7 @@ extern "C" { * @see fl_utf_string_dynamic_partial_prepend_assure() */ #ifndef _di_fl_utf_string_dynamic_partial_prepend_assure_nulless_ - extern f_return_status fl_utf_string_dynamic_partial_prepend_assure_nulless(const f_utf_string_dynamic source, const f_utf_string_range range, f_utf_string_dynamic *destination); + extern f_return_status fl_utf_string_dynamic_partial_prepend_assure_nulless(const f_utf_string_static source, const f_utf_string_range range, f_utf_string_dynamic *destination); #endif // _di_fl_utf_string_dynamic_partial_prepend_assure_nulless_ /** @@ -866,7 +866,7 @@ extern "C" { * @see fl_utf_string_dynamic_partial_prepend() */ #ifndef _di_fl_utf_string_dynamic_partial_prepend_nulless_ - extern f_return_status fl_utf_string_dynamic_partial_prepend_nulless(const f_utf_string_dynamic source, const f_utf_string_range range, f_utf_string_dynamic *destination); + extern f_return_status fl_utf_string_dynamic_partial_prepend_nulless(const f_utf_string_static source, const f_utf_string_range range, f_utf_string_dynamic *destination); #endif // _di_fl_utf_string_dynamic_partial_prepend_nulless_ /** @@ -890,7 +890,7 @@ extern "C" { * @see fl_utf_string_dynamic_prepend_nulless() */ #ifndef _di_fl_utf_string_dynamic_prepend_ - extern f_return_status fl_utf_string_dynamic_prepend(const f_utf_string_dynamic source, f_utf_string_dynamic *destination); + extern f_return_status fl_utf_string_dynamic_prepend(const f_utf_string_static source, f_utf_string_dynamic *destination); #endif // _di_fl_utf_string_dynamic_prepend_ /** @@ -916,7 +916,7 @@ extern "C" { * @see fl_utf_string_dynamic_prepend_assure_nulless() */ #ifndef _di_fl_utf_string_dynamic_prepend_assure_ - extern f_return_status fl_utf_string_dynamic_prepend_assure(const f_utf_string_dynamic source, f_utf_string_dynamic *destination); + extern f_return_status fl_utf_string_dynamic_prepend_assure(const f_utf_string_static source, f_utf_string_dynamic *destination); #endif // _di_fl_utf_string_dynamic_prepend_assure_ /** @@ -942,7 +942,7 @@ extern "C" { * @see fl_utf_string_dynamic_prepend_assure() */ #ifndef _di_fl_utf_string_dynamic_prepend_assure_nulless_ - extern f_return_status fl_utf_string_dynamic_prepend_assure_nulless(const f_utf_string_dynamic source, f_utf_string_dynamic *destination); + extern f_return_status fl_utf_string_dynamic_prepend_assure_nulless(const f_utf_string_static source, f_utf_string_dynamic *destination); #endif // _di_fl_utf_string_dynamic_prepend_assure_nulless_ /** @@ -966,7 +966,7 @@ extern "C" { * @see fl_utf_string_dynamic_prepend() */ #ifndef _di_fl_utf_string_dynamic_prepend_nulless_ - extern f_return_status fl_utf_string_dynamic_prepend_nulless(const f_utf_string_dynamic source, f_utf_string_dynamic *destination); + extern f_return_status fl_utf_string_dynamic_prepend_nulless(const f_utf_string_static source, f_utf_string_dynamic *destination); #endif // _di_fl_utf_string_dynamic_prepend_nulless_ /** @@ -992,7 +992,7 @@ extern "C" { * @see fl_utf_string_dynamic_rip_nulless() */ #ifndef _di_fl_utf_string_dynamic_rip_ - extern f_return_status fl_utf_string_dynamic_rip(const f_utf_string_dynamic source, const f_utf_string_range range, f_utf_string_dynamic *destination); + extern f_return_status fl_utf_string_dynamic_rip(const f_utf_string_static source, const f_utf_string_range range, f_utf_string_dynamic *destination); #endif // _di_fl_utf_string_dynamic_rip_ /** @@ -1020,7 +1020,7 @@ extern "C" { * @see fl_utf_string_dynamic_rip() */ #ifndef _di_fl_utf_string_dynamic_rip_nulless_ - extern f_return_status fl_utf_string_dynamic_rip_nulless(const f_utf_string_dynamic source, const f_utf_string_range range, f_utf_string_dynamic *destination); + extern f_return_status fl_utf_string_dynamic_rip_nulless(const f_utf_string_static source, const f_utf_string_range range, f_utf_string_dynamic *destination); #endif // _di_fl_utf_string_dynamic_rip_nulless_ /** @@ -1046,7 +1046,7 @@ extern "C" { * @see fl_utf_string_seek_line_to_char() */ #ifndef _di_fl_utf_string_dynamic_seek_line_to_ - extern f_return_status fl_utf_string_dynamic_seek_line_to(const f_utf_string_dynamic buffer, f_utf_string_range *range, const f_utf_character seek_to_this); + extern f_return_status fl_utf_string_dynamic_seek_line_to(const f_utf_string_static buffer, f_utf_string_range *range, const f_utf_character seek_to_this); #endif // _di_fl_utf_string_dynamic_seek_line_to_ /** @@ -1071,7 +1071,7 @@ extern "C" { * @see fl_utf_string_seek_line_to() */ #ifndef _di_fl_utf_string_seek_line_to_char_ - extern f_return_status fl_utf_string_dynamic_seek_line_to_char(const f_utf_string_dynamic buffer, f_utf_string_range *range, const int8_t seek_to_this); + extern f_return_status fl_utf_string_dynamic_seek_line_to_char(const f_utf_string_static buffer, f_utf_string_range *range, const int8_t seek_to_this); #endif // _di_fl_utf_string_seek_line_to_char_ /** @@ -1094,7 +1094,7 @@ extern "C" { * @see fl_utf_string_seek_line_until_graph() */ #ifndef _di_fl_utf_string_dynamic_seek_line_until_graph_ - extern f_return_status fl_utf_string_dynamic_seek_line_until_graph(const f_utf_string_dynamic buffer, f_utf_string_range *range, const f_utf_character placeholder); + extern f_return_status fl_utf_string_dynamic_seek_line_until_graph(const f_utf_string_static buffer, f_utf_string_range *range, const f_utf_character placeholder); #endif // _di_fl_utf_string_dynamic_seek_line_until_graph_ /** @@ -1118,7 +1118,7 @@ extern "C" { * @see fl_utf_string_seek_line_until_non_graph() */ #ifndef _di_fl_utf_string_dynamic_seek_line_until_non_graph_ - extern f_return_status fl_utf_string_dynamic_seek_line_until_non_graph(const f_utf_string_dynamic buffer, f_utf_string_range *range, const f_utf_character placeholder); + extern f_return_status fl_utf_string_dynamic_seek_line_until_non_graph(const f_utf_string_static buffer, f_utf_string_range *range, const f_utf_character placeholder); #endif // _di_fl_utf_string_dynamic_seek_line_until_non_graph_ /** @@ -1144,7 +1144,7 @@ extern "C" { * @see fl_utf_string_seek_to_char() */ #ifndef _di_fl_utf_string_dynamic_seek_to_ - extern f_return_status fl_utf_string_dynamic_seek_to(const f_utf_string_dynamic buffer, f_utf_string_range *range, const f_utf_character seek_to_this); + extern f_return_status fl_utf_string_dynamic_seek_to(const f_utf_string_static buffer, f_utf_string_range *range, const f_utf_character seek_to_this); #endif // _di_fl_utf_string_dynamic_seek_to_ /** @@ -1170,7 +1170,7 @@ extern "C" { * @see fl_utf_string_seek_to_char() */ #ifndef _di_fl_utf_string_dynamic_seek_to_char_ - extern f_return_status fl_utf_string_dynamic_seek_to_char(const f_utf_string_dynamic buffer, f_utf_string_range *range, const int8_t seek_to_this); + extern f_return_status fl_utf_string_dynamic_seek_to_char(const f_utf_string_static buffer, f_utf_string_range *range, const int8_t seek_to_this); #endif // _di_fl_utf_string_dynamic_seek_to_char_ /** @@ -1199,7 +1199,7 @@ extern "C" { * @see fl_utf_string_seek_to_character() */ #ifndef _di_fl_utf_string_dynamic_seek_to_utf_character_ - extern f_return_status fl_utf_string_dynamic_seek_to_utf_character(const f_utf_string_dynamic buffer, f_utf_string_range *range, const f_utf_character seek_to_this); + extern f_return_status fl_utf_string_dynamic_seek_to_utf_character(const f_utf_string_static buffer, f_utf_string_range *range, const f_utf_character seek_to_this); #endif // _di_fl_utf_string_dynamic_seek_to_utf_character_ /** diff --git a/level_1/fl_utf_file/c/utf_file.c b/level_1/fl_utf_file/c/utf_file.c index 61adf45..b8e4e49 100644 --- a/level_1/fl_utf_file/c/utf_file.c +++ b/level_1/fl_utf_file/c/utf_file.c @@ -174,7 +174,7 @@ extern "C" { #endif // _di_fl_utf_file_read_position #ifndef _di_fl_utf_file_write_ - f_return_status fl_utf_file_write(f_file *file, const f_utf_string_dynamic buffer) { + f_return_status fl_utf_file_write(f_file *file, const f_utf_string_static buffer) { #ifndef _di_level_1_parameter_checking_ if (file == 0) return f_status_set_error(f_invalid_parameter); #endif // _di_level_1_parameter_checking_ @@ -224,7 +224,7 @@ extern "C" { #endif // _di_fl_utf_file_write_ #ifndef _di_fl_utf_file_write_position_ - f_return_status fl_utf_file_write_position(f_file *file, const f_utf_string_dynamic buffer, const f_utf_string_range position) { + f_return_status fl_utf_file_write_position(f_file *file, const f_utf_string_static buffer, const f_utf_string_range position) { #ifndef _di_level_1_parameter_checking_ if (file == 0) return f_status_set_error(f_invalid_parameter); if (position.start < position.stop) return f_status_set_error(f_invalid_parameter); diff --git a/level_1/fl_utf_file/c/utf_file.h b/level_1/fl_utf_file/c/utf_file.h index 3a4d20c..9c8b212 100644 --- a/level_1/fl_utf_file/c/utf_file.h +++ b/level_1/fl_utf_file/c/utf_file.h @@ -92,7 +92,7 @@ extern "C" { * f_invalid_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_fl_utf_file_write_ - extern f_return_status fl_utf_file_write(f_file *file, const f_utf_string_dynamic buffer); + extern f_return_status fl_utf_file_write(f_file *file, const f_utf_string_static buffer); #endif // _di_fl_utf_file_write_ /** @@ -114,7 +114,7 @@ extern "C" { * f_invalid_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_fl_utf_file_write_position_ - extern f_return_status fl_utf_file_write_position(f_file *file, const f_utf_string_dynamic buffer, const f_utf_string_range position); + extern f_return_status fl_utf_file_write_position(f_file *file, const f_utf_string_static buffer, const f_utf_string_range position); #endif // _di_fl_utf_file_write_position_ #ifdef __cplusplus diff --git a/level_3/byte_dump/c/private-byte_dump.c b/level_3/byte_dump/c/private-byte_dump.c index 400fbf6..d706de8 100644 --- a/level_3/byte_dump/c/private-byte_dump.c +++ b/level_3/byte_dump/c/private-byte_dump.c @@ -230,7 +230,7 @@ extern "C" { #endif // _di_byte_dump_file_ #ifndef _di_byte_dump_print_character_fragment_ - bool byte_dump_print_character_fragment(const byte_dump_data data, const f_utf_string_dynamic characters, const uint8_t invalid[], const int8_t width_utf, const int8_t byte_current, byte_dump_previous *previous, byte_dump_cell *cell, uint8_t *offset) { + bool byte_dump_print_character_fragment(const byte_dump_data data, const f_utf_string_static characters, const uint8_t invalid[], const int8_t width_utf, const int8_t byte_current, byte_dump_previous *previous, byte_dump_cell *cell, uint8_t *offset) { uint8_t byte = 0; bool reset = f_false; @@ -430,7 +430,7 @@ extern "C" { #endif // _di_byte_dump_print_character_fragment_ #ifndef _di_byte_dump_print_text_ - void byte_dump_print_text(const byte_dump_data data, const f_utf_string_dynamic characters, const uint8_t invalid[], byte_dump_previous *previous, uint8_t *offset) { + void byte_dump_print_text(const byte_dump_data data, const f_utf_string_static characters, const uint8_t invalid[], byte_dump_previous *previous, uint8_t *offset) { uint8_t j = 0; uint8_t output = 0; uint8_t width_utf = 0; diff --git a/level_3/byte_dump/c/private-byte_dump.h b/level_3/byte_dump/c/private-byte_dump.h index 51b9451..8f8a852 100644 --- a/level_3/byte_dump/c/private-byte_dump.h +++ b/level_3/byte_dump/c/private-byte_dump.h @@ -111,7 +111,7 @@ extern "C" { * @see byte_dump_print_text() */ #ifndef _di_byte_dump_print_character_fragment_ - extern bool byte_dump_print_character_fragment(const byte_dump_data data, const f_utf_string_dynamic characters, const uint8_t invalid[], const int8_t width_utf, const int8_t byte_current, byte_dump_previous *previous, byte_dump_cell *cell, uint8_t *offset) f_gcc_attribute_visibility_internal; + extern bool byte_dump_print_character_fragment(const byte_dump_data data, const f_utf_string_static characters, const uint8_t invalid[], const int8_t width_utf, const int8_t byte_current, byte_dump_previous *previous, byte_dump_cell *cell, uint8_t *offset) f_gcc_attribute_visibility_internal; #endif // _di_byte_dump_print_character_fragment_ /** @@ -133,7 +133,7 @@ extern "C" { * Will be reduced to 0 once used. */ #ifndef _di_byte_dump_print_text_ - extern void byte_dump_print_text(const byte_dump_data data, const f_utf_string_dynamic characters, const uint8_t invalid[], byte_dump_previous *previous, uint8_t *offset) f_gcc_attribute_visibility_internal; + extern void byte_dump_print_text(const byte_dump_data data, const f_utf_string_static characters, const uint8_t invalid[], byte_dump_previous *previous, uint8_t *offset) f_gcc_attribute_visibility_internal; #endif // _di_byte_dump_print_text_ /**