Cleanup: rename f_print_string* functions to f_print*.

This shortens the name.
The "_string" part is not needed as this should be considered the default behavior/interpretation.

diff --git a/level_0/f_print/c/print.c b/level_0/f_print/c/print.c
index 2ff8259cdc4061e0198d6480620bd3794fcfd464..193b4d7938a288609015a57a376b0d897da65b5d 100644 (file)
--- a/level_0/f_print/c/print.c
+++ b/level_0/f_print/c/print.c
@@ -5,29 +5,29 @@
 extern "C" {
 #endif
 
-#ifndef _di_f_print_string_
-  f_return_status f_print_string(FILE *output, const f_string_t string, const f_string_length_t length) {
+#ifndef _di_f_print_
+  f_return_status f_print(FILE *output, const f_string_t string, const f_string_length_t length) {
     #ifndef _di_level_0_parameter_checking_
       if (output == 0) return F_status_set_error(F_parameter);
       if (string == 0) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    return private_f_print_string(output, string, length);
+    return private_f_print(output, string, length);
   }
-#endif // _di_f_print_string_
+#endif // _di_f_print_
 
-#ifndef _di_f_print_string_dynamic_
-  f_return_status f_print_string_dynamic(FILE *output, const f_string_static_t buffer) {
+#ifndef _di_f_print_dynamic_
+  f_return_status f_print_dynamic(FILE *output, const f_string_static_t buffer) {
     #ifndef _di_level_0_parameter_checking_
       if (output == 0) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    return private_f_print_string(output, buffer.string, buffer.used);
+    return private_f_print(output, buffer.string, buffer.used);
   }
-#endif // _di_f_print_string_dynamic_
+#endif // _di_f_print_dynamic_
 
-#ifndef _di_f_print_string_dynamic_partial_
-  f_return_status f_print_string_dynamic_partial(FILE *output, const f_string_static_t buffer, const f_string_range_t range) {
+#ifndef _di_f_print_dynamic_partial_
+  f_return_status f_print_dynamic_partial(FILE *output, const f_string_static_t buffer, const f_string_range_t range) {
     #ifndef _di_level_0_parameter_checking_
       if (output == 0) return F_status_set_error(F_parameter);
       if (range.start < 0) return F_status_set_error(F_parameter);
@@ -38,9 +38,9 @@ extern "C" {
 
     const f_string_length_t length = (range.stop - range.start) + 1;
 
-    return private_f_print_string(output, buffer.string + range.start, length);
+    return private_f_print(output, buffer.string + range.start, length);
   }
-#endif // _di_f_print_string_dynamic_partial_
+#endif // _di_f_print_dynamic_partial_
 
 #ifndef _di_f_print_to_
   f_return_status f_print_to(const int id, const f_string_t string, const f_string_length_t length) {

diff --git a/level_0/f_print/c/print.h b/level_0/f_print/c/print.h
index 40e848570638a6a6ef4db8cf93994763dbe29dda..cb9a2342f7caa284af1405f523e129220d87ac78 100644 (file)
--- a/level_0/f_print/c/print.h
+++ b/level_0/f_print/c/print.h
@@ -52,9 +52,9 @@ extern "C" {
  *
  * @see fputc()
  */
-#ifndef _di_f_print_string_
-  extern f_return_status f_print_string(FILE *output, const f_string_t string, const f_string_length_t length);
-#endif // _di_f_print_string_
+#ifndef _di_f_print_
+  extern f_return_status f_print(FILE *output, const f_string_t string, const f_string_length_t length);
+#endif // _di_f_print_
 
 /**
  * Similar to a c-library printf, except that this prints a given dynamic string.
@@ -78,9 +78,9 @@ extern "C" {
  *
  * @see fputc()
  */
-#ifndef _di_f_print_string_dynamic_
-  extern f_return_status f_print_string_dynamic(FILE *output, const f_string_static_t buffer);
-#endif // _di_f_print_string_dynamic_
+#ifndef _di_f_print_dynamic_
+  extern f_return_status f_print_dynamic(FILE *output, const f_string_static_t buffer);
+#endif // _di_f_print_dynamic_
 
 /**
  * Similar to a c-library printf, except that this will only print a specific range in a given dynamic string.
@@ -106,9 +106,9 @@ extern "C" {
  *
  * @see fputc()
  */
-#ifndef _di_f_print_string_dynamic_partial_
-  extern f_return_status f_print_string_dynamic_partial(FILE *output, const f_string_static_t buffer, const f_string_range_t range);
-#endif // _di_f_print_string_dynamic_partial_
+#ifndef _di_f_print_dynamic_partial_
+  extern f_return_status f_print_dynamic_partial(FILE *output, const f_string_static_t buffer, const f_string_range_t range);
+#endif // _di_f_print_dynamic_partial_
 
 /**
  * Similar to a c-library dprintf, except that this will only print a specific range.

diff --git a/level_0/f_print/c/private-print.c b/level_0/f_print/c/private-print.c
index 21314fba18b194d8e4159a650de042ac7b288144..48bca63da1baa1723538d12d5b930591a56dcbc2 100644 (file)
--- a/level_0/f_print/c/private-print.c
+++ b/level_0/f_print/c/private-print.c
@@ -5,8 +5,8 @@
 extern "C" {
 #endif
 
-#if !defined(_di_f_print_string_) || !defined(_di_f_print_string_dynamic_) || !defined(_di_f_print_string_dynamic_partial_)
-  f_return_status private_f_print_string(FILE *output, const f_string_t string, const f_string_length_t length) {
+#if !defined(_di_f_print_) || !defined(_di_f_print_dynamic_) || !defined(_di_f_print_dynamic_partial_)
+  f_return_status private_f_print(FILE *output, const f_string_t string, const f_string_length_t length) {
 
     if (length == 0) return F_data_not;
 
@@ -20,7 +20,7 @@ extern "C" {
 
     return F_none;
   }
-#endif // !defined(_di_f_print_string_) || !defined(_di_f_print_string_dynamic_) || !defined(_di_f_print_string_dynamic_partial_)
+#endif // !defined(_di_f_print_) || !defined(_di_f_print_dynamic_) || !defined(_di_f_print_dynamic_partial_)
 
 #if !defined(_di_f_print_to_) || !defined(_di_f_print_dynamic_to_) || !defined(_di_f_print_dynamic_partial_to_)
   f_return_status private_f_print_to(const int id, const f_string_t string, const f_string_length_t length) {

diff --git a/level_0/f_print/c/private-print.h b/level_0/f_print/c/private-print.h
index 07e68636ca3e64c5a9cb34123387624fec5b6e86..56e40c79c281386b899a38f174c9105808778da5 100644 (file)
--- a/level_0/f_print/c/private-print.h
+++ b/level_0/f_print/c/private-print.h
@@ -16,7 +16,7 @@ extern "C" {
 #endif
 
 /**
- * Private implementation of f_print_string().
+ * Private implementation of f_print().
  *
  * Intended to be shared to each of the different implementation variations.
  *
@@ -33,13 +33,13 @@ extern "C" {
  *   F_output (with error bit) on failure.
  *   F_parameter (with error bit) if a parameter is invalid.
  *
- * @see f_print_string()
- * @see f_print_string_dynamic()
- * @see f_print_string_dynamic_partial()
+ * @see f_print()
+ * @see f_print_dynamic()
+ * @see f_print_dynamic_partial()
  */
-#if !defined(_di_f_print_string_) || !defined(_di_f_print_string_dynamic_) || !defined(_di_f_print_string_dynamic_partial_)
-  extern f_return_status private_f_print_string(FILE *output, const f_string_t string, const f_string_length_t length) f_gcc_attribute_visibility_internal;
-#endif // !defined(_di_f_print_string_) || !defined(_di_f_print_string_dynamic_) || !defined(_di_f_print_string_dynamic_partial_)
+#if !defined(_di_f_print_) || !defined(_di_f_print_dynamic_) || !defined(_di_f_print_dynamic_partial_)
+  extern f_return_status private_f_print(FILE *output, const f_string_t string, const f_string_length_t length) f_gcc_attribute_visibility_internal;
+#endif // !defined(_di_f_print_) || !defined(_di_f_print_dynamic_) || !defined(_di_f_print_dynamic_partial_)
 
 /**
  * Private implementation of f_print_to().

diff --git a/level_1/fl_color/c/color.c b/level_1/fl_color/c/color.c
index f33cea90592719cdd5171aecb049af7b85b43a2e..e5739360d0af11211f08d907b1a6324adc591bdb 100644 (file)
--- a/level_1/fl_color/c/color.c
+++ b/level_1/fl_color/c/color.c
@@ -121,7 +121,7 @@ extern "C" {
     #endif // _di_level_1_parameter_checking_
 
     if (start_color.used) {
-      f_status_t status = f_print_string_dynamic(file, start_color);
+      f_status_t status = f_print_dynamic(file, start_color);
       if (F_status_is_error(status)) return status;
     }
 
@@ -134,7 +134,7 @@ extern "C" {
     va_end(ap);
 
     if (end_color.used) {
-      f_status_t status = f_print_string_dynamic(file, end_color);
+      f_status_t status = f_print_dynamic(file, end_color);
 
       if (F_status_is_error(status)) return status;
     }
@@ -151,10 +151,10 @@ extern "C" {
     #endif // _di_level_1_parameter_checking_
 
     if (start_color.used) {
-      f_status_t status = f_print_string_dynamic(file, start_color);
+      f_status_t status = f_print_dynamic(file, start_color);
       if (F_status_is_error(status)) return status;
 
-      status = f_print_string_dynamic(file, extra_color);
+      status = f_print_dynamic(file, extra_color);
       if (F_status_is_error(status)) return status;
     }
 
@@ -167,7 +167,7 @@ extern "C" {
     va_end(ap);
 
     if (end_color.used) {
-      f_status_t status = f_print_string_dynamic(file, end_color);
+      f_status_t status = f_print_dynamic(file, end_color);
       if (F_status_is_error(status)) return status;
     }
 
@@ -183,7 +183,7 @@ extern "C" {
     #endif // _di_level_1_parameter_checking_
 
     if (start_color.used) {
-      f_status_t status = f_print_string_dynamic(file, start_color);
+      f_status_t status = f_print_dynamic(file, start_color);
       if (F_status_is_error(status)) return status;
     }
 
@@ -196,7 +196,7 @@ extern "C" {
     va_end(ap);
 
     if (end_color.used) {
-      f_status_t status = f_print_string_dynamic(file, end_color);
+      f_status_t status = f_print_dynamic(file, end_color);
       if (F_status_is_error(status)) return status;
     }
 
@@ -215,10 +215,10 @@ extern "C" {
     #endif // _di_level_1_parameter_checking_
 
     if (start_color.used) {
-      f_status_t status = f_print_string_dynamic(file, start_color);
+      f_status_t status = f_print_dynamic(file, start_color);
       if (F_status_is_error(status)) return status;
 
-      status = f_print_string_dynamic(file, extra_color);
+      status = f_print_dynamic(file, extra_color);
       if (F_status_is_error(status)) return status;
     }
 
@@ -231,7 +231,7 @@ extern "C" {
     va_end(ap);
 
     if (end_color.used) {
-      f_status_t status = f_print_string_dynamic(file, end_color);
+      f_status_t status = f_print_dynamic(file, end_color);
       if (F_status_is_error(status)) return status;
     }
 
@@ -245,7 +245,7 @@ extern "C" {
 #ifndef _di_fl_color_print_code_
   f_return_status fl_color_print_code(FILE *file, const f_string_static_t color) {
     if (color.used) {
-      f_status_t status = f_print_string_dynamic(file, color);
+      f_status_t status = f_print_dynamic(file, color);
       if (F_status_is_error(status)) return status;
     }
 

diff --git a/level_1/fl_color/c/color.h b/level_1/fl_color/c/color.h
index ec060eb43b85e623fc6dfde69632f8420ba918f0..d40d9b14fc795c8f6d8164ab63d74a6fa0e06cfb 100644 (file)
--- a/level_1/fl_color/c/color.h
+++ b/level_1/fl_color/c/color.h
@@ -215,7 +215,7 @@ extern "C" {
  *   F_none on success.
  *   F_parameter (with error bit) if a parameter is invalid.
  *
- *   Errors from (with error bit): f_print_string_dynamic().
+ *   Errors from (with error bit): f_print_dynamic().
  */
 #ifndef _di_fl_color_print_
   extern f_return_status fl_color_print(FILE *file, const f_string_static_t start_color, const f_string_static_t end_color, const f_string_t string, ...);
@@ -248,7 +248,7 @@ extern "C" {
  *   F_none on success.
  *   F_parameter (with error bit) if a parameter is invalid.
  *
- *   Errors from (with error bit): f_print_string_dynamic().
+ *   Errors from (with error bit): f_print_dynamic().
  */
 #ifndef _di_fl_color_print2_
   extern f_return_status fl_color_print2(FILE *file, const f_string_static_t start_color, const f_string_static_t extra_color, const f_string_static_t end_color, const f_string_t string, ...);
@@ -276,7 +276,7 @@ extern "C" {
  *   F_none on success.
  *   F_parameter (with error bit) if a parameter is invalid.
  *
- *   Errors from (with error bit): f_print_string_dynamic().
+ *   Errors from (with error bit): f_print_dynamic().
  */
 #ifndef _di_fl_color_print_line_
   extern f_return_status fl_color_print_line(FILE *file, const f_string_static_t start_color, const f_string_static_t end_color, const f_string_t string, ...);
@@ -309,7 +309,7 @@ extern "C" {
  *   F_none on success.
  *   F_parameter (with error bit) if a parameter is invalid.
  *
- *   Errors from (with error bit): f_print_string_dynamic().
+ *   Errors from (with error bit): f_print_dynamic().
  */
 #ifndef _di_fl_color_print2_line_
   extern f_return_status fl_color_print2_line(FILE *file, const f_string_static_t start_color, const f_string_static_t extra_color, const f_string_static_t end_color, const f_string_t string, ...);
@@ -329,7 +329,7 @@ extern "C" {
  *   F_none on success.
  *   F_parameter (with error bit) if a parameter is invalid.
  *
- *   Errors from (with error bit): f_print_string_dynamic().
+ *   Errors from (with error bit): f_print_dynamic().
  */
 #ifndef _di_fl_color_print_code_
   extern f_return_status fl_color_print_code(FILE *file, const f_string_static_t color);

diff --git a/level_3/byte_dump/c/private-byte_dump.c b/level_3/byte_dump/c/private-byte_dump.c
index 04dea4b41560cb6a2bfe79c737809b8d762641bd..7c97efbdf8fc48702f87f38a1ded9224a39d6708 100644 (file)
--- a/level_3/byte_dump/c/private-byte_dump.c
+++ b/level_3/byte_dump/c/private-byte_dump.c
@@ -307,7 +307,7 @@ extern "C" {
       }
       else if (data.mode == byte_dump_mode_duodecimal) {
         if (invalid[character_current]) {
-          f_print_string_dynamic(f_type_output, data.context.error);
+          f_print_dynamic(f_type_output, data.context.error);
         }
 
         printf(" %01d", byte / 144);
@@ -337,7 +337,7 @@ extern "C" {
         }
 
         if (invalid[character_current]) {
-          f_print_string_dynamic(f_type_output, data.context.reset);
+          f_print_dynamic(f_type_output, data.context.reset);
         }
       }
       else if (data.mode == byte_dump_mode_octal) {

diff --git a/level_3/fake/c/private-build.c b/level_3/fake/c/private-build.c
index 7028e2a0fa54d15db02635834412103a15783b01..c38521c305d63c73a59ef04bef6f7c77e81c9e1a 100644 (file)
--- a/level_3/fake/c/private-build.c
+++ b/level_3/fake/c/private-build.c
@@ -2441,7 +2441,7 @@ extern "C" {
 
         if (data_build.setting.project_name.used) {
           fl_color_print_code(f_type_output, data.context.notable);
-          f_print_string_dynamic(f_type_output, data_build.setting.project_name);
+          f_print_dynamic(f_type_output, data_build.setting.project_name);
           fl_color_print_code(f_type_output, data.context.reset);
         }
 

diff --git a/level_3/fake/c/private-make.c b/level_3/fake/c/private-make.c
index 1993f17289c3277c9af0e0ee625e3a271ca08aa0..382e503bcb45aeb00122df6bee24d6cc673b3401 100644 (file)
--- a/level_3/fake/c/private-make.c
+++ b/level_3/fake/c/private-make.c
@@ -699,7 +699,7 @@ extern "C" {
               fl_color_print(f_type_error, data.context.error, data.context.reset, "ERROR: Invalid characters in the define setting name '");
 
               fl_color_print_code(f_type_error, data.context.notable);
-              f_print_string_dynamic(f_type_error, define.array[i].name);
+              f_print_dynamic(f_type_error, define.array[i].name);
               fl_color_print_code(f_type_error, data.context.reset);
 
               fl_color_print_line(f_type_error, data.context.error, data.context.reset, "', only alpha-numeric ASCII characters and underscore (without a leading digit) is allowed.");
@@ -1864,7 +1864,7 @@ extern "C" {
       fl_color_print(f_type_output, data.context.important, data.context.reset, "Processing Section '");
 
       fl_color_print_code(f_type_output, data.context.notable);
-      f_print_string_dynamic_partial(f_type_output, data_make->buffer, section->name);
+      f_print_dynamic_partial(f_type_output, data_make->buffer, section->name);
       fl_color_print_code(f_type_output, data.context.reset);
 
       fl_color_print_line(f_type_output, data.context.important, data.context.reset, "'.");
@@ -3414,7 +3414,7 @@ extern "C" {
         }
 
         printf("Changed to project path '");
-        f_print_string_dynamic(f_type_output, data_make->path_cache);
+        f_print_dynamic(f_type_output, data_make->path_cache);
         printf("'.%c", f_string_eol[0]);
       }
 
@@ -3423,7 +3423,7 @@ extern "C" {
 
     if (operation == fake_make_operation_type_print) {
       for (f_array_length_t i = 0; i < arguments.used; i++) {
-        f_print_string_dynamic(f_type_output, arguments.array[i]);
+        f_print_dynamic(f_type_output, arguments.array[i]);
 
         if (i + 1 < arguments.used) {
           printf(" ");
@@ -3514,7 +3514,7 @@ extern "C" {
           }
 
           printf("Changed to project path '");
-          f_print_string_dynamic(f_type_output, data_make->path_cache);
+          f_print_dynamic(f_type_output, data_make->path_cache);
           printf("'.%c", f_string_eol[0]);
         }
 
@@ -3583,7 +3583,7 @@ extern "C" {
 
         if (data.verbosity == fake_verbosity_verbose) {
           printf("Touched %s '", arguments.array[0].string);
-          f_print_string_dynamic(f_type_output, arguments.array[i]);
+          f_print_dynamic(f_type_output, arguments.array[i]);
           printf("'.%c", f_string_eol[0]);
         }
 
@@ -4180,7 +4180,7 @@ extern "C" {
             fl_color_print(data_make->print.to, data_make->print.context, data.context.reset, "%s: Invalid characters in the define setting name '", data_make->print.prefix);
 
             fl_color_print_code(data_make->print.to, data.context.notable);
-            f_print_string_dynamic(data_make->print.to, arguments.array[0]);
+            f_print_dynamic(data_make->print.to, arguments.array[0]);
             fl_color_print_code(data_make->print.to, data.context.reset);
 
             fl_color_print_line(data_make->print.to, data_make->print.context, data.context.reset, "', only alpha-numeric ASCII characters and underscore (without a leading digit) is allowed.");
@@ -4878,7 +4878,7 @@ extern "C" {
               fl_color_print(data_make->print.to, data_make->print.context, data.context.reset, "%s: The section operation '", data_make->print.prefix);
 
               fl_color_print_code(data_make->print.to, data.context.notable);
-              f_print_string_dynamic_partial(data_make->print.to, data_make->buffer, data_make->fakefile.array[id_section].name);
+              f_print_dynamic_partial(data_make->print.to, data_make->buffer, data_make->fakefile.array[id_section].name);
               fl_color_print_code(data_make->print.to, data.context.reset);
 
               fl_color_print_line(data_make->print.to, data_make->print.context, data.context.reset, "' is already in the operation stack, recursion is not allowed.");

diff --git a/level_3/fake/c/private-print.c b/level_3/fake/c/private-print.c
index 4b6c09cff3fe2bf2d91d775fe0897f9b7525bdd8..cae6bdc3a5d5f58701243057d0fb5b0a9a66eb7a 100644 (file)
--- a/level_3/fake/c/private-print.c
+++ b/level_3/fake/c/private-print.c
@@ -583,13 +583,13 @@ extern "C" {
     fl_color_print(print.to, print.context, data.context.reset, "%s: The section operation '", print.prefix);
 
     fl_color_print_code(print.to, data.context.notable);
-    f_print_string_dynamic_partial(print.to, buffer, operation_name);
+    f_print_dynamic_partial(print.to, buffer, operation_name);
     fl_color_print_code(print.to, data.context.reset);
 
     fl_color_print(print.to, print.context, data.context.reset, "' from section '");
 
     fl_color_print_code(print.to, data.context.notable);
-    f_print_string_dynamic_partial(print.to, buffer, section_name);
+    f_print_dynamic_partial(print.to, buffer, section_name);
     fl_color_print_code(print.to, data.context.reset);
 
     fl_color_print(print.to, print.context, data.context.reset, "' on line ");
@@ -650,13 +650,13 @@ extern "C" {
     fl_color_print(print.to, print.context, data.context.reset, "%s: The section operation '", print.prefix);
 
     fl_color_print_code(print.to, data.context.notable);
-    f_print_string_dynamic_partial(print.to, buffer, operation_name);
+    f_print_dynamic_partial(print.to, buffer, operation_name);
     fl_color_print_code(print.to, data.context.reset);
 
     fl_color_print(print.to, print.context, data.context.reset, "' from section '");
 
     fl_color_print_code(print.to, data.context.notable);
-    f_print_string_dynamic_partial(print.to, buffer, section_name);
+    f_print_dynamic_partial(print.to, buffer, section_name);
     fl_color_print_code(print.to, data.context.reset);
 
     fl_color_print(print.to, print.context, data.context.reset, "' on line ");
@@ -679,13 +679,13 @@ extern "C" {
     fl_color_print(print.to, print.context, data.context.reset, "%s: The section operation '", print.prefix);
 
     fl_color_print_code(print.to, data.context.notable);
-    f_print_string_dynamic_partial(print.to, buffer, operation_name);
+    f_print_dynamic_partial(print.to, buffer, operation_name);
     fl_color_print_code(print.to, data.context.reset);
 
     fl_color_print(print.to, print.context, data.context.reset, "' from section '");
 
     fl_color_print_code(print.to, data.context.notable);
-    f_print_string_dynamic_partial(print.to, buffer, section_name);
+    f_print_dynamic_partial(print.to, buffer, section_name);
     fl_color_print_code(print.to, data.context.reset);
 
     fl_color_print(print.to, print.context, data.context.reset, "' on line ");
@@ -707,7 +707,7 @@ extern "C" {
     fl_color_print(f_type_warning, data.context.warning, data.context.reset, "' object '");
 
     fl_color_print_code(f_type_warning, data.context.notable);
-    f_print_string_dynamic_partial(f_type_warning, buffer, range_object);
+    f_print_dynamic_partial(f_type_warning, buffer, range_object);
     fl_color_print_code(f_type_warning, data.context.reset);
 
     fl_color_print_line(f_type_warning, data.context.warning, data.context.reset, "'.");
@@ -725,7 +725,7 @@ extern "C" {
     fl_color_print(f_type_warning, data.context.warning, data.context.reset, "' has an invalid content '");
 
     fl_color_print_code(f_type_warning, data.context.notable);
-    f_print_string_dynamic_partial(f_type_warning, buffer, range_content);
+    f_print_dynamic_partial(f_type_warning, buffer, range_content);
     fl_color_print_code(f_type_warning, data.context.reset);
 
     fl_color_print(f_type_warning, data.context.warning, data.context.reset, "' for the '");
@@ -733,7 +733,7 @@ extern "C" {
     fl_color_print(f_type_warning, data.context.warning, data.context.reset, "' object '");
 
     fl_color_print_code(f_type_warning, data.context.notable);
-    f_print_string_dynamic_partial(f_type_warning, buffer, range_object);
+    f_print_dynamic_partial(f_type_warning, buffer, range_object);
     fl_color_print_code(f_type_warning, data.context.reset);
 
     fl_color_print_line(f_type_warning, data.context.warning, data.context.reset, "'.");

diff --git a/level_3/firewall/c/private-firewall.c b/level_3/firewall/c/private-firewall.c
index 04218039a004d09b6b6f0379659bce7b70580740..c940609c8c6018ad8a82af6895e4a1b6ec8484db 100644 (file)
--- a/level_3/firewall/c/private-firewall.c
+++ b/level_3/firewall/c/private-firewall.c
@@ -284,7 +284,7 @@ f_return_status firewall_perform_commands(const firewall_local_data_t local, con
       if (length > 0) {
         fl_color_print_code(f_type_warning, data.context.warning);
         fprintf(f_type_warning, "WARNING: At line %i, the object '", i);
-        f_print_string(f_type_warning, local.buffer.string + local.rule_objects.array[i].start, length);
+        f_print(f_type_warning, local.buffer.string + local.rule_objects.array[i].start, length);
         fprintf(f_type_warning, "' is invalid");
         fl_color_print_code(f_type_warning, data.context.reset);
       }
@@ -302,9 +302,9 @@ f_return_status firewall_perform_commands(const firewall_local_data_t local, con
       if (length > 0) {
         fl_color_print_code(f_type_warning, data.context.warning);
         fprintf(f_type_warning, "WARNING: At line %i, the object '", i);
-        f_print_string(f_type_warning, local.buffer.string + local.rule_objects.array[i].start, length);
+        f_print(f_type_warning, local.buffer.string + local.rule_objects.array[i].start, length);
         fprintf(f_type_warning, "' has invalid content '");
-        f_print_string(f_type_warning, local.buffer.string + local.rule_contents.array[i].array[0].start, firewall_macro_structure_size(local.rule_contents.array[i], 0));
+        f_print(f_type_warning, local.buffer.string + local.rule_contents.array[i].array[0].start, firewall_macro_structure_size(local.rule_contents.array[i], 0));
         fprintf(f_type_warning, "'");
         fl_color_print_code(f_type_warning, data.context.reset);
         fprintf(f_type_warning, "\n");
@@ -552,7 +552,7 @@ f_return_status firewall_perform_commands(const firewall_local_data_t local, con
 
         fl_color_print_code(f_type_warning, data.context.warning);
         fprintf(f_type_warning, "WARNING: At line %i, the object '", i);
-        f_print_string(f_type_warning, local.buffer.string + local.rule_objects.array[i].start, length);
+        f_print(f_type_warning, local.buffer.string + local.rule_objects.array[i].start, length);
         fprintf(f_type_warning, "' has no content");
         fl_color_print_code(f_type_warning, data.context.reset);
         fprintf(f_type_warning, "\n");

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 b204a47ef3cb11202d2ea62cfc433aff28066807..29a1f788b5f23f6f755ee2a20ffd4e45f6717b80 100644 (file)
--- 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
@@ -395,7 +395,7 @@ extern "C" {
         return F_none;
       }
 
-      f_return_status (*print_object)(FILE *, const f_string_static_t, const f_string_range_t) = &f_print_string_dynamic_partial;
+      f_return_status (*print_object)(FILE *, const f_string_static_t, const f_string_range_t) = &f_print_dynamic_partial;
 
       if (data->parameters[fss_basic_list_read_parameter_trim].result == f_console_result_found) {
         print_object = &fl_print_trim_string_dynamic_partial;
@@ -519,7 +519,7 @@ extern "C" {
             }
 
             if (data->contents.array[i].used > 0) {
-              f_print_string_dynamic_partial(f_type_output, data->buffer, data->contents.array[i].array[0]);
+              f_print_dynamic_partial(f_type_output, data->buffer, data->contents.array[i].array[0]);
             }
             else if (include_empty) {
               fprintf(f_type_output, "%c", f_string_eol[0]);
@@ -634,7 +634,7 @@ extern "C" {
         continue;
       }
 
-      f_print_string_dynamic_partial(f_type_output, data->buffer, data->contents.array[i].array[0]);
+      f_print_dynamic_partial(f_type_output, data->buffer, data->contents.array[i].array[0]);
     } // for
 
     return F_none;

diff --git a/level_3/fss_basic_list_write/c/fss_basic_list_write.c b/level_3/fss_basic_list_write/c/fss_basic_list_write.c
index aff4524c22773fd39af6a541b7bb0c859a2e7efb..d3a139d602f8879ba0bf17b66debb16e65afe5cb 100644 (file)
--- a/level_3/fss_basic_list_write/c/fss_basic_list_write.c
+++ b/level_3/fss_basic_list_write/c/fss_basic_list_write.c
@@ -225,7 +225,7 @@ extern "C" {
         }
       }
       else {
-        f_print_string_dynamic(f_type_output, buffer);
+        f_print_dynamic(f_type_output, buffer);
       }
 
       f_macro_string_dynamic_t_delete_simple(buffer);

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 09199a963e03723196d49bd3a4a137dd938b8c67..3e2a40ea3f6b1a2f50612048ac86614bcba5c954 100644 (file)
--- a/level_3/fss_basic_read/c/private-fss_basic_read.c
+++ b/level_3/fss_basic_read/c/private-fss_basic_read.c
@@ -395,7 +395,7 @@ extern "C" {
         return F_none;
       }
 
-      f_return_status (*print_object)(FILE *, const f_string_static_t, const f_string_range_t) = &f_print_string_dynamic_partial;
+      f_return_status (*print_object)(FILE *, const f_string_static_t, const f_string_range_t) = &f_print_dynamic_partial;
 
       if (data->parameters[fss_basic_read_parameter_trim].result == f_console_result_found) {
         print_object = &fl_print_trim_string_dynamic_partial;
@@ -461,7 +461,7 @@ extern "C" {
             }
             else if (data->parameters[fss_basic_read_parameter_line].result == f_console_result_additional) {
               if (data->contents.array[i].used > 0) {
-                f_print_string_dynamic_partial(f_type_output, data->buffer, data->contents.array[i].array[0]);
+                f_print_dynamic_partial(f_type_output, data->buffer, data->contents.array[i].array[0]);
                 fprintf(f_type_output, "%c", f_string_eol[0]);
               }
               else if (include_empty) {
@@ -470,7 +470,7 @@ extern "C" {
             }
             else {
               if (data->contents.array[i].used > 0) {
-                f_print_string_dynamic_partial(f_type_output, data->buffer, data->contents.array[i].array[0]);
+                f_print_dynamic_partial(f_type_output, data->buffer, data->contents.array[i].array[0]);
                 fprintf(f_type_output, "%c", f_string_eol[0]);
               }
               else if (include_empty) {
@@ -529,7 +529,7 @@ extern "C" {
         }
 
         if (line_current == line) {
-          f_print_string_dynamic_partial(f_type_output, data->buffer, data->contents.array[i].array[0]);
+          f_print_dynamic_partial(f_type_output, data->buffer, data->contents.array[i].array[0]);
           fprintf(f_type_output, "%c", f_string_eol[0]);
 
           break;
@@ -554,7 +554,7 @@ extern "C" {
         continue;
       }
 
-      f_print_string_dynamic_partial(f_type_output, data->buffer, data->contents.array[i].array[0]);
+      f_print_dynamic_partial(f_type_output, data->buffer, data->contents.array[i].array[0]);
       fprintf(f_type_output, "%c", f_string_eol[0]);
     } // for
 

diff --git a/level_3/fss_basic_write/c/fss_basic_write.c b/level_3/fss_basic_write/c/fss_basic_write.c
index bec6350cd2dac68b342aeb7d792b9ee0e2686fe9..f820275ac4faaaccf90df9e6cc189a767bf9ade9 100644 (file)
--- a/level_3/fss_basic_write/c/fss_basic_write.c
+++ b/level_3/fss_basic_write/c/fss_basic_write.c
@@ -214,7 +214,7 @@ extern "C" {
         }
       }
       else {
-        f_print_string_dynamic(f_type_output, buffer);
+        f_print_dynamic(f_type_output, buffer);
       }
 
       f_macro_string_dynamic_t_delete_simple(buffer);

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 ecf026a50b3c69d84a5441b37102a6e43ad52b9c..bef46614686b9a4c4ee8a7092c3782be1d37d069 100644 (file)
--- 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
@@ -420,7 +420,7 @@ extern "C" {
         return F_none;
       }
 
-      f_return_status (*print_object)(FILE *, const f_string_static_t, const f_string_range_t) = &f_print_string_dynamic_partial;
+      f_return_status (*print_object)(FILE *, const f_string_static_t, const f_string_range_t) = &f_print_dynamic_partial;
 
       if (data->parameters[fss_extended_list_read_parameter_trim].result == f_console_result_found) {
         print_object = &fl_print_trim_string_dynamic_partial;
@@ -534,7 +534,7 @@ extern "C" {
             }
 
             if (items->array[i].content.used > 0) {
-              f_print_string_dynamic_partial(f_type_output, data->buffer, items->array[i].content.array[0]);
+              f_print_dynamic_partial(f_type_output, data->buffer, items->array[i].content.array[0]);
             }
             else if (include_empty) {
               fprintf(f_type_output, "%c", f_string_eol[0]);
@@ -649,7 +649,7 @@ extern "C" {
         continue;
       }
 
-      f_print_string_dynamic_partial(f_type_output, data->buffer, items->array[i].content.array[0]);
+      f_print_dynamic_partial(f_type_output, data->buffer, items->array[i].content.array[0]);
     } // for
 
     return F_none;

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 66fe3cc7556d41c7bfe534793102cfd904243feb..f8844de132eeaeb8ca372b574322f737f956f6a3 100644 (file)
--- a/level_3/fss_extended_read/c/private-fss_extended_read.c
+++ b/level_3/fss_extended_read/c/private-fss_extended_read.c
@@ -390,7 +390,7 @@ extern "C" {
         return F_none;
       }
 
-      f_return_status (*print_object)(FILE *, const f_string_static_t, const f_string_range_t) = &f_print_string_dynamic_partial;
+      f_return_status (*print_object)(FILE *, const f_string_static_t, const f_string_range_t) = &f_print_dynamic_partial;
 
       if (data->parameters[fss_extended_read_parameter_trim].result == f_console_result_found) {
         print_object = &fl_print_trim_string_dynamic_partial;
@@ -458,13 +458,13 @@ extern "C" {
 
                   if (data->parameters[fss_extended_read_parameter_select].result == f_console_result_additional) {
                     if (select < data->contents.array[i].used) {
-                      f_print_string_dynamic_partial(f_type_output, data->buffer, data->contents.array[i].array[select]);
+                      f_print_dynamic_partial(f_type_output, data->buffer, data->contents.array[i].array[select]);
                       fprintf(f_type_output, "%c", f_string_eol[0]);
                     }
                   }
                   else {
                     for (j = 0; j < data->contents.array[i].used; j++) {
-                      f_print_string_dynamic_partial(f_type_output, data->buffer, data->contents.array[i].array[j]);
+                      f_print_dynamic_partial(f_type_output, data->buffer, data->contents.array[i].array[j]);
 
                       if (j + 1 < data->contents.array[i].used) {
                         printf(" ");
@@ -494,13 +494,13 @@ extern "C" {
 
               if (data->parameters[fss_extended_read_parameter_select].result == f_console_result_additional) {
                 if (select < data->contents.array[i].used) {
-                  f_print_string_dynamic_partial(f_type_output, data->buffer, data->contents.array[i].array[select]);
+                  f_print_dynamic_partial(f_type_output, data->buffer, data->contents.array[i].array[select]);
                   fprintf(f_type_output, "%c", f_string_eol[0]);
                 }
               }
               else {
                 for (j = 0; j < data->contents.array[i].used; j++) {
-                  f_print_string_dynamic_partial(f_type_output, data->buffer, data->contents.array[i].array[j]);
+                  f_print_dynamic_partial(f_type_output, data->buffer, data->contents.array[i].array[j]);
 
                   if (j + 1 < data->contents.array[i].used) {
                     printf(" ");
@@ -576,13 +576,13 @@ extern "C" {
         if (line_current == line) {
           if (data->parameters[fss_extended_read_parameter_select].result == f_console_result_additional) {
             if (select < data->contents.array[i].used) {
-              f_print_string_dynamic_partial(f_type_output, data->buffer, data->contents.array[i].array[select]);
+              f_print_dynamic_partial(f_type_output, data->buffer, data->contents.array[i].array[select]);
               fprintf(f_type_output, "%c", f_string_eol[0]);
             }
           }
           else {
             for (j = 0; j < data->contents.array[i].used; j++) {
-              f_print_string_dynamic_partial(f_type_output, data->buffer, data->contents.array[i].array[j]);
+              f_print_dynamic_partial(f_type_output, data->buffer, data->contents.array[i].array[j]);
 
               if (j + 1 < data->contents.array[i].used) {
                 printf(" ");
@@ -619,13 +619,13 @@ extern "C" {
 
       if (data->parameters[fss_extended_read_parameter_select].result == f_console_result_additional) {
         if (select < data->contents.array[i].used) {
-          f_print_string_dynamic_partial(f_type_output, data->buffer, data->contents.array[i].array[select]);
+          f_print_dynamic_partial(f_type_output, data->buffer, data->contents.array[i].array[select]);
           fprintf(f_type_output, "%c", f_string_eol[0]);
         }
       }
       else {
         for (j = 0; j < data->contents.array[i].used; j++) {
-          f_print_string_dynamic_partial(f_type_output, data->buffer, data->contents.array[i].array[j]);
+          f_print_dynamic_partial(f_type_output, data->buffer, data->contents.array[i].array[j]);
 
           if (j + 1 < data->contents.array[i].used) {
             printf(" ");

diff --git a/level_3/fss_extended_write/c/fss_extended_write.c b/level_3/fss_extended_write/c/fss_extended_write.c
index 9413f9bed887f2ab46bb966798a89da4d5db3005..01121e66bc0708b2c35c7c48571384e5831f0b9f 100644 (file)
--- a/level_3/fss_extended_write/c/fss_extended_write.c
+++ b/level_3/fss_extended_write/c/fss_extended_write.c
@@ -265,7 +265,7 @@ extern "C" {
         }
       }
       else {
-        f_print_string_dynamic(f_type_output, buffer);
+        f_print_dynamic(f_type_output, buffer);
       }
 
       f_macro_string_dynamic_t_delete_simple(buffer);

diff --git a/level_3/iki_read/c/private-iki_read.c b/level_3/iki_read/c/private-iki_read.c
index 37a47ab2da63658ba5d9d444da9d6a0001dc462d..0c87df524a69eea87cce35eaa44cbfdb5f2c7d3c 100644 (file)
--- a/level_3/iki_read/c/private-iki_read.c
+++ b/level_3/iki_read/c/private-iki_read.c
@@ -457,7 +457,7 @@ extern "C" {
               iki_read_substitutions_print(*data, *variable, *content, *ranges, substitutionss[j], j, content_only);
             }
             else {
-              f_print_string_dynamic_partial(f_type_output, data->buffer, ranges->array[j]);
+              f_print_dynamic_partial(f_type_output, data->buffer, ranges->array[j]);
             }
 
             printf("%c", f_string_eol[0]);
@@ -480,7 +480,7 @@ extern "C" {
           iki_read_substitutions_print(*data, *variable, *content, *ranges, substitutionss[i], i, content_only);
         }
         else {
-          f_print_string_dynamic_partial(f_type_output, data->buffer, ranges->array[i]);
+          f_print_dynamic_partial(f_type_output, data->buffer, ranges->array[i]);
         }
 
         printf("%c", f_string_eol[0]);
@@ -513,7 +513,7 @@ extern "C" {
     }
 
     if (!variable->used) {
-      f_print_string_dynamic_partial(f_type_output, data->buffer, buffer_range);
+      f_print_dynamic_partial(f_type_output, data->buffer, buffer_range);
       return F_none;
     }
 
@@ -604,7 +604,7 @@ extern "C" {
           range.start = i;
           range.stop = variable->array[j].start - 1;
 
-          f_print_string_dynamic_partial(f_type_output, data->buffer, range);
+          f_print_dynamic_partial(f_type_output, data->buffer, range);
 
           range.start = variable->array[j].stop + 1;
           range.stop = buffer_range.stop;
@@ -631,7 +631,7 @@ extern "C" {
               iki_read_substitutions_print(*data, *variable, *content, *variable, substitutionss[j], j, F_false);
             }
             else {
-              f_print_string_dynamic_partial(f_type_output, data->buffer, variable->array[j]);
+              f_print_dynamic_partial(f_type_output, data->buffer, variable->array[j]);
             }
           }
           else {
@@ -639,7 +639,7 @@ extern "C" {
               iki_read_substitutions_print(*data, *variable, *content, *ranges, substitutionss[j], j, content_only);
             }
             else {
-              f_print_string_dynamic_partial(f_type_output, data->buffer, ranges->array[j]);
+              f_print_dynamic_partial(f_type_output, data->buffer, ranges->array[j]);
             }
           }
         }
@@ -648,7 +648,7 @@ extern "C" {
             iki_read_substitutions_print(*data, *variable, *content, *ranges, substitutionss[j], j, content_only);
           }
           else {
-            f_print_string_dynamic_partial(f_type_output, data->buffer, ranges->array[j]);
+            f_print_dynamic_partial(f_type_output, data->buffer, ranges->array[j]);
           }
         }
 
@@ -658,7 +658,7 @@ extern "C" {
 
       if (i <= buffer_range.stop) {
         range.start = i;
-        f_print_string_dynamic_partial(f_type_output, data->buffer, range);
+        f_print_dynamic_partial(f_type_output, data->buffer, range);
       }
     }
 
@@ -804,24 +804,24 @@ extern "C" {
 
     if (status == F_equal_to) {
       if (content_only) {
-        f_print_string_dynamic(f_type_output, substitutions.array[i].with);
+        f_print_dynamic(f_type_output, substitutions.array[i].with);
       }
       else {
         range.start = variable.array[index].start;
         range.stop = content.array[index].start - 1;
 
-        f_print_string_dynamic_partial(f_type_output, data.buffer, range);
+        f_print_dynamic_partial(f_type_output, data.buffer, range);
 
-        f_print_string_dynamic(f_type_output, substitutions.array[i].with);
+        f_print_dynamic(f_type_output, substitutions.array[i].with);
 
         range.start = content.array[index].stop + 1;
         range.stop = variable.array[index].stop;
 
-        f_print_string_dynamic_partial(f_type_output, data.buffer, range);
+        f_print_dynamic_partial(f_type_output, data.buffer, range);
       }
     }
     else {
-      f_print_string_dynamic_partial(f_type_output, data.buffer, ranges.array[index]);
+      f_print_dynamic_partial(f_type_output, data.buffer, ranges.array[index]);
     }
   }
 #endif // _di_iki_read_substitutions_print_

diff --git a/level_3/iki_write/c/private-iki_write.c b/level_3/iki_write/c/private-iki_write.c
index 4746d6b8aad4a4fcf280a51fe76fca2ebf3cb0fc..7a68204e7da30500d3a145f9ded08e8904b0837d 100644 (file)
--- a/level_3/iki_write/c/private-iki_write.c
+++ b/level_3/iki_write/c/private-iki_write.c
@@ -289,7 +289,7 @@ extern "C" {
         fl_color_print(f_type_error, data.context.error, data.context.reset, "ERROR: The object '");
 
         fl_color_print_code(f_type_error, data.context.notable);
-        f_print_string_dynamic(f_type_error, object);
+        f_print_dynamic(f_type_error, object);
         fl_color_print_code(f_type_error, data.context.reset);
 
         fl_color_print_line(f_type_error, data.context.error, data.context.reset, "' is not a valid IKI object.");