From df54b53e824fc9f2c343862c18280f2fe9addebe Mon Sep 17 00:00:00 2001 From: Kevin Day Date: Sat, 9 May 2020 18:12:11 -0500 Subject: [PATCH] Refactor: all constant dynamic strings can be safely changed to static string This is just a mass regex change. There may need to be function renaming and re-ordering at a later time. --- level_0/f_print/c/print.c | 4 +- level_0/f_print/c/print.h | 4 +- level_1/fl_color/c/color.c | 10 ++-- level_1/fl_color/c/color.h | 10 ++-- level_1/fl_file/c/file.c | 4 +- level_1/fl_file/c/file.h | 4 +- level_1/fl_fss/c/fss.c | 14 +++--- level_1/fl_fss/c/fss.h | 14 +++--- level_1/fl_fss/c/fss_basic.c | 4 +- level_1/fl_fss/c/fss_basic.h | 4 +- level_1/fl_fss/c/fss_basic_list.c | 4 +- level_1/fl_fss/c/fss_basic_list.h | 4 +- level_1/fl_fss/c/fss_extended.c | 4 +- level_1/fl_fss/c/fss_extended.h | 4 +- level_1/fl_fss/c/fss_extended_list.c | 4 +- level_1/fl_fss/c/fss_extended_list.h | 4 +- level_1/fl_print/c/print.c | 4 +- level_1/fl_print/c/print.h | 4 +- level_1/fl_serialized/c/private-serialized.c | 2 +- level_1/fl_serialized/c/private-serialized.h | 2 +- level_1/fl_serialized/c/serialized.c | 10 ++-- level_1/fl_serialized/c/serialized.h | 10 ++-- level_1/fl_string/c/string.c | 56 +++++++++++----------- level_1/fl_string/c/string.h | 56 +++++++++++----------- level_2/fll_execute/c/execute.c | 8 ++-- level_2/fll_execute/c/execute.h | 8 ++-- level_2/fll_fss/c/fss.c | 12 ++--- level_2/fll_fss/c/fss.h | 12 ++--- level_2/fll_fss/c/fss_basic.c | 2 +- level_2/fll_fss/c/fss_basic.h | 2 +- level_2/fll_fss/c/fss_basic_list.c | 2 +- level_2/fll_fss/c/fss_basic_list.h | 2 +- level_2/fll_fss/c/fss_extended.c | 2 +- level_2/fll_fss/c/fss_extended.h | 2 +- level_2/fll_fss/c/fss_extended_list.c | 2 +- level_2/fll_fss/c/fss_extended_list.h | 2 +- .../c/private-fss_basic_list_read.c | 2 +- level_3/fss_basic_read/c/private-fss_basic_read.c | 2 +- .../c/private-fss_extended_list_read.c | 2 +- .../c/private-fss_extended_read.c | 2 +- 40 files changed, 152 insertions(+), 152 deletions(-) diff --git a/level_0/f_print/c/print.c b/level_0/f_print/c/print.c index cf2a552..438f384 100644 --- a/level_0/f_print/c/print.c +++ b/level_0/f_print/c/print.c @@ -26,7 +26,7 @@ extern "C" { #endif // _di_f_print_string_ #ifndef _di_f_print_string_dynamic_ - f_return_status f_print_string_dynamic(FILE *output, const f_string_dynamic buffer) { + f_return_status f_print_string_dynamic(FILE *output, const f_string_static buffer) { #ifndef _di_level_0_parameter_checking_ if (buffer.used <= 0) return f_status_set_error(f_invalid_parameter); #endif // _di_level_0_parameter_checking_ @@ -46,7 +46,7 @@ extern "C" { #endif // _di_f_print_string_dynamic_ #ifndef _di_f_print_string_dynamic_partial_ - f_return_status f_print_string_dynamic_partial(FILE *output, const f_string_dynamic buffer, const f_string_range range) { + f_return_status f_print_string_dynamic_partial(FILE *output, const f_string_static buffer, const f_string_range range) { #ifndef _di_level_0_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_0/f_print/c/print.h b/level_0/f_print/c/print.h index 618cbc9..b533f60 100644 --- a/level_0/f_print/c/print.h +++ b/level_0/f_print/c/print.h @@ -71,7 +71,7 @@ extern "C" { * f_invalid_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_print_string_dynamic_ - extern f_return_status f_print_string_dynamic(FILE *output, const f_string_dynamic buffer); + extern f_return_status f_print_string_dynamic(FILE *output, const f_string_static buffer); #endif // _di_f_print_string_dynamic_ /** @@ -96,7 +96,7 @@ extern "C" { * f_invalid_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_print_string_dynamic_partial_ - extern f_return_status f_print_string_dynamic_partial(FILE *output, const f_string_dynamic buffer, const f_string_range range); + extern f_return_status f_print_string_dynamic_partial(FILE *output, const f_string_static buffer, const f_string_range range); #endif // _di_f_print_string_dynamic_partial_ #ifdef __cplusplus diff --git a/level_1/fl_color/c/color.c b/level_1/fl_color/c/color.c index 2ef164f..ab97771 100644 --- a/level_1/fl_color/c/color.c +++ b/level_1/fl_color/c/color.c @@ -114,7 +114,7 @@ extern "C" { #endif // _di_fl_color_save_ #ifndef _di_fl_color_print_ - f_return_status fl_color_print(FILE *file, const f_string_dynamic start_color, const f_string_dynamic end_color, const int8_t *string, ...) { + f_return_status fl_color_print(FILE *file, const f_string_static start_color, const f_string_static end_color, const int8_t *string, ...) { #ifndef _di_level_1_parameter_checking_ if (file == 0) return f_status_set_error(f_invalid_parameter); if (string == 0) return f_status_set_error(f_invalid_parameter); @@ -145,7 +145,7 @@ extern "C" { #endif // _di_fl_color_print_ #ifndef _di_fl_color_print2_ - f_return_status fl_color_print2(FILE *file, const f_string_dynamic start_color, const f_string_dynamic extra_color, const f_string_dynamic end_color, const int8_t *string, ...) { + f_return_status fl_color_print2(FILE *file, const f_string_static start_color, const f_string_static extra_color, const f_string_static end_color, const int8_t *string, ...) { #ifndef _di_level_1_parameter_checking_ if (file == 0) return f_status_set_error(f_invalid_parameter); if (string == 0) return f_status_set_error(f_invalid_parameter); @@ -180,7 +180,7 @@ extern "C" { #endif // _di_fl_color_print2_ #ifndef _di_fl_color_print_line_ - f_return_status fl_color_print_line(FILE *file, const f_string_dynamic start_color, const f_string_dynamic end_color, const int8_t *string, ...) { + f_return_status fl_color_print_line(FILE *file, const f_string_static start_color, const f_string_static end_color, const int8_t *string, ...) { #ifndef _di_level_1_parameter_checking_ if (file == 0) return f_status_set_error(f_invalid_parameter); if (string == 0) return f_status_set_error(f_invalid_parameter); @@ -214,7 +214,7 @@ extern "C" { #endif // _di_fl_color_print_line_ #ifndef _di_fl_color_print2_line_ - f_return_status fl_color_print2_line(FILE *file, const f_string_dynamic start_color, const f_string_dynamic extra_color, const f_string_dynamic end_color, const int8_t *string, ...) { + f_return_status fl_color_print2_line(FILE *file, const f_string_static start_color, const f_string_static extra_color, const f_string_static end_color, const int8_t *string, ...) { #ifndef _di_level_1_parameter_checking_ if (file == 0) return f_status_set_error(f_invalid_parameter); if (string == 0) return f_status_set_error(f_invalid_parameter); @@ -252,7 +252,7 @@ extern "C" { #endif // _di_fl_color_print2_line_ #ifndef _di_fl_color_print_code_ - f_return_status fl_color_print_code(FILE *file, const f_string_dynamic color) { + f_return_status fl_color_print_code(FILE *file, const f_string_static color) { if (color.used != 0) { f_status status = f_print_string_dynamic(file, color); diff --git a/level_1/fl_color/c/color.h b/level_1/fl_color/c/color.h index bc9c4f2..88ee4f7 100644 --- a/level_1/fl_color/c/color.h +++ b/level_1/fl_color/c/color.h @@ -216,7 +216,7 @@ extern "C" { * f_error_output (with error bit) on output error. */ #ifndef _di_fl_color_print_ - extern f_return_status fl_color_print(FILE *file, const f_string_dynamic start_color, const f_string_dynamic end_color, const int8_t *string, ...); + extern f_return_status fl_color_print(FILE *file, const f_string_static start_color, const f_string_static end_color, const int8_t *string, ...); #endif // _di_fl_color_print_ /** @@ -248,7 +248,7 @@ extern "C" { * f_error_output (with error bit) on output error. */ #ifndef _di_fl_color_print2_ - extern f_return_status fl_color_print2(FILE *file, const f_string_dynamic start_color, const f_string_dynamic extra_color, const f_string_dynamic end_color, const int8_t *string, ...); + extern f_return_status fl_color_print2(FILE *file, const f_string_static start_color, const f_string_static extra_color, const f_string_static end_color, const int8_t *string, ...); #endif // _di_fl_color_print2_ /** @@ -275,7 +275,7 @@ extern "C" { * f_error_output (with error bit) on output error. */ #ifndef _di_fl_color_print_line_ - extern f_return_status fl_color_print_line(FILE *file, const f_string_dynamic start_color, const f_string_dynamic end_color, const int8_t *string, ...); + extern f_return_status fl_color_print_line(FILE *file, const f_string_static start_color, const f_string_static end_color, const int8_t *string, ...); #endif // _di_fl_color_print_line_ /** @@ -307,7 +307,7 @@ extern "C" { * f_error_output (with error bit) on output error. */ #ifndef _di_fl_color_print2_line_ - extern f_return_status fl_color_print2_line(FILE *file, const f_string_dynamic start_color, const f_string_dynamic extra_color, const f_string_dynamic end_color, const int8_t *string, ...); + extern f_return_status fl_color_print2_line(FILE *file, const f_string_static start_color, const f_string_static extra_color, const f_string_static end_color, const int8_t *string, ...); #endif // _di_fl_color_print2_line_ /** @@ -326,7 +326,7 @@ extern "C" { * f_error_output (with error bit) on output error. */ #ifndef _di_fl_color_print_code_ - extern f_return_status fl_color_print_code(FILE *file, const f_string_dynamic color); + extern f_return_status fl_color_print_code(FILE *file, const f_string_static color); #endif // _di_fl_color_print_code_ /** diff --git a/level_1/fl_file/c/file.c b/level_1/fl_file/c/file.c index d162729..241d114 100644 --- a/level_1/fl_file/c/file.c +++ b/level_1/fl_file/c/file.c @@ -97,7 +97,7 @@ extern "C" { #endif // _di_fl_file_read_position #ifndef _di_fl_file_write_ - f_return_status fl_file_write(f_file *file, const f_string_dynamic buffer) { + f_return_status fl_file_write(f_file *file, const f_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_ @@ -115,7 +115,7 @@ extern "C" { #endif // _di_fl_file_write_ #ifndef _di_fl_file_write_position_ - f_return_status fl_file_write_position(f_file *file, const f_string_dynamic buffer, const f_string_range position) { + f_return_status fl_file_write_position(f_file *file, const f_string_static buffer, const f_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_file/c/file.h b/level_1/fl_file/c/file.h index 64306e9..109e0d3 100644 --- a/level_1/fl_file/c/file.h +++ b/level_1/fl_file/c/file.h @@ -80,7 +80,7 @@ extern "C" { * f_invalid_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_fl_file_write_ - extern f_return_status fl_file_write(f_file *file, const f_string_dynamic buffer); + extern f_return_status fl_file_write(f_file *file, const f_string_static buffer); #endif // _di_fl_file_write_ /** @@ -100,7 +100,7 @@ extern "C" { * f_invalid_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_fl_file_write_position_ - extern f_return_status fl_file_write_position(f_file *file, const f_string_dynamic buffer, const f_string_range position); + extern f_return_status fl_file_write_position(f_file *file, const f_string_static buffer, const f_string_range position); #endif // _di_fl_file_write_position_ #ifdef __cplusplus diff --git a/level_1/fl_fss/c/fss.c b/level_1/fl_fss/c/fss.c index 08b1a24..2613e35 100644 --- a/level_1/fl_fss/c/fss.c +++ b/level_1/fl_fss/c/fss.c @@ -5,7 +5,7 @@ extern "C" { #endif #ifndef _di_fl_fss_decrement_buffer_ - f_return_status fl_fss_decrement_buffer(const f_string_dynamic buffer, f_string_range *location, const f_string_length step) { + f_return_status fl_fss_decrement_buffer(const f_string_static buffer, f_string_range *location, const f_string_length step) { #ifndef _di_level_1_parameter_checking_ if (buffer.used <= 0) return f_status_set_error(f_invalid_parameter); if (location->start < 0) return f_status_set_error(f_invalid_parameter); @@ -39,7 +39,7 @@ extern "C" { #endif // _di_fl_fss_decrement_buffer_ #ifndef _di_fl_fss_identify_ - f_return_status fl_fss_identify(const f_string_dynamic buffer, f_fss_header *header) { + f_return_status fl_fss_identify(const f_string_static buffer, f_fss_header *header) { #ifndef _di_level_1_parameter_checking_ if (header == 0) return f_status_set_error(f_invalid_parameter); if (buffer.used <= 0) return f_status_set_error(f_invalid_parameter); @@ -213,7 +213,7 @@ extern "C" { #endif // _di_fl_fss_identify_file_ #ifndef _di_fl_fss_increment_buffer_ - f_return_status fl_fss_increment_buffer(const f_string_dynamic buffer, f_string_range *location, const f_string_length step) { + f_return_status fl_fss_increment_buffer(const f_string_static buffer, f_string_range *location, const f_string_length step) { #ifndef _di_level_1_parameter_checking_ if (buffer.used <= 0) return f_status_set_error(f_invalid_parameter); if (location->start < 0) return f_status_set_error(f_invalid_parameter); @@ -254,7 +254,7 @@ extern "C" { #endif // _di_fl_fss_increment_buffer_ #ifndef _di_fl_fss_is_graph_ - f_return_status fl_fss_is_graph(const f_string_dynamic buffer, const f_string_range range) { + f_return_status fl_fss_is_graph(const f_string_static buffer, const f_string_range range) { #ifndef _di_level_1_parameter_checking_ if (buffer.used <= 0) return f_status_set_error(f_invalid_parameter); if (range.start < 0) return f_status_set_error(f_invalid_parameter); @@ -274,7 +274,7 @@ extern "C" { #endif // _di_fl_fss_is_graph_ #ifndef _di_fl_fss_is_space_ - f_return_status fl_fss_is_space(const f_string_dynamic buffer, const f_string_range range) { + f_return_status fl_fss_is_space(const f_string_static buffer, const f_string_range range) { #ifndef _di_level_1_parameter_checking_ if (buffer.used <= 0) return f_status_set_error(f_invalid_parameter); if (range.start < 0) return f_status_set_error(f_invalid_parameter); @@ -294,7 +294,7 @@ extern "C" { #endif // _di_fl_fss_is_space_ #ifndef _di_fl_fss_skip_past_space_ - f_return_status fl_fss_skip_past_space(const f_string_dynamic buffer, f_string_range *range) { + f_return_status fl_fss_skip_past_space(const f_string_static buffer, f_string_range *range) { #ifndef _di_level_1_parameter_checking_ if (buffer.used <= 0) return f_status_set_error(f_invalid_parameter); if (range == 0) return f_status_set_error(f_invalid_parameter); @@ -405,7 +405,7 @@ extern "C" { #endif // _di_fl_fss_skip_past_space_ #ifndef _di_fl_fss_skip_past_non_graph_ - f_return_status fl_fss_skip_past_non_graph(const f_string_dynamic buffer, f_string_range *range) { + f_return_status fl_fss_skip_past_non_graph(const f_string_static buffer, f_string_range *range) { #ifndef _di_level_1_parameter_checking_ if (buffer.used <= 0) return f_status_set_error(f_invalid_parameter); if (range == 0) return f_status_set_error(f_invalid_parameter); diff --git a/level_1/fl_fss/c/fss.h b/level_1/fl_fss/c/fss.h index 605ac10..effa5d6 100644 --- a/level_1/fl_fss/c/fss.h +++ b/level_1/fl_fss/c/fss.h @@ -54,7 +54,7 @@ extern "C" { * f_incomplete_utf_on_eos (with error bit) if the end of buffer is reached before the complete UTF-8 character can be processed. */ #ifndef _di_fl_fss_decrement_buffer_ - extern f_return_status fl_fss_decrement_buffer(const f_string_dynamic buffer, f_string_range *range, const f_string_length step); + extern f_return_status fl_fss_decrement_buffer(const f_string_static buffer, f_string_range *range, const f_string_length step); #endif // _di_fl_fss_decrement_buffer_ /** @@ -71,7 +71,7 @@ extern "C" { * f_invalid_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_fl_fss_identify_ - extern f_return_status fl_fss_identify(const f_string_dynamic buffer, f_fss_header *header); + extern f_return_status fl_fss_identify(const f_string_static buffer, f_fss_header *header); #endif // _di_fl_fss_identify_ /** @@ -123,7 +123,7 @@ extern "C" { * f_incomplete_utf_on_eos (with error bit) if the end of buffer is reached before the complete UTF-8 character can be processed. */ #ifndef _di_fl_fss_increment_buffer_ - extern f_return_status fl_fss_increment_buffer(const f_string_dynamic buffer, f_string_range *range, const f_string_length step); + extern f_return_status fl_fss_increment_buffer(const f_string_static buffer, f_string_range *range, const f_string_length step); #endif // _di_fl_fss_increment_buffer_ /** @@ -144,7 +144,7 @@ extern "C" { * f_invalid_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_fl_fss_is_graph_ - extern f_return_status fl_fss_is_graph(const f_string_dynamic buffer, const f_string_range range); + extern f_return_status fl_fss_is_graph(const f_string_static buffer, const f_string_range range); #endif // _di_fl_fss_is_graph_ /** @@ -165,7 +165,7 @@ extern "C" { * f_invalid_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_fl_fss_is_space_ - extern f_return_status fl_fss_is_space(const f_string_dynamic buffer, const f_string_range range); + extern f_return_status fl_fss_is_space(const f_string_static buffer, const f_string_range range); #endif // _di_fl_fss_is_space_ /** @@ -206,7 +206,7 @@ extern "C" { * f_invalid_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_fl_fss_skip_past_space_ - extern f_return_status fl_fss_skip_past_space(const f_string_dynamic buffer, f_string_range *range); + extern f_return_status fl_fss_skip_past_space(const f_string_static buffer, f_string_range *range); #endif // _di_fl_fss_skip_past_space_ /** @@ -226,7 +226,7 @@ extern "C" { * f_invalid_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_fl_fss_skip_past_non_graph_ - extern f_return_status fl_fss_skip_past_non_graph(const f_string_dynamic buffer, f_string_range *range); + extern f_return_status fl_fss_skip_past_non_graph(const f_string_static buffer, f_string_range *range); #endif // _di_fl_fss_skip_past_non_graph_ #ifdef __cplusplus diff --git a/level_1/fl_fss/c/fss_basic.c b/level_1/fl_fss/c/fss_basic.c index c085443..d851c00 100644 --- a/level_1/fl_fss/c/fss_basic.c +++ b/level_1/fl_fss/c/fss_basic.c @@ -419,7 +419,7 @@ extern "C" { #endif // _di_fl_fss_basic_content_read_ #ifndef _di_fl_fss_basic_object_write_ - f_return_status fl_fss_basic_object_write(f_string_dynamic *buffer, const f_string_dynamic object, f_string_range *location) { + f_return_status fl_fss_basic_object_write(f_string_dynamic *buffer, const f_string_static object, f_string_range *location) { #ifndef _di_level_1_parameter_checking_ if (buffer == 0) return f_status_set_error(f_invalid_parameter); #endif // _di_level_1_parameter_checking_ @@ -658,7 +658,7 @@ extern "C" { #endif // _di_fl_fss_basic_object_write_ #ifndef _di_fl_fss_basic_content_write_ - f_return_status fl_fss_basic_content_write(f_string_dynamic *buffer, const f_string_dynamic content, f_string_range *location) { + f_return_status fl_fss_basic_content_write(f_string_dynamic *buffer, const f_string_static content, f_string_range *location) { #ifndef _di_level_1_parameter_checking_ if (buffer == 0) return f_status_set_error(f_invalid_parameter); #endif // _di_level_1_parameter_checking_ diff --git a/level_1/fl_fss/c/fss_basic.h b/level_1/fl_fss/c/fss_basic.h index 50b7afb..ba9f9fe 100644 --- a/level_1/fl_fss/c/fss_basic.h +++ b/level_1/fl_fss/c/fss_basic.h @@ -128,7 +128,7 @@ extern "C" { * f_invalid_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_fl_fss_basic_object_write_ - extern f_return_status fl_fss_basic_object_write(f_string_dynamic *buffer, const f_string_dynamic object, f_string_range *location); + extern f_return_status fl_fss_basic_object_write(f_string_dynamic *buffer, const f_string_static object, f_string_range *location); #endif // _di_fl_fss_basic_object_write_ /** @@ -157,7 +157,7 @@ extern "C" { * f_invalid_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_fl_fss_basic_content_write_ - extern f_return_status fl_fss_basic_content_write(f_string_dynamic *buffer, const f_string_dynamic content, f_string_range *location); + extern f_return_status fl_fss_basic_content_write(f_string_dynamic *buffer, const f_string_static content, f_string_range *location); #endif // _di_fl_fss_basic_content_write_ #ifdef __cplusplus diff --git a/level_1/fl_fss/c/fss_basic_list.c b/level_1/fl_fss/c/fss_basic_list.c index f8a1c6c..a1a8499 100644 --- a/level_1/fl_fss/c/fss_basic_list.c +++ b/level_1/fl_fss/c/fss_basic_list.c @@ -380,7 +380,7 @@ extern "C" { #endif // _di_fl_fss_basic_list_content_read_ #ifndef _di_fl_fss_basic_list_object_write_ - f_return_status fl_fss_basic_list_object_write(const f_string_dynamic object, f_string_range *location, f_string_dynamic *buffer) { + f_return_status fl_fss_basic_list_object_write(const f_string_static object, f_string_range *location, f_string_dynamic *buffer) { #ifndef _di_level_1_parameter_checking_ if (buffer == 0) return f_status_set_error(f_invalid_parameter); #endif // _di_level_1_parameter_checking_ @@ -516,7 +516,7 @@ extern "C" { #endif // _di_fl_fss_basic_list_object_write_ #ifndef _di_fl_fss_basic_list_content_write_ - f_return_status fl_fss_basic_list_content_write(const f_string_dynamic content, f_string_range *location, f_string_dynamic *buffer) { + f_return_status fl_fss_basic_list_content_write(const f_string_static content, f_string_range *location, f_string_dynamic *buffer) { #ifndef _di_level_1_parameter_checking_ if (buffer == 0) return f_status_set_error(f_invalid_parameter); #endif // _di_level_1_parameter_checking_ diff --git a/level_1/fl_fss/c/fss_basic_list.h b/level_1/fl_fss/c/fss_basic_list.h index a1ca700..3687321 100644 --- a/level_1/fl_fss/c/fss_basic_list.h +++ b/level_1/fl_fss/c/fss_basic_list.h @@ -130,7 +130,7 @@ extern "C" { * f_invalid_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_fl_fss_basic_list_object_write_ - extern f_return_status fl_fss_basic_list_object_write(const f_string_dynamic object, f_string_range *location, f_string_dynamic *buffer); + extern f_return_status fl_fss_basic_list_object_write(const f_string_static object, f_string_range *location, f_string_dynamic *buffer); #endif // _di_fl_fss_basic_list_object_write_ /** @@ -159,7 +159,7 @@ extern "C" { * f_invalid_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_fl_fss_basic_list_content_write_ - extern f_return_status fl_fss_basic_list_content_write(const f_string_dynamic content, f_string_range *location, f_string_dynamic *buffer); + extern f_return_status fl_fss_basic_list_content_write(const f_string_static content, f_string_range *location, f_string_dynamic *buffer); #endif // _di_fl_fss_basic_list_content_write_ #ifdef __cplusplus diff --git a/level_1/fl_fss/c/fss_extended.c b/level_1/fl_fss/c/fss_extended.c index 945c732..546da03 100644 --- a/level_1/fl_fss/c/fss_extended.c +++ b/level_1/fl_fss/c/fss_extended.c @@ -777,7 +777,7 @@ extern "C" { #endif // _di_fl_fss_extended_content_read_ #ifndef _di_fl_fss_extended_object_write_ - f_return_status fl_fss_extended_object_write(const f_string_dynamic object, f_string_range *location, f_string_dynamic *buffer) { + f_return_status fl_fss_extended_object_write(const f_string_static object, f_string_range *location, f_string_dynamic *buffer) { #ifndef _di_level_1_parameter_checking_ if (buffer == 0) return f_status_set_error(f_invalid_parameter); #endif // _di_level_1_parameter_checking_ @@ -1033,7 +1033,7 @@ extern "C" { #endif // _di_fl_fss_extended_object_write_ #ifndef _di_fl_fss_extended_content_write_ - f_return_status fl_fss_extended_content_write(const f_string_dynamic content, f_string_range *location, f_string_dynamic *buffer) { + f_return_status fl_fss_extended_content_write(const f_string_static content, f_string_range *location, f_string_dynamic *buffer) { #ifndef _di_level_1_parameter_checking_ if (buffer == 0) return f_status_set_error(f_invalid_parameter); #endif // _di_level_1_parameter_checking_ diff --git a/level_1/fl_fss/c/fss_extended.h b/level_1/fl_fss/c/fss_extended.h index a65d67d..9dd46cf 100644 --- a/level_1/fl_fss/c/fss_extended.h +++ b/level_1/fl_fss/c/fss_extended.h @@ -128,7 +128,7 @@ extern "C" { * f_invalid_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_fl_fss_extended_object_write_ - extern f_return_status fl_fss_extended_object_write(const f_string_dynamic object, f_string_range *location, f_string_dynamic *buffer); + extern f_return_status fl_fss_extended_object_write(const f_string_static object, f_string_range *location, f_string_dynamic *buffer); #endif // _di_fl_fss_extended_object_write_ /** @@ -157,7 +157,7 @@ extern "C" { * f_invalid_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_fl_fss_extended_content_write_ - extern f_return_status fl_fss_extended_content_write(const f_string_dynamic content, f_string_range *location, f_string_dynamic *buffer); + extern f_return_status fl_fss_extended_content_write(const f_string_static content, f_string_range *location, f_string_dynamic *buffer); #endif // _di_fl_fss_extended_content_write_ #ifdef __cplusplus diff --git a/level_1/fl_fss/c/fss_extended_list.c b/level_1/fl_fss/c/fss_extended_list.c index 40e1390..ed8c62f 100644 --- a/level_1/fl_fss/c/fss_extended_list.c +++ b/level_1/fl_fss/c/fss_extended_list.c @@ -757,7 +757,7 @@ extern "C" { #endif // _di_fl_fss_extended_list_content_read_ #ifndef _di_fl_fss_extended_list_object_write_ - f_return_status fl_fss_extended_list_object_write(const f_string_dynamic object, f_string_range *location, f_string_dynamic *buffer) { + f_return_status fl_fss_extended_list_object_write(const f_string_static object, f_string_range *location, f_string_dynamic *buffer) { #ifndef _di_level_1_parameter_checking_ if (buffer == 0) return f_status_set_error(f_invalid_parameter); #endif // _di_level_1_parameter_checking_ @@ -903,7 +903,7 @@ extern "C" { #endif // _di_fl_fss_extended_list_object_write_ #ifndef _di_fl_fss_extended_list_content_write_ - f_return_status fl_fss_extended_list_content_write(const f_string_dynamic content, f_string_range *location, f_string_dynamic *buffer) { + f_return_status fl_fss_extended_list_content_write(const f_string_static content, f_string_range *location, f_string_dynamic *buffer) { #ifndef _di_level_1_parameter_checking_ if (buffer == 0) return f_status_set_error(f_invalid_parameter); #endif // _di_level_1_parameter_checking_ diff --git a/level_1/fl_fss/c/fss_extended_list.h b/level_1/fl_fss/c/fss_extended_list.h index 5765e0b..bef89aa 100644 --- a/level_1/fl_fss/c/fss_extended_list.h +++ b/level_1/fl_fss/c/fss_extended_list.h @@ -134,7 +134,7 @@ extern "C" { * f_invalid_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_fl_fss_extended_list_object_write_ - extern f_return_status fl_fss_extended_list_object_write(const f_string_dynamic object, f_string_range *location, f_string_dynamic *buffer); + extern f_return_status fl_fss_extended_list_object_write(const f_string_static object, f_string_range *location, f_string_dynamic *buffer); #endif // _di_fl_fss_extended_list_object_write_ /** @@ -163,7 +163,7 @@ extern "C" { * f_invalid_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_fl_fss_extended_list_content_write_ - extern f_return_status fl_fss_extended_list_content_write(const f_string_dynamic content, f_string_range *location, f_string_dynamic *buffer); + extern f_return_status fl_fss_extended_list_content_write(const f_string_static content, f_string_range *location, f_string_dynamic *buffer); #endif // _di_fl_fss_extended_list_content_write_ #ifdef __cplusplus diff --git a/level_1/fl_print/c/print.c b/level_1/fl_print/c/print.c index 931411d..801dbc7 100644 --- a/level_1/fl_print/c/print.c +++ b/level_1/fl_print/c/print.c @@ -92,7 +92,7 @@ extern "C" { #endif // _di_fl_print_trim_string_ #ifndef _di_fl_print_trim_string_dynamic_ - f_return_status fl_print_trim_string_dynamic(FILE *output, const f_string_dynamic buffer) { + f_return_status fl_print_trim_string_dynamic(FILE *output, const f_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_ @@ -178,7 +178,7 @@ extern "C" { #endif // _di_fl_print_trim_string_dynamic_ #ifndef _di_fl_print_trim_string_dynamic_partial_ - f_return_status fl_print_trim_string_dynamic_partial(FILE *output, const f_string_dynamic buffer, const f_string_range range) { + f_return_status fl_print_trim_string_dynamic_partial(FILE *output, const f_string_static buffer, const f_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 f0675e3..153fbad 100644 --- a/level_1/fl_print/c/print.h +++ b/level_1/fl_print/c/print.h @@ -76,7 +76,7 @@ extern "C" { * f_incomplete_utf (with error bit) if character is an incomplete UTF-8 fragment. */ #ifndef _di_fl_print_trim_string_dynamic_ - extern f_return_status fl_print_trim_string_dynamic(FILE *output, const f_string_dynamic buffer); + extern f_return_status fl_print_trim_string_dynamic(FILE *output, const f_string_static buffer); #endif // _di_fl_print_trim_string_dynamic_ /** @@ -103,7 +103,7 @@ extern "C" { * f_incomplete_utf (with error bit) if character is an incomplete UTF-8 fragment. */ #ifndef _di_fl_print_trim_string_dynamic_partial_ - extern f_return_status fl_print_trim_string_dynamic_partial(FILE *output, const f_string_dynamic buffer, const f_string_range range); + extern f_return_status fl_print_trim_string_dynamic_partial(FILE *output, const f_string_static buffer, const f_string_range range); #endif // _di_fl_print_trim_string_dynamic_partial_ /** diff --git a/level_1/fl_serialized/c/private-serialized.c b/level_1/fl_serialized/c/private-serialized.c index 857505d..47e7e92 100644 --- a/level_1/fl_serialized/c/private-serialized.c +++ b/level_1/fl_serialized/c/private-serialized.c @@ -6,7 +6,7 @@ extern "C" { #endif #if !defined(_di_fl_unserialize_simple_find_) || !defined(_di_fl_unserialize_simple_get_) - f_return_status private_fl_unserialize_simple_find(const f_string_dynamic serialized, const f_array_length index, f_string_range *location) { + f_return_status private_fl_unserialize_simple_find(const f_string_static serialized, const f_array_length index, f_string_range *location) { f_status status = f_none; f_array_length i = 0; diff --git a/level_1/fl_serialized/c/private-serialized.h b/level_1/fl_serialized/c/private-serialized.h index be6ff5b..a6892fa 100644 --- a/level_1/fl_serialized/c/private-serialized.h +++ b/level_1/fl_serialized/c/private-serialized.h @@ -35,7 +35,7 @@ extern "C" { * f_invalid_parameter (with error bit) if a parameter is invalid. */ #if !defined(_di_fl_unserialize_simple_find_) || !defined(_di_fl_unserialize_simple_get_) - extern f_return_status private_fl_unserialize_simple_find(const f_string_dynamic serialized, const f_array_length index, f_string_range *location) f_gcc_attribute_visibility_internal; + extern f_return_status private_fl_unserialize_simple_find(const f_string_static serialized, const f_array_length index, f_string_range *location) f_gcc_attribute_visibility_internal; #endif // !defined(_di_fl_unserialize_simple_find_) || !defined(_di_fl_unserialize_simple_get_) #ifdef __cplusplus diff --git a/level_1/fl_serialized/c/serialized.c b/level_1/fl_serialized/c/serialized.c index 7541421..37965c4 100644 --- a/level_1/fl_serialized/c/serialized.c +++ b/level_1/fl_serialized/c/serialized.c @@ -6,7 +6,7 @@ extern "C" { #endif #ifndef _di_fl_serialize_simple_ - f_return_status fl_serialize_simple(const f_string_dynamic value, f_string_dynamic *serialized) { + f_return_status fl_serialize_simple(const f_string_static value, f_string_dynamic *serialized) { #ifndef _di_level_0_parameter_checking_ if (serialized == 0) return f_status_set_error(f_invalid_parameter); #endif // _di_level_0_parameter_checking_ @@ -34,7 +34,7 @@ extern "C" { #endif // _di_fl_serialize_simple_ #ifndef _di_fl_unserialize_simple_ - f_return_status fl_unserialize_simple(const f_string_dynamic serialized, f_string_dynamics *strings) { + f_return_status fl_unserialize_simple(const f_string_static serialized, f_string_dynamics *strings) { #ifndef _di_level_0_parameter_checking_ if (serialized.used == 0) return f_status_set_error(f_invalid_parameter); if (strings == 0) return f_status_set_error(f_invalid_parameter); @@ -104,7 +104,7 @@ extern "C" { #endif // _di_fl_unserialize_simple_ #ifndef _di_fl_unserialize_simple_map_ - f_return_status fl_unserialize_simple_map(const f_string_dynamic serialized, f_string_ranges *locations) { + f_return_status fl_unserialize_simple_map(const f_string_static serialized, f_string_ranges *locations) { #ifndef _di_level_0_parameter_checking_ if (serialized.used == 0) return f_status_set_error(f_invalid_parameter); if (locations == 0) return f_status_set_error(f_invalid_parameter); @@ -162,7 +162,7 @@ extern "C" { #endif // _di_fl_unserialize_simple_map_ #ifndef _di_fl_unserialize_simple_find_ - f_return_status fl_unserialize_simple_find(const f_string_dynamic serialized, const f_array_length index, f_string_range *range) { + f_return_status fl_unserialize_simple_find(const f_string_static serialized, const f_array_length index, f_string_range *range) { #ifndef _di_level_0_parameter_checking_ if (serialized.used == 0) return f_status_set_error(f_invalid_parameter); if (range == 0) return f_status_set_error(f_invalid_parameter); @@ -173,7 +173,7 @@ extern "C" { #endif // _di_fl_unserialize_simple_find_ #ifndef _di_fl_unserialize_simple_get_ - f_return_status fl_unserialize_simple_get(const f_string_dynamic serialized, const f_array_length index, f_string_dynamic *dynamic) { + f_return_status fl_unserialize_simple_get(const f_string_static serialized, const f_array_length index, f_string_dynamic *dynamic) { #ifndef _di_level_0_parameter_checking_ if (serialized.used == 0) return f_status_set_error(f_invalid_parameter); if (dynamic == 0) return f_status_set_error(f_invalid_parameter); diff --git a/level_1/fl_serialized/c/serialized.h b/level_1/fl_serialized/c/serialized.h index 3a338b9..d3951f0 100644 --- a/level_1/fl_serialized/c/serialized.h +++ b/level_1/fl_serialized/c/serialized.h @@ -47,7 +47,7 @@ extern "C" { * f_error_reallocation (with error bit) on memory reallocation error. */ #ifndef _di_fl_serialize_simple_ - extern f_return_status fl_serialize_simple(const f_string_dynamic value, f_string_dynamic *serialized); + extern f_return_status fl_serialize_simple(const f_string_static value, f_string_dynamic *serialized); #endif // _di_fl_serialize_simple_ /** @@ -72,7 +72,7 @@ extern "C" { * f_error_reallocation (with error bit) on memory reallocation error. */ #ifndef _di_fl_unserialize_simple_ - extern f_return_status fl_unserialize_simple(const f_string_dynamic serialized, f_string_dynamics *strings); + extern f_return_status fl_unserialize_simple(const f_string_static serialized, f_string_dynamics *strings); #endif // _di_fl_unserialize_simple_ /** @@ -97,7 +97,7 @@ extern "C" { * f_error_reallocation (with error bit) on memory reallocation error. */ #ifndef _di_fl_unserialize_simple_map_ - extern f_return_status fl_unserialize_simple_map(const f_string_dynamic serialized, f_string_ranges *locations); + extern f_return_status fl_unserialize_simple_map(const f_string_static serialized, f_string_ranges *locations); #endif // _di_fl_unserialize_simple_map_ /** @@ -125,7 +125,7 @@ extern "C" { * f_invalid_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_fl_unserialize_simple_find_ - extern f_return_status fl_unserialize_simple_find(const f_string_dynamic serialized, const f_array_length index, f_string_range *location); + extern f_return_status fl_unserialize_simple_find(const f_string_static serialized, const f_array_length index, f_string_range *location); #endif // _di_fl_unserialize_simple_find_ /** @@ -154,7 +154,7 @@ extern "C" { * f_error_reallocation (with error bit) on memory reallocation error. */ #ifndef _di_fl_unserialize_simple_get_ - extern f_return_status fl_unserialize_simple_get(const f_string_dynamic serialized, const f_array_length index, f_string_dynamic *dynamic); + extern f_return_status fl_unserialize_simple_get(const f_string_static serialized, const f_array_length index, f_string_dynamic *dynamic); #endif // _di_fl_unserialize_simple_get_ #ifdef __cplusplus diff --git a/level_1/fl_string/c/string.c b/level_1/fl_string/c/string.c index c178b3f..b515eb9 100644 --- a/level_1/fl_string/c/string.c +++ b/level_1/fl_string/c/string.c @@ -42,19 +42,19 @@ extern "C" { #endif // _di_fl_string_compare_trim_ #ifndef _di_fl_string_dynamic_compare_ - f_return_status fl_string_dynamic_compare(const f_string_dynamic string1, const f_string_dynamic string2) { + f_return_status fl_string_dynamic_compare(const f_string_static string1, const f_string_static string2) { return private_fl_string_compare(string1.string, string2.string, 0, 0, string1.used, string2.used); } #endif // _di_fl_string_dynamic_compare_ #ifndef _di_fl_string_dynamic_compare_trim_ - f_return_status fl_string_dynamic_compare_trim(const f_string_dynamic string1, const f_string_dynamic string2) { + f_return_status fl_string_dynamic_compare_trim(const f_string_static string1, const f_string_static string2) { return private_fl_string_compare_trim(string1.string, string2.string, 0, 0, string1.used, string2.used); } #endif // _di_fl_string_dynamic_compare_trim_ #ifndef _di_fl_string_dynamic_append_ - f_return_status fl_string_dynamic_append(const f_string_dynamic source, f_string_dynamic *destination) { + f_return_status fl_string_dynamic_append(const f_string_static source, f_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_ @@ -66,7 +66,7 @@ extern "C" { #endif // _di_fl_string_dynamic_append_ #ifndef _di_fl_string_dynamic_append_nulless_ - f_return_status fl_string_dynamic_append_nulless(const f_string_dynamic source, f_string_dynamic *destination) { + f_return_status fl_string_dynamic_append_nulless(const f_string_static source, f_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_ @@ -78,7 +78,7 @@ extern "C" { #endif // _di_fl_string_dynamic_append_nulless_ #ifndef _di_fl_string_dynamic_mash_ - f_return_status fl_string_dynamic_mash(const f_string glue, const f_string_length glue_length, const f_string_dynamic source, f_string_dynamic *destination) { + f_return_status fl_string_dynamic_mash(const f_string glue, const f_string_length glue_length, const f_string_static source, f_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_ @@ -96,7 +96,7 @@ extern "C" { #endif // _di_fl_string_dynamic_mash_ #ifndef _di_fl_string_dynamic_mash_nulless_ - f_return_status fl_string_dynamic_mash_nulless(const f_string glue, const f_string_length glue_length, const f_string_dynamic source, f_string_dynamic *destination) { + f_return_status fl_string_dynamic_mash_nulless(const f_string glue, const f_string_length glue_length, const f_string_static source, f_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_ @@ -114,7 +114,7 @@ extern "C" { #endif // _di_fl_string_dynamic_mash_nulless_ #ifndef _di_fl_string_dynamic_mish_ - f_return_status fl_string_dynamic_mish(const f_string glue, const f_string_length glue_length, const f_string_dynamic source, f_string_dynamic *destination) { + f_return_status fl_string_dynamic_mish(const f_string glue, const f_string_length glue_length, const f_string_static source, f_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_ @@ -132,7 +132,7 @@ extern "C" { #endif // _di_fl_string_dynamic_mish_ #ifndef _di_fl_string_dynamic_mish_nulless_ - f_return_status fl_string_dynamic_mish_nulless(const f_string glue, const f_string_length glue_length, const f_string_dynamic source, f_string_dynamic *destination) { + f_return_status fl_string_dynamic_mish_nulless(const f_string glue, const f_string_length glue_length, const f_string_static source, f_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_ @@ -150,7 +150,7 @@ extern "C" { #endif // _di_fl_string_dynamic_mish_nulless_ #ifndef _di_fl_string_dynamic_partial_append_ - f_return_status fl_string_dynamic_partial_append(const f_string_dynamic source, const f_string_range range, f_string_dynamic *destination) { + f_return_status fl_string_dynamic_partial_append(const f_string_static source, const f_string_range range, f_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); @@ -164,7 +164,7 @@ extern "C" { #endif // _di_fl_string_dynamic_partial_append_ #ifndef _di_fl_string_dynamic_partial_append_nulless_ - f_return_status fl_string_dynamic_partial_append_nulless(const f_string_dynamic source, const f_string_range range, f_string_dynamic *destination) { + f_return_status fl_string_dynamic_partial_append_nulless(const f_string_static source, const f_string_range range, f_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); @@ -178,7 +178,7 @@ extern "C" { #endif // _di_fl_string_dynamic_append_nulless_ #ifndef _di_fl_string_dynamic_partial_compare_ - f_return_status fl_string_dynamic_partial_compare(const f_string_dynamic string1, const f_string_dynamic string2, const f_string_range range1, const f_string_range range2) { + f_return_status fl_string_dynamic_partial_compare(const f_string_static string1, const f_string_static string2, const f_string_range range1, const f_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); @@ -189,7 +189,7 @@ extern "C" { #endif // _di_fl_string_dynamic_partial_compare_ #ifndef _di_fl_string_dynamic_partial_compare_trim_ - f_return_status fl_string_dynamic_partial_compare_trim(const f_string_dynamic string1, const f_string_dynamic string2, const f_string_range range1, const f_string_range range2) { + f_return_status fl_string_dynamic_partial_compare_trim(const f_string_static string1, const f_string_static string2, const f_string_range range1, const f_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); @@ -200,7 +200,7 @@ extern "C" { #endif // _di_fl_string_dynamic_partial_compare_trim_ #ifndef _di_fl_string_dynamic_partial_mash_ - f_return_status fl_string_dynamic_partial_mash(const f_string glue, const f_string_length glue_length, const f_string_dynamic source, const f_string_range range, f_string_dynamic *destination) { + f_return_status fl_string_dynamic_partial_mash(const f_string glue, const f_string_length glue_length, const f_string_static source, const f_string_range range, f_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); @@ -220,7 +220,7 @@ extern "C" { #endif // _di_fl_string_dynamic_partial_mash_ #ifndef _di_fl_string_dynamic_partial_mash_nulless_ - f_return_status fl_string_dynamic_partial_mash_nulless(const f_string glue, const f_string_length glue_length, const f_string_dynamic source, const f_string_range range, f_string_dynamic *destination) { + f_return_status fl_string_dynamic_partial_mash_nulless(const f_string glue, const f_string_length glue_length, const f_string_static source, const f_string_range range, f_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); @@ -240,7 +240,7 @@ extern "C" { #endif // _di_fl_string_dynamic_partial_mash_nulless_ #ifndef _di_fl_string_dynamic_partial_mish_ - f_return_status fl_string_partial_dynamic_mish(const f_string glue, const f_string_length glue_length, const f_string_dynamic source, const f_string_range range, f_string_dynamic *destination) { + f_return_status fl_string_partial_dynamic_mish(const f_string glue, const f_string_length glue_length, const f_string_static source, const f_string_range range, f_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); @@ -260,7 +260,7 @@ extern "C" { #endif // _di_fl_string_dynamic_partial_mish_ #ifndef _di_fl_string_dynamic_partial_mish_nulless_ - f_return_status fl_string_dynamic_partial_mish_nulless(const f_string glue, const f_string_length glue_length, const f_string_dynamic source, const f_string_range range, f_string_dynamic *destination) { + f_return_status fl_string_dynamic_partial_mish_nulless(const f_string glue, const f_string_length glue_length, const f_string_static source, const f_string_range range, f_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); @@ -280,7 +280,7 @@ extern "C" { #endif // _di_fl_string_dynamic_partial_mish_nulless_ #ifndef _di_fl_string_dynamic_partial_prepend_ - f_return_status fl_string_dynamic_partial_prepend(const f_string_dynamic source, const f_string_range range, f_string_dynamic *destination) { + f_return_status fl_string_dynamic_partial_prepend(const f_string_static source, const f_string_range range, f_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); @@ -294,7 +294,7 @@ extern "C" { #endif // _di_fl_string_dynamic_partial_prepend_ #ifndef _di_fl_string_dynamic_partial_prepend_nulless_ - f_return_status fl_string_dynamic_partial_prepend_nulless(const f_string_dynamic source, const f_string_range range, f_string_dynamic *destination) { + f_return_status fl_string_dynamic_partial_prepend_nulless(const f_string_static source, const f_string_range range, f_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); @@ -308,7 +308,7 @@ extern "C" { #endif // _di_fl_string_dynamic_partial_prepend_nulless #ifndef _di_fl_string_dynamic_prepend_ - f_return_status fl_string_dynamic_prepend(const f_string_dynamic source, f_string_dynamic *destination) { + f_return_status fl_string_dynamic_prepend(const f_string_static source, f_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_ @@ -320,7 +320,7 @@ extern "C" { #endif // _di_fl_string_dynamic_prepend_ #ifndef _di_fl_string_dynamic_prepend_nulless_ - f_return_status fl_string_dynamic_prepend_nulless(const f_string_dynamic source, f_string_dynamic *destination) { + f_return_status fl_string_dynamic_prepend_nulless(const f_string_static source, f_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_ @@ -332,7 +332,7 @@ extern "C" { #endif // _di_fl_string_dynamic_prepend_nulless_ #ifndef _di_fl_string_dynamic_rip_ - f_return_status fl_string_dynamic_rip(const f_string_dynamic source, const f_string_range range, f_string_dynamic *destination) { + f_return_status fl_string_dynamic_rip(const f_string_static source, const f_string_range range, f_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); @@ -347,7 +347,7 @@ extern "C" { #endif // _di_fl_string_dynamic_rip_ #ifndef _di_fl_string_dynamic_rip_nulless_ - f_return_status fl_string_dynamic_rip_nulless(const f_string_dynamic source, const f_string_range range, f_string_dynamic *destination) { + f_return_status fl_string_dynamic_rip_nulless(const f_string_static source, const f_string_range range, f_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); @@ -362,7 +362,7 @@ extern "C" { #endif // _di_fl_string_dynamic_rip_nulless_ #ifndef _di_fl_string_dynamic_seek_line_to_ - f_return_status fl_string_dynamic_seek_line_to(const f_string_dynamic buffer, f_string_range *range, const int8_t seek_to_this) { + f_return_status fl_string_dynamic_seek_line_to(const f_string_static buffer, f_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); @@ -386,7 +386,7 @@ extern "C" { #endif // _di_fl_string_dynamic_seek_line_to_ #ifndef _di_fl_string_dynamic_seek_line_to_utf_character_ - f_return_status fl_string_dynamic_seek_line_to_utf_character(const f_string_dynamic buffer, f_string_range *range, const f_utf_character seek_to_this) { + f_return_status fl_string_dynamic_seek_line_to_utf_character(const f_string_static buffer, f_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); @@ -449,7 +449,7 @@ extern "C" { #endif // _di_fl_string_dynamic_seek_line_to_utf_character_ #ifndef _di_fl_string_dynamic_seek_line_until_graph_ - f_return_status fl_string_dynamic_seek_line_until_graph(const f_string_dynamic buffer, f_string_range *range, const int8_t placeholder) { + f_return_status fl_string_dynamic_seek_line_until_graph(const f_string_static buffer, f_string_range *range, const int8_t 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); @@ -505,7 +505,7 @@ extern "C" { #endif // _di_fl_string_dynamic_seek_line_until_graph_ #ifndef _di_fl_string_dynamic_seek_line_until_non_graph_ - f_return_status fl_string_dynamic_seek_line_until_non_graph(const f_string_dynamic buffer, f_string_range *range, const int8_t placeholder) { + f_return_status fl_string_dynamic_seek_line_until_non_graph(const f_string_static buffer, f_string_range *range, const int8_t 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); @@ -561,7 +561,7 @@ extern "C" { #endif // _di_fl_string_dynamic_seek_line_until_non_graph_ #ifndef _di_fl_string_dynamic_seek_to_ - f_return_status fl_string_dynamic_seek_to(const f_string_dynamic buffer, f_string_range *range, const int8_t seek_to_this) { + f_return_status fl_string_dynamic_seek_to(const f_string_static buffer, f_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); @@ -583,7 +583,7 @@ extern "C" { #endif // _di_fl_string_dynamic_seek_to_ #ifndef _di_fl_string_dynamic_seek_to_utf_character_ - f_return_status fl_string_dynamic_seek_to_utf_character(const f_string_dynamic buffer, f_string_range *range, const f_utf_character seek_to_this) { + f_return_status fl_string_dynamic_seek_to_utf_character(const f_string_static buffer, f_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); diff --git a/level_1/fl_string/c/string.h b/level_1/fl_string/c/string.h index 5aa479a..311935d 100644 --- a/level_1/fl_string/c/string.h +++ b/level_1/fl_string/c/string.h @@ -162,7 +162,7 @@ extern "C" { * @see fl_string_dynamic_append_nulless() */ #ifndef _di_fl_string_dynamic_append_ - extern f_return_status fl_string_dynamic_append(const f_string_dynamic source, f_string_dynamic *destination); + extern f_return_status fl_string_dynamic_append(const f_string_static source, f_string_dynamic *destination); #endif // _di_fl_string_dynamic_append_ /** @@ -186,7 +186,7 @@ extern "C" { * @see fl_string_dynamic_append() */ #ifndef _di_fl_string_dynamic_append_nulless_ - extern f_return_status fl_string_dynamic_append_nulless(const f_string_dynamic source, f_string_dynamic *destination); + extern f_return_status fl_string_dynamic_append_nulless(const f_string_static source, f_string_dynamic *destination); #endif // _di_fl_string_dynamic_append_nulless_ /** @@ -211,7 +211,7 @@ extern "C" { * @see fl_string_dynamic_partial_compare_trim() */ #ifndef _di_fl_string_dynamic_compare_ - extern f_return_status fl_string_dynamic_compare(const f_string_dynamic string1, const f_string_dynamic string2); + extern f_return_status fl_string_dynamic_compare(const f_string_static string1, const f_string_static string2); #endif // _di_fl_string_dynamic_compare_ /** @@ -237,7 +237,7 @@ extern "C" { * @see fl_string_dynamic_partial_compare_trim() */ #ifndef _di_fl_string_dynamic_compare_trim_ - extern f_return_status fl_string_dynamic_compare_trim(const f_string_dynamic string1, const f_string_dynamic string2); + extern f_return_status fl_string_dynamic_compare_trim(const f_string_static string1, const f_string_static string2); #endif // _di_fl_string_dynamic_compare_trim_ /** @@ -265,7 +265,7 @@ extern "C" { * @see fl_string_dynamic_mash_nulless() */ #ifndef _di_fl_string_dynamic_mash_ - extern f_return_status fl_string_dynamic_mash(const f_string glue, const f_string_length glue_length, const f_string_dynamic source, f_string_dynamic *destination); + extern f_return_status fl_string_dynamic_mash(const f_string glue, const f_string_length glue_length, const f_string_static source, f_string_dynamic *destination); #endif // _di_fl_string_dynamic_mash_ /** @@ -295,7 +295,7 @@ extern "C" { * @see fl_string_dynamic_mash() */ #ifndef _di_fl_string_dynamic_mash_nulless_ - extern f_return_status fl_string_dynamic_mash_nulless(const f_string glue, const f_string_length glue_length, const f_string_dynamic source, f_string_dynamic *destination); + extern f_return_status fl_string_dynamic_mash_nulless(const f_string glue, const f_string_length glue_length, const f_string_static source, f_string_dynamic *destination); #endif // _di_fl_string_dynamic_mash_nulless_ /** @@ -323,7 +323,7 @@ extern "C" { * @see fl_string_dynamic_mish_nulless() */ #ifndef _di_fl_string_dynamic_mish_ - extern f_return_status fl_string_dynamic_mish(const f_string glue, const f_string_length glue_length, const f_string_dynamic source, f_string_dynamic *destination); + extern f_return_status fl_string_dynamic_mish(const f_string glue, const f_string_length glue_length, const f_string_static source, f_string_dynamic *destination); #endif // _di_fl_string_dynamic_mish_ /** @@ -353,7 +353,7 @@ extern "C" { * @see fl_string_dynamic_mish() */ #ifndef _di_fl_string_dynamic_mish_nulless_ - extern f_return_status fl_string_dynamic_mish_nulless(const f_string glue, const f_string_length glue_length, const f_string_dynamic source, f_string_dynamic *destination); + extern f_return_status fl_string_dynamic_mish_nulless(const f_string glue, const f_string_length glue_length, const f_string_static source, f_string_dynamic *destination); #endif // _di_fl_string_dynamic_mish_nulless_ /** @@ -377,7 +377,7 @@ extern "C" { * @see fl_string_dynamic_partial_append_nulless() */ #ifndef _di_fl_string_dynamic_partial_append_ - extern f_return_status fl_string_dynamic_partial_append(const f_string_dynamic source, const f_string_range range, f_string_dynamic *destination); + extern f_return_status fl_string_dynamic_partial_append(const f_string_static source, const f_string_range range, f_string_dynamic *destination); #endif // _di_fl_string_dynamic_partial_append_ /** @@ -403,7 +403,7 @@ extern "C" { * @see fl_string_dynamic_partial_append() */ #ifndef _di_fl_string_dynamic_partial_append_nulless_ - extern f_return_status fl_string_dynamic_partial_append_nulless(const f_string_dynamic source, const f_string_range range, f_string_dynamic *destination); + extern f_return_status fl_string_dynamic_partial_append_nulless(const f_string_static source, const f_string_range range, f_string_dynamic *destination); #endif // _di_fl_string_dynamic_partial_append_nulless_ /** @@ -432,7 +432,7 @@ extern "C" { * @see fl_string_dynamic_compare_trim() */ #ifndef _di_fl_string_dynamic_partial_compare_ - extern f_return_status fl_string_dynamic_partial_compare(const f_string_dynamic string1, const f_string_dynamic string2, const f_string_range range1, const f_string_range range2); + extern f_return_status fl_string_dynamic_partial_compare(const f_string_static string1, const f_string_static string2, const f_string_range range1, const f_string_range range2); #endif // _di_fl_string_dynamic_partial_compare_ /** @@ -462,7 +462,7 @@ extern "C" { * @see fl_string_dynamic_compare_trim() */ #ifndef _di_fl_string_dynamic_partial_compare_trim_ - extern f_return_status fl_string_dynamic_partial_compare_trim(const f_string_dynamic string1, const f_string_dynamic string2, const f_string_range range1, const f_string_range range2); + extern f_return_status fl_string_dynamic_partial_compare_trim(const f_string_static string1, const f_string_static string2, const f_string_range range1, const f_string_range range2); #endif // _di_fl_string_dynamic_partial_compare_trim_ /** @@ -492,7 +492,7 @@ extern "C" { * @see fl_string_dynamic_partial_mash_nulless() */ #ifndef _di_fl_string_dynamic_partial_mash_ - extern f_return_status fl_string_dynamic_partial_mash(const f_string glue, const f_string_length glue_length, const f_string_dynamic source, const f_string_range range, f_string_dynamic *destination); + extern f_return_status fl_string_dynamic_partial_mash(const f_string glue, const f_string_length glue_length, const f_string_static source, const f_string_range range, f_string_dynamic *destination); #endif // _di_fl_string_dynamic_partial_mash_ /** @@ -524,7 +524,7 @@ extern "C" { * @see fl_string_dynamic_partial_mash() */ #ifndef _di_fl_string_dynamic_partial_mash_nulless_ - extern f_return_status fl_string_dynamic_partial_mash_nulless(const f_string glue, const f_string_length glue_length, const f_string_dynamic source, const f_string_range range, f_string_dynamic *destination); + extern f_return_status fl_string_dynamic_partial_mash_nulless(const f_string glue, const f_string_length glue_length, const f_string_static source, const f_string_range range, f_string_dynamic *destination); #endif // _di_fl_string_dynamic_partial_mash_nulless_ /** @@ -554,7 +554,7 @@ extern "C" { * @see fl_string_dynamic_partial_mish_nulless() */ #ifndef _di_fl_string_dynamic_partial_mish_ - extern f_return_status fl_string_dynamic_partial_mish(const f_string glue, const f_string_length glue_length, const f_string_dynamic source, const f_string_range range, f_string_dynamic *destination); + extern f_return_status fl_string_dynamic_partial_mish(const f_string glue, const f_string_length glue_length, const f_string_static source, const f_string_range range, f_string_dynamic *destination); #endif // _di_fl_string_dynamic_partial_mish_ /** @@ -586,7 +586,7 @@ extern "C" { * @see fl_string_dynamic_partial_mish() */ #ifndef _di_fl_string_dynamic_partial_mish_nulless_ - extern f_return_status fl_string_dynamic_partial_mish_nulless(const f_string glue, const f_string_length glue_length, const f_string_dynamic source, const f_string_range range, f_string_dynamic *destination); + extern f_return_status fl_string_dynamic_partial_mish_nulless(const f_string glue, const f_string_length glue_length, const f_string_static source, const f_string_range range, f_string_dynamic *destination); #endif // _di_fl_string_dynamic_partial_mish_nulless_ /** @@ -612,7 +612,7 @@ extern "C" { * @see fl_string_dynamic_partial_prepend_nulless() */ #ifndef _di_fl_string_dynamic_partial_prepend_ - extern f_return_status fl_string_dynamic_partial_prepend(const f_string_dynamic source, const f_string_range range, f_string_dynamic *destination); + extern f_return_status fl_string_dynamic_partial_prepend(const f_string_static source, const f_string_range range, f_string_dynamic *destination); #endif // _di_fl_string_dynamic_partial_prepend_ /** @@ -638,7 +638,7 @@ extern "C" { * @see fl_string_dynamic_partial_prepend() */ #ifndef _di_fl_string_dynamic_partial_prepend_nulless_ - extern f_return_status fl_string_dynamic_partial_prepend_nulless(const f_string_dynamic source, const f_string_range range, f_string_dynamic *destination); + extern f_return_status fl_string_dynamic_partial_prepend_nulless(const f_string_static source, const f_string_range range, f_string_dynamic *destination); #endif // _di_fl_string_dynamic_partial_prepend_nulless_ /** @@ -662,7 +662,7 @@ extern "C" { * @see fl_string_dynamic_prepend_nulless() */ #ifndef _di_fl_string_dynamic_prepend_ - extern f_return_status fl_string_dynamic_prepend(const f_string_dynamic source, f_string_dynamic *destination); + extern f_return_status fl_string_dynamic_prepend(const f_string_static source, f_string_dynamic *destination); #endif // _di_fl_string_dynamic_prepend_ /** @@ -686,7 +686,7 @@ extern "C" { * @see fl_string_dynamic_prepend() */ #ifndef _di_fl_string_dynamic_prepend_nulless_ - extern f_return_status fl_string_dynamic_prepend_nulless(const f_string_dynamic source, f_string_dynamic *destination); + extern f_return_status fl_string_dynamic_prepend_nulless(const f_string_static source, f_string_dynamic *destination); #endif // _di_fl_string_dynamic_prepend_nulless_ /** @@ -712,7 +712,7 @@ extern "C" { * @see fl_string_dynamic_rip_nulless() */ #ifndef _di_fl_string_dynamic_rip_ - extern f_return_status fl_string_dynamic_rip(const f_string_dynamic source, const f_string_range range, f_string_dynamic *destination); + extern f_return_status fl_string_dynamic_rip(const f_string_static source, const f_string_range range, f_string_dynamic *destination); #endif // _di_fl_string_dynamic_rip_ /** @@ -740,7 +740,7 @@ extern "C" { * @see fl_string_dynamic_rip() */ #ifndef _di_fl_string_dynamic_rip_nulless_ - extern f_return_status fl_string_dynamic_rip_nulless(const f_string_dynamic source, const f_string_range range, f_string_dynamic *destination); + extern f_return_status fl_string_dynamic_rip_nulless(const f_string_static source, const f_string_range range, f_string_dynamic *destination); #endif // _di_fl_string_dynamic_rip_nulless_ /** @@ -765,7 +765,7 @@ extern "C" { * @see fl_string_seek_line_to_utf_character() */ #ifndef _di_fl_string_dynamic_seek_line_to_ - extern f_return_status fl_string_dynamic_seek_line_to(const f_string_dynamic buffer, f_string_range *range, const int8_t seek_to_this); + extern f_return_status fl_string_dynamic_seek_line_to(const f_string_static buffer, f_string_range *range, const int8_t seek_to_this); #endif // _di_fl_string_dynamic_seek_line_to_ /** @@ -793,7 +793,7 @@ extern "C" { * @see fl_string_seek_line_to() */ #ifndef _di_fl_string_dynamic_seek_line_to_utf_character_ - extern f_return_status fl_string_dynamic_seek_line_to_utf_character(const f_string_dynamic buffer, f_string_range *range, const f_utf_character seek_to_this); + extern f_return_status fl_string_dynamic_seek_line_to_utf_character(const f_string_static buffer, f_string_range *range, const f_utf_character seek_to_this); #endif // _di_fl_string_dynamic_seek_line_to_utf_character_ /** @@ -820,7 +820,7 @@ extern "C" { * @see fl_string_seek_line_until_graph() */ #ifndef _di_fl_string_dynamic_seek_line_until_graph_ - extern f_return_status fl_string_dynamic_seek_line_until_graph(const f_string_dynamic buffer, f_string_range *range, const int8_t placeholder); + extern f_return_status fl_string_dynamic_seek_line_until_graph(const f_string_static buffer, f_string_range *range, const int8_t placeholder); #endif // _di_fl_string_dynamic_seek_line_until_graph_ /** @@ -848,7 +848,7 @@ extern "C" { * @see fl_string_seek_line_until_non_graph() */ #ifndef _di_fl_string_dynamic_seek_line_until_non_graph_ - extern f_return_status fl_string_dynamic_seek_line_until_non_graph(const f_string_dynamic buffer, f_string_range *range, const int8_t placeholder); + extern f_return_status fl_string_dynamic_seek_line_until_non_graph(const f_string_static buffer, f_string_range *range, const int8_t placeholder); #endif // _di_fl_string_dynamic_seek_line_until_non_graph_ /** @@ -876,7 +876,7 @@ extern "C" { * @see fl_string_seek_to_utf_character() */ #ifndef _di_fl_string_dynamic_seek_to_ - extern f_return_status fl_string_dynamic_seek_to(const f_string_dynamic buffer, f_string_range *range, const int8_t seek_to_this); + extern f_return_status fl_string_dynamic_seek_to(const f_string_static buffer, f_string_range *range, const int8_t seek_to_this); #endif // _di_fl_string_dynamic_seek_to_ /** @@ -905,7 +905,7 @@ extern "C" { * @see fl_string_seek_to_character() */ #ifndef _di_fl_string_dynamic_seek_to_utf_character_ - extern f_return_status fl_string_dynamic_seek_to_utf_character(const f_string_dynamic buffer, f_string_range *range, const f_utf_character seek_to_this); + extern f_return_status fl_string_dynamic_seek_to_utf_character(const f_string_static buffer, f_string_range *range, const f_utf_character seek_to_this); #endif // _di_fl_string_dynamic_seek_to_utf_character_ /** diff --git a/level_2/fll_execute/c/execute.c b/level_2/fll_execute/c/execute.c index ab779e8..a606b66 100644 --- a/level_2/fll_execute/c/execute.c +++ b/level_2/fll_execute/c/execute.c @@ -92,7 +92,7 @@ extern "C" { #endif // _di_fll_execute_arguments_add_set_ #ifndef _di_fll_execute_arguments_dynamic_add_ - f_return_status fll_execute_arguments_dynamic_add(const f_string_dynamic source, f_string_dynamics *arguments) { + f_return_status fll_execute_arguments_dynamic_add(const f_string_static source, f_string_dynamics *arguments) { #ifndef _di_level_2_parameter_checking_ if (source.used > source.size) return f_status_set_error(f_invalid_parameter); if (arguments == 0) return f_status_set_error(f_invalid_parameter); @@ -112,7 +112,7 @@ extern "C" { #endif // _di_fll_execute_arguments_dynamic_add_ #ifndef _di_fll_execute_arguments_dynamic_add_parameter_ - f_return_status fll_execute_arguments_dynamic_add_parameter(const f_string_dynamic prefix, const f_string_dynamic name, const f_string_dynamic value, f_string_dynamics *arguments) { + f_return_status fll_execute_arguments_dynamic_add_parameter(const f_string_static prefix, const f_string_static name, const f_string_static value, f_string_dynamics *arguments) { #ifndef _di_level_2_parameter_checking_ if (prefix.used > prefix.size) return f_status_set_error(f_invalid_parameter); if (name.used > name.size) return f_status_set_error(f_invalid_parameter); @@ -135,7 +135,7 @@ extern "C" { #endif // _di_fll_execute_arguments_dynamic_add_parameter_ #ifndef _di_fll_execute_arguments_dynamic_add_parameter_set_ - f_return_status fll_execute_arguments_dynamic_add_parameter_set(const f_string_dynamic prefix[], const f_string_dynamic name[], const f_string_dynamic value[], const f_array_length size, f_string_dynamics *arguments) { + f_return_status fll_execute_arguments_dynamic_add_parameter_set(const f_string_static prefix[], const f_string_static name[], const f_string_static value[], const f_array_length size, f_string_dynamics *arguments) { #ifndef _di_level_2_parameter_checking_ if (arguments == 0) return f_status_set_error(f_invalid_parameter); if (arguments->used > arguments->size) return f_status_set_error(f_invalid_parameter); @@ -162,7 +162,7 @@ extern "C" { #endif // _di_fll_execute_arguments_dynamic_add_parameter_set_ #ifndef _di_fll_execute_arguments_dynamic_add_set_ - f_return_status fll_execute_arguments_dynamic_add_set(const f_string_dynamic source[], const f_array_length size, f_string_dynamics *arguments) { + f_return_status fll_execute_arguments_dynamic_add_set(const f_string_static source[], const f_array_length size, f_string_dynamics *arguments) { #ifndef _di_level_2_parameter_checking_ if (arguments == 0) return f_status_set_error(f_invalid_parameter); if (arguments->used > arguments->size) return f_status_set_error(f_invalid_parameter); diff --git a/level_2/fll_execute/c/execute.h b/level_2/fll_execute/c/execute.h index 67bf232..d454b72 100644 --- a/level_2/fll_execute/c/execute.h +++ b/level_2/fll_execute/c/execute.h @@ -182,7 +182,7 @@ extern "C" { * f_buffer_too_large (with error bit) if arguments array is too larger for further allocation. */ #ifndef _di_fll_execute_arguments_dynamic_add_ - extern f_return_status fll_execute_arguments_dynamic_add(const f_string_dynamic source, f_string_dynamics *arguments); + extern f_return_status fll_execute_arguments_dynamic_add(const f_string_static source, f_string_dynamics *arguments); #endif // _di_fll_execute_arguments_dynamic_add_ /** @@ -215,7 +215,7 @@ extern "C" { * f_buffer_too_large (with error bit) if arguments array is too larger for further allocation. */ #ifndef _di_fll_execute_arguments_dynamic_add_parameter_ - extern f_return_status fll_execute_arguments_dynamic_add_parameter(const f_string_dynamic prefix, const f_string_dynamic name, const f_string_dynamic value, f_string_dynamics *arguments); + extern f_return_status fll_execute_arguments_dynamic_add_parameter(const f_string_static prefix, const f_string_static name, const f_string_static value, f_string_dynamics *arguments); #endif // _di_fll_execute_arguments_dynamic_add_parameter_ /** @@ -250,7 +250,7 @@ extern "C" { * f_buffer_too_large (with error bit) if arguments array is too larger for further allocation. */ #ifndef _di_fll_execute_arguments_dynamic_add_parameter_set_ - extern f_return_status fll_execute_arguments_dynamic_add_parameter_set(const f_string_dynamic prefix[], const f_string_dynamic name[], const f_string_dynamic value[], const f_array_length size, f_string_dynamics *arguments); + extern f_return_status fll_execute_arguments_dynamic_add_parameter_set(const f_string_static prefix[], const f_string_static name[], const f_string_static value[], const f_array_length size, f_string_dynamics *arguments); #endif // _di_fll_execute_arguments_dynamic_add_parameter_set_ /** @@ -275,7 +275,7 @@ extern "C" { * f_buffer_too_large (with error bit) if arguments array is too larger for further allocation. */ #ifndef _di_fll_execute_arguments_dynamic_add_set_ - extern f_return_status fll_execute_arguments_dynamic_add_set(const f_string_dynamic source[], const f_array_length size, f_string_dynamics *arguments); + extern f_return_status fll_execute_arguments_dynamic_add_set(const f_string_static source[], const f_array_length size, f_string_dynamics *arguments); #endif // _di_fll_execute_arguments_dynamic_add_set_ /** diff --git a/level_2/fll_fss/c/fss.c b/level_2/fll_fss/c/fss.c index 12f4a58..54e8482 100644 --- a/level_2/fll_fss/c/fss.c +++ b/level_2/fll_fss/c/fss.c @@ -5,7 +5,7 @@ extern "C" { #endif #ifndef _di_fll_fss_snatch_ - f_return_status fll_fss_snatch(const f_string_dynamic buffer, const f_fss_objects objects, const f_fss_contents contents, const f_string names[], const f_string_length lengths[], f_string_dynamic *values[], const f_string_length size) { + f_return_status fll_fss_snatch(const f_string_static buffer, const f_fss_objects objects, const f_fss_contents contents, const f_string names[], const f_string_length lengths[], f_string_dynamic *values[], const f_string_length size) { #ifndef _di_level_2_parameter_checking_ if (size == 0) return f_status_set_error(f_invalid_parameter); #endif // _di_level_2_parameter_checking_ @@ -45,7 +45,7 @@ extern "C" { #endif // _di_fll_fss_snatch_ #ifndef _di_fll_fss_snatch_apart_ - f_return_status fll_fss_snatch_apart(const f_string_dynamic buffer, const f_fss_objects objects, const f_fss_contents contents, const f_string names[], const f_string_length lengths[], f_string_dynamics *values[], const f_string_length size) { + f_return_status fll_fss_snatch_apart(const f_string_static buffer, const f_fss_objects objects, const f_fss_contents contents, const f_string names[], const f_string_length lengths[], f_string_dynamics *values[], const f_string_length size) { #ifndef _di_level_2_parameter_checking_ if (size == 0) return f_status_set_error(f_invalid_parameter); #endif // _di_level_2_parameter_checking_ @@ -92,7 +92,7 @@ extern "C" { #endif // _di_fll_fss_snatch_apart_ #ifndef _di_fll_fss_snatch_together_ - f_return_status fll_fss_snatch_together(const f_string_dynamic buffer, const f_fss_objects objects, const f_fss_contents contents, const f_string names[], const f_string_length lengths[], f_string_dynamic *values[], const f_string_length size) { + f_return_status fll_fss_snatch_together(const f_string_static buffer, const f_fss_objects objects, const f_fss_contents contents, const f_string names[], const f_string_length lengths[], f_string_dynamic *values[], const f_string_length size) { #ifndef _di_level_2_parameter_checking_ if (size == 0) return f_status_set_error(f_invalid_parameter); #endif // _di_level_2_parameter_checking_ @@ -130,7 +130,7 @@ extern "C" { #endif // _di_fll_fss_snatch_together_ #ifndef _di_fll_fss_snatch_mash_ - f_return_status fll_fss_snatch_mash(const f_string_dynamic buffer, const f_fss_objects objects, const f_fss_contents contents, const f_string names[], const f_string_length lengths[], f_string_dynamic *values[], const f_string_length size, const f_string glue, const f_string_length glue_length) { + f_return_status fll_fss_snatch_mash(const f_string_static buffer, const f_fss_objects objects, const f_fss_contents contents, const f_string names[], const f_string_length lengths[], f_string_dynamic *values[], const f_string_length size, const f_string glue, const f_string_length glue_length) { #ifndef _di_level_2_parameter_checking_ if (size == 0) return f_status_set_error(f_invalid_parameter); #endif // _di_level_2_parameter_checking_ @@ -170,7 +170,7 @@ extern "C" { #endif // _di_fll_fss_snatch_mash_ #ifndef _di_fll_fss_snatch_mash_apart_ - f_return_status fll_fss_snatch_mash_apart(const f_string_dynamic buffer, const f_fss_objects objects, const f_fss_contents contents, const f_string names[], const f_string_length lengths[], f_string_dynamics *values[], const f_string_length size, const f_string glue, const f_string_length glue_length) { + f_return_status fll_fss_snatch_mash_apart(const f_string_static buffer, const f_fss_objects objects, const f_fss_contents contents, const f_string names[], const f_string_length lengths[], f_string_dynamics *values[], const f_string_length size, const f_string glue, const f_string_length glue_length) { #ifndef _di_level_2_parameter_checking_ if (size == 0) return f_status_set_error(f_invalid_parameter); #endif // _di_level_2_parameter_checking_ @@ -225,7 +225,7 @@ extern "C" { #endif // _di_fll_fss_snatch_mash_apart_ #ifndef _di_fll_fss_snatch_mash_together_ - f_return_status fll_fss_snatch_mash_together(const f_string_dynamic buffer, const f_fss_objects objects, const f_fss_contents contents, const f_string names[], const f_string_length lengths[], f_string_dynamic *values[], const f_string_length size, const f_string glue, const f_string_length glue_length) { + f_return_status fll_fss_snatch_mash_together(const f_string_static buffer, const f_fss_objects objects, const f_fss_contents contents, const f_string names[], const f_string_length lengths[], f_string_dynamic *values[], const f_string_length size, const f_string glue, const f_string_length glue_length) { #ifndef _di_level_2_parameter_checking_ if (size == 0) return f_status_set_error(f_invalid_parameter); #endif // _di_level_2_parameter_checking_ diff --git a/level_2/fll_fss/c/fss.h b/level_2/fll_fss/c/fss.h index 4f44fd3..c0d11d6 100644 --- a/level_2/fll_fss/c/fss.h +++ b/level_2/fll_fss/c/fss.h @@ -66,7 +66,7 @@ extern "C" { * f_string_max_size (with error bit) if any combined string is too large when processing values. */ #ifndef _di_fll_fss_snatch_ - extern f_return_status fll_fss_snatch(const f_string_dynamic buffer, const f_fss_objects objects, const f_fss_contents contents, const f_string names[], const f_string_length lengths[], f_string_dynamic *values[], const f_string_length size); + extern f_return_status fll_fss_snatch(const f_string_static buffer, const f_fss_objects objects, const f_fss_contents contents, const f_string names[], const f_string_length lengths[], f_string_dynamic *values[], const f_string_length size); #endif // _di_fll_fss_snatch_ /** @@ -105,7 +105,7 @@ extern "C" { * f_string_max_size (with error bit) if any combined string is too large when processing values. */ #ifndef _di_fll_fss_snatch_apart_ - extern f_return_status fll_fss_snatch_apart(const f_string_dynamic buffer, const f_fss_objects objects, const f_fss_contents contents, const f_string names[], const f_string_length lengths[], f_string_dynamics *values[], const f_string_length size); + extern f_return_status fll_fss_snatch_apart(const f_string_static buffer, const f_fss_objects objects, const f_fss_contents contents, const f_string names[], const f_string_length lengths[], f_string_dynamics *values[], const f_string_length size); #endif // _di_fll_fss_snatch_apart_ /** @@ -143,7 +143,7 @@ extern "C" { * f_string_max_size (with error bit) if any combined string is too large when processing values. */ #ifndef _di_fll_fss_snatch_together_ - extern f_return_status fll_fss_snatch_together(const f_string_dynamic buffer, const f_fss_objects objects, const f_fss_contents contents, const f_string names[], const f_string_length lengths[], f_string_dynamic *values[], const f_string_length size); + extern f_return_status fll_fss_snatch_together(const f_string_static buffer, const f_fss_objects objects, const f_fss_contents contents, const f_string names[], const f_string_length lengths[], f_string_dynamic *values[], const f_string_length size); #endif // _di_fll_fss_snatch_together_ /** @@ -186,7 +186,7 @@ extern "C" { * f_string_max_size (with error bit) if any combined string is too large when processing values. */ #ifndef _di_fll_fss_snatch_mash_ - extern f_return_status fll_fss_snatch_mash(const f_string_dynamic buffer, const f_fss_objects objects, const f_fss_contents contents, const f_string names[], const f_string_length lengths[], f_string_dynamic *values[], const f_string_length size, const f_string glue, const f_string_length glue_length); + extern f_return_status fll_fss_snatch_mash(const f_string_static buffer, const f_fss_objects objects, const f_fss_contents contents, const f_string names[], const f_string_length lengths[], f_string_dynamic *values[], const f_string_length size, const f_string glue, const f_string_length glue_length); #endif // _di_fll_fss_snatch_mash_ /** @@ -228,7 +228,7 @@ extern "C" { * f_string_max_size (with error bit) if any combined string is too large when processing values. */ #ifndef _di_fll_fss_snatch_mash_apart_ - extern f_return_status fll_fss_snatch_mash_apart(const f_string_dynamic buffer, const f_fss_objects objects, const f_fss_contents contents, const f_string names[], const f_string_length lengths[], f_string_dynamics *values[], const f_string_length size, const f_string glue, const f_string_length glue_length); + extern f_return_status fll_fss_snatch_mash_apart(const f_string_static buffer, const f_fss_objects objects, const f_fss_contents contents, const f_string names[], const f_string_length lengths[], f_string_dynamics *values[], const f_string_length size, const f_string glue, const f_string_length glue_length); #endif // _di_fll_fss_snatch_mash_apart_ /** @@ -270,7 +270,7 @@ extern "C" { * f_string_max_size (with error bit) if any combined string is too large when processing values. */ #ifndef _di_fll_fss_snatch_mash_together_ - extern f_return_status fll_fss_snatch_mash_together(const f_string_dynamic buffer, const f_fss_objects objects, const f_fss_contents contents, const f_string names[], const f_string_length lengths[], f_string_dynamic *values[], const f_string_length size, const f_string glue, const f_string_length glue_length); + extern f_return_status fll_fss_snatch_mash_together(const f_string_static buffer, const f_fss_objects objects, const f_fss_contents contents, const f_string names[], const f_string_length lengths[], f_string_dynamic *values[], const f_string_length size, const f_string glue, const f_string_length glue_length); #endif // _di_fll_fss_snatch_mash_together_ #ifdef __cplusplus diff --git a/level_2/fll_fss/c/fss_basic.c b/level_2/fll_fss/c/fss_basic.c index bd891a2..e71bb1c 100644 --- a/level_2/fll_fss/c/fss_basic.c +++ b/level_2/fll_fss/c/fss_basic.c @@ -143,7 +143,7 @@ extern "C" { #endif // _di_fll_fss_basic_read_ #ifndef _di_fll_fss_basic_write_ - f_return_status fll_fss_basic_write(const f_string_dynamic object, const f_string_dynamics contents, f_string_dynamic *buffer) { + f_return_status fll_fss_basic_write(const f_string_static object, const f_string_dynamics contents, f_string_dynamic *buffer) { #ifndef _di_level_2_parameter_checking_ if (buffer == 0) return f_status_set_error(f_invalid_parameter); if (contents.used > contents.size) return f_status_set_error(f_invalid_parameter); diff --git a/level_2/fll_fss/c/fss_basic.h b/level_2/fll_fss/c/fss_basic.h index e2b0a96..18032a5 100644 --- a/level_2/fll_fss/c/fss_basic.h +++ b/level_2/fll_fss/c/fss_basic.h @@ -79,7 +79,7 @@ extern "C" { * f_invalid_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_fll_fss_basic_write_ - extern f_return_status fll_fss_basic_write(const f_string_dynamic object, const f_string_dynamics contents, f_string_dynamic *buffer); + extern f_return_status fll_fss_basic_write(const f_string_static object, const f_string_dynamics contents, f_string_dynamic *buffer); #endif // _di_fll_fss_basic_write_ #ifdef __cplusplus diff --git a/level_2/fll_fss/c/fss_basic_list.c b/level_2/fll_fss/c/fss_basic_list.c index 977b92d..ff2c4bf 100644 --- a/level_2/fll_fss/c/fss_basic_list.c +++ b/level_2/fll_fss/c/fss_basic_list.c @@ -143,7 +143,7 @@ extern "C" { #endif // _di_fll_fss_basic_list_read_ #ifndef _di_fll_fss_basic_list_write_ - f_return_status fll_fss_basic_list_write(const f_string_dynamic object, const f_string_dynamics contents, f_string_dynamic *buffer) { + f_return_status fll_fss_basic_list_write(const f_string_static object, const f_string_dynamics contents, f_string_dynamic *buffer) { #ifndef _di_level_2_parameter_checking_ if (buffer == 0) return f_status_set_error(f_invalid_parameter); if (contents.used > contents.size) return f_status_set_error(f_invalid_parameter); diff --git a/level_2/fll_fss/c/fss_basic_list.h b/level_2/fll_fss/c/fss_basic_list.h index db56e0d..8ac24a3 100644 --- a/level_2/fll_fss/c/fss_basic_list.h +++ b/level_2/fll_fss/c/fss_basic_list.h @@ -78,7 +78,7 @@ extern "C" { * f_invalid_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_fll_fss_basic_list_write_ - extern f_return_status fll_fss_basic_list_write(const f_string_dynamic object, const f_string_dynamics contents, f_string_dynamic *buffer); + extern f_return_status fll_fss_basic_list_write(const f_string_static object, const f_string_dynamics contents, f_string_dynamic *buffer); #endif // _di_fll_fss_basic_list_write_ #ifdef __cplusplus diff --git a/level_2/fll_fss/c/fss_extended.c b/level_2/fll_fss/c/fss_extended.c index 81e9e38..a566238 100644 --- a/level_2/fll_fss/c/fss_extended.c +++ b/level_2/fll_fss/c/fss_extended.c @@ -143,7 +143,7 @@ extern "C" { #endif // _di_fll_fss_extended_read_ #ifndef _di_fll_fss_extended_write_ - f_return_status fll_fss_extended_write(const f_string_dynamic object, const f_string_dynamics contents, f_string_dynamic *buffer) { + f_return_status fll_fss_extended_write(const f_string_static object, const f_string_dynamics contents, f_string_dynamic *buffer) { #ifndef _di_level_2_parameter_checking_ if (buffer == 0) return f_status_set_error(f_invalid_parameter); if (contents.used > contents.size) return f_status_set_error(f_invalid_parameter); diff --git a/level_2/fll_fss/c/fss_extended.h b/level_2/fll_fss/c/fss_extended.h index 9cd2434..0a6fdc3 100644 --- a/level_2/fll_fss/c/fss_extended.h +++ b/level_2/fll_fss/c/fss_extended.h @@ -78,7 +78,7 @@ extern "C" { * f_invalid_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_fll_fss_extended_write_ - extern f_return_status fll_fss_extended_write(const f_string_dynamic object, const f_string_dynamics contents, f_string_dynamic *buffer); + extern f_return_status fll_fss_extended_write(const f_string_static object, const f_string_dynamics contents, f_string_dynamic *buffer); #endif // _di_fll_fss_extended_write_ #ifdef __cplusplus diff --git a/level_2/fll_fss/c/fss_extended_list.c b/level_2/fll_fss/c/fss_extended_list.c index 3015bc1..a9b6024 100644 --- a/level_2/fll_fss/c/fss_extended_list.c +++ b/level_2/fll_fss/c/fss_extended_list.c @@ -113,7 +113,7 @@ extern "C" { /* #ifndef _di_fll_fss_extended_list_write_ - f_return_status fll_fss_extended_list_write(const f_string_dynamic object, const f_string_dynamics contents, f_string_dynamic *buffer) { + f_return_status fll_fss_extended_list_write(const f_string_static object, const f_string_dynamics contents, f_string_dynamic *buffer) { #ifndef _di_level_3_parameter_checking_ if (buffer == 0) return f_status_set_error(f_invalid_parameter); if (contents.used > contents.size) return f_status_set_error(f_invalid_parameter); diff --git a/level_2/fll_fss/c/fss_extended_list.h b/level_2/fll_fss/c/fss_extended_list.h index 009d1cf..0ab413f 100644 --- a/level_2/fll_fss/c/fss_extended_list.h +++ b/level_2/fll_fss/c/fss_extended_list.h @@ -83,7 +83,7 @@ extern "C" { * f_invalid_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_fll_fss_extended_list_write_ - //extern f_return_status fll_fss_extended_list_write(const f_string_dynamic object, const f_string_dynamics contents, f_string_dynamic *buffer); + //extern f_return_status fll_fss_extended_list_write(const f_string_static object, const f_string_dynamics contents, f_string_dynamic *buffer); #endif // _di_fll_fss_extended_list_write_ #ifdef __cplusplus diff --git a/level_3/fss_basic_list_read/c/private-fss_basic_list_read.c b/level_3/fss_basic_list_read/c/private-fss_basic_list_read.c index a22daa9..dc27d64 100644 --- a/level_3/fss_basic_list_read/c/private-fss_basic_list_read.c +++ b/level_3/fss_basic_list_read/c/private-fss_basic_list_read.c @@ -389,7 +389,7 @@ extern "C" { return f_none; } - f_return_status (*print_object)(FILE *, const f_string_dynamic, const f_string_range) = &f_print_string_dynamic_partial; + f_return_status (*print_object)(FILE *, const f_string_static, const f_string_range) = &f_print_string_dynamic_partial; if (data->parameters[fss_basic_list_read_parameter_trim].result == f_console_result_found) { print_object = &fl_print_trim_string_dynamic_partial; diff --git a/level_3/fss_basic_read/c/private-fss_basic_read.c b/level_3/fss_basic_read/c/private-fss_basic_read.c index a792303..66610a3 100644 --- a/level_3/fss_basic_read/c/private-fss_basic_read.c +++ b/level_3/fss_basic_read/c/private-fss_basic_read.c @@ -389,7 +389,7 @@ extern "C" { return f_none; } - f_return_status (*print_object)(FILE *, const f_string_dynamic, const f_string_range) = &f_print_string_dynamic_partial; + f_return_status (*print_object)(FILE *, const f_string_static, const f_string_range) = &f_print_string_dynamic_partial; if (data->parameters[fss_basic_read_parameter_trim].result == f_console_result_found) { print_object = &fl_print_trim_string_dynamic_partial; diff --git a/level_3/fss_extended_list_read/c/private-fss_extended_list_read.c b/level_3/fss_extended_list_read/c/private-fss_extended_list_read.c index d210161..17ca9d6 100644 --- a/level_3/fss_extended_list_read/c/private-fss_extended_list_read.c +++ b/level_3/fss_extended_list_read/c/private-fss_extended_list_read.c @@ -412,7 +412,7 @@ extern "C" { return f_none; } - f_return_status (*print_object)(FILE *, const f_string_dynamic, const f_string_range) = &f_print_string_dynamic_partial; + f_return_status (*print_object)(FILE *, const f_string_static, const f_string_range) = &f_print_string_dynamic_partial; if (data->parameters[fss_extended_list_read_parameter_trim].result == f_console_result_found) { print_object = &fl_print_trim_string_dynamic_partial; diff --git a/level_3/fss_extended_read/c/private-fss_extended_read.c b/level_3/fss_extended_read/c/private-fss_extended_read.c index 17100f4..0149f38 100644 --- a/level_3/fss_extended_read/c/private-fss_extended_read.c +++ b/level_3/fss_extended_read/c/private-fss_extended_read.c @@ -384,7 +384,7 @@ extern "C" { return f_none; } - f_return_status (*print_object)(FILE *, const f_string_dynamic, const f_string_range) = &f_print_string_dynamic_partial; + f_return_status (*print_object)(FILE *, const f_string_static, const f_string_range) = &f_print_string_dynamic_partial; if (data->parameters[fss_extended_read_parameter_trim].result == f_console_result_found) { print_object = &fl_print_trim_string_dynamic_partial; -- 1.8.3.1