From 5f572e1d78c8a70f17b40d6d8dac175895ee85c3 Mon Sep 17 00:00:00 2001
From: Kevin Day <kevin@kevux.org>
Date: Wed, 26 Apr 2023 18:45:41 -0500
Subject: [PATCH] Bugfix: Incorrect wrapping define usage.

I discovered these while building the fss_payload_read stand alone build.
---
 level_0/f_print/c/print.h                                | 16 ++++++++--------
 level_0/f_print/c/print/to.h                             |  8 ++++----
 level_0/f_print/c/private-print.h                        | 16 ++++++++--------
 level_0/f_type_array/c/type_array/private-array_length.c |  4 ++--
 level_0/f_type_array/c/type_array/private-array_length.h |  6 +++---
 level_0/f_type_array/c/type_array/private-cell.c         |  4 ++--
 level_0/f_type_array/c/type_array/private-cell.h         |  6 +++---
 level_0/f_type_array/c/type_array/private-fll_id.c       |  4 ++--
 level_0/f_type_array/c/type_array/private-fll_id.h       |  6 +++---
 level_0/f_type_array/c/type_array/private-int128.c       |  4 ++--
 level_0/f_type_array/c/type_array/private-int128.h       |  6 +++---
 level_0/f_type_array/c/type_array/private-int16.c        |  4 ++--
 level_0/f_type_array/c/type_array/private-int16.h        |  6 +++---
 level_0/f_type_array/c/type_array/private-int32.c        |  4 ++--
 level_0/f_type_array/c/type_array/private-int32.h        |  6 +++---
 level_0/f_type_array/c/type_array/private-int64.c        |  4 ++--
 level_0/f_type_array/c/type_array/private-int64.h        |  6 +++---
 level_0/f_type_array/c/type_array/private-int8.c         |  4 ++--
 level_0/f_type_array/c/type_array/private-int8.h         |  6 +++---
 level_1/fl_string/c/private-string.c                     |  8 ++++----
 level_1/fl_string/c/private-string.h                     | 14 ++++++++++----
 21 files changed, 74 insertions(+), 68 deletions(-)

diff --git a/level_0/f_print/c/print.h b/level_0/f_print/c/print.h
index a994bd4..5a4bbca 100644
--- a/level_0/f_print/c/print.h
+++ b/level_0/f_print/c/print.h
@@ -524,7 +524,7 @@ extern "C" {
  * @see ferror_unlocked()
  * @see fwrite_unlocked()
  */
-#ifndef _di_f_print_dynamic_except_partial_
+#ifndef _di_f_print_except_dynamic_partial_
   extern f_status_t f_print_except_dynamic_partial(const f_string_static_t buffer, const f_string_range_t range, const f_array_lengths_t except, FILE * const stream);
 #endif // _di_f_print_except_dynamic_partial_
 
@@ -561,7 +561,7 @@ extern "C" {
  * @see ferror_unlocked()
  * @see fwrite_unlocked()
  */
-#ifndef _di_f_print_dynamic_except_partial_raw_
+#ifndef _di_f_print_except_dynamic_partial_raw_
   extern f_status_t f_print_except_dynamic_partial_raw(const f_string_static_t buffer, const f_string_range_t range, const f_array_lengths_t except, FILE * const stream);
 #endif // _di_f_print_except_dynamic_partial_raw_
 
@@ -603,7 +603,7 @@ extern "C" {
  *
  * @see f_utf_is_valid()
  */
-#ifndef _di_f_print_dynamic_except_partial_raw_safely_
+#ifndef _di_f_print_except_dynamic_partial_raw_safely_
   extern f_status_t f_print_except_dynamic_partial_raw_safely(const f_string_static_t buffer, const f_string_range_t range, const f_array_lengths_t except, FILE * const stream);
 #endif // _di_f_print_except_dynamic_partial_raw_safely_
 
@@ -643,7 +643,7 @@ extern "C" {
  *
  * @see f_utf_is_valid()
  */
-#ifndef _di_f_print_dynamic_except_partial_safely_
+#ifndef _di_f_print_except_dynamic_partial_safely_
   extern f_status_t f_print_except_dynamic_partial_safely(const f_string_static_t buffer, const f_string_range_t range, const f_array_lengths_t except, FILE * const stream);
 #endif // _di_f_print_except_dynamic_partial_safely_
 
@@ -875,7 +875,7 @@ extern "C" {
  * @see ferror_unlocked()
  * @see fwrite_unlocked()
  */
-#ifndef _di_f_print_dynamic_except_partial_
+#ifndef _di_f_print_except_in_dynamic_partial_
   extern f_status_t f_print_except_in_dynamic_partial(const f_string_static_t buffer, const f_string_range_t range, const f_array_lengths_t except_at, const f_string_ranges_t except_in, FILE * const stream);
 #endif // _di_f_print_except_in_dynamic_partial_
 
@@ -916,7 +916,7 @@ extern "C" {
  * @see ferror_unlocked()
  * @see fwrite_unlocked()
  */
-#ifndef _di_f_print_dynamic_except_partial_raw_
+#ifndef _di_f_print_except_in_dynamic_partial_raw_
   extern f_status_t f_print_except_in_dynamic_partial_raw(const f_string_static_t buffer, const f_string_range_t range, const f_array_lengths_t except_at, const f_string_ranges_t except_in, FILE * const stream);
 #endif // _di_f_print_except_in_dynamic_partial_raw_
 
@@ -959,7 +959,7 @@ extern "C" {
  *
  * @see f_utf_is_valid()
  */
-#ifndef _di_f_print_dynamic_except_partial_raw_safely_
+#ifndef _di_f_print_except_in_dynamic_partial_raw_safely_
   extern f_status_t f_print_except_in_dynamic_partial_raw_safely(const f_string_static_t buffer, const f_string_range_t range, const f_array_lengths_t except_at, const f_string_ranges_t except_in, FILE * const stream);
 #endif // _di_f_print_except_in_dynamic_partial_raw_safely_
 
@@ -1000,7 +1000,7 @@ extern "C" {
  *
  * @see f_utf_is_valid()
  */
-#ifndef _di_f_print_dynamic_except_partial_safely_
+#ifndef _di_f_print_except_in_dynamic_partial_safely_
   extern f_status_t f_print_except_in_dynamic_partial_safely(const f_string_static_t buffer, const f_string_range_t range, const f_array_lengths_t except_at, const f_string_ranges_t except_in, FILE * const stream);
 #endif // _di_f_print_except_in_dynamic_partial_safely_
 
diff --git a/level_0/f_print/c/print/to.h b/level_0/f_print/c/print/to.h
index 542b7f1..5fd615d 100644
--- a/level_0/f_print/c/print/to.h
+++ b/level_0/f_print/c/print/to.h
@@ -1032,7 +1032,7 @@ extern "C" {
  *
  * @see write()
  */
-#ifndef _di_f_print_dynamic_except_partial_
+#ifndef _di_f_print_to_except_in_dynamic_partial_
   extern f_status_t f_print_to_except_in_dynamic_partial(const f_string_static_t buffer, const f_string_range_t range, const f_array_lengths_t except_at, const f_string_ranges_t except_in, const int id);
 #endif // _di_f_print_to_except_in_dynamic_partial_
 
@@ -1084,7 +1084,7 @@ extern "C" {
  *
  * @see write()
  */
-#ifndef _di_f_print_dynamic_except_partial_raw_
+#ifndef _di_f_print_to_except_in_dynamic_partial_raw_
   extern f_status_t f_print_to_except_in_dynamic_partial_raw(const f_string_static_t buffer, const f_string_range_t range, const f_array_lengths_t except_at, const f_string_ranges_t except_in, const int id);
 #endif // _di_f_print_to_except_in_dynamic_partial_raw_
 
@@ -1136,7 +1136,7 @@ extern "C" {
  *
  * @see write()
  */
-#ifndef _di_f_print_dynamic_except_partial_raw_safely_
+#ifndef _di_f_print_to_except_in_dynamic_partial_raw_safely_
   extern f_status_t f_print_to_except_in_dynamic_partial_raw_safely(const f_string_static_t buffer, const f_string_range_t range, const f_array_lengths_t except_at, const f_string_ranges_t except_in, const int id);
 #endif // _di_f_print_to_except_in_dynamic_partial_raw_safely_
 
@@ -1188,7 +1188,7 @@ extern "C" {
  *
  * @see f_utf_is_valid()
  */
-#ifndef _di_f_print_dynamic_except_partial_safely_
+#ifndef _di_f_print_to_except_in_dynamic_partial_safely_
   extern f_status_t f_print_to_except_in_dynamic_partial_safely(const f_string_static_t buffer, const f_string_range_t range, const f_array_lengths_t except_at, const f_string_ranges_t except_in, const int id);
 #endif // _di_f_print_to_except_in_dynamic_partial_safely_
 
diff --git a/level_0/f_print/c/private-print.h b/level_0/f_print/c/private-print.h
index fbde86d..6226a48 100644
--- a/level_0/f_print/c/private-print.h
+++ b/level_0/f_print/c/private-print.h
@@ -183,9 +183,9 @@ extern "C" {
  * @see f_print_except_in_dynamic()
  * @see f_print_except_in_dynamic_partial()
  */
-#if !defined(_di_f_print_except_in_) || !defined(_di_f_print_except_dynamic_in_) || !defined(_di_f_print_except_in_dynamic_partial_)
+#if !defined(_di_f_print_except_in_) || !defined(_di_f_print_except_in_dynamic_) || !defined(_di_f_print_except_in_dynamic_partial_)
   extern f_status_t private_f_print_except_in(const f_string_t string, const f_array_length_t offset, const f_array_length_t stop, const f_array_lengths_t except_at, f_string_ranges_t except_in, FILE * const stream) F_attribute_visibility_internal_d;
-#endif // !defined(_di_f_print_except_in_) || !defined(_di_f_print_except_dynamic_in_) || !defined(_di_f_print_except_in_dynamic_partial_)
+#endif // !defined(_di_f_print_except_in_) || !defined(_di_f_print_except_in_dynamic_) || !defined(_di_f_print_except_in_dynamic_partial_)
 
 /**
  * Private implementation of f_print_except_in_raw().
@@ -220,9 +220,9 @@ extern "C" {
  * @see f_print_except_in_dynamic_raw()
  * @see f_print_except_in_dynamic_partial_raw()
  */
-#if !defined(_di_f_print_except_in_raw_) || !defined(_di_f_print_except_dynamic_in_raw_) || !defined(_di_f_print_except_in_dynamic_partial_raw_)
+#if !defined(_di_f_print_except_in_raw_) || !defined(_di_f_print_except_in_dynamic_raw_) || !defined(_di_f_print_except_in_dynamic_partial_raw_)
   extern f_status_t private_f_print_except_in_raw(const f_string_t string, const f_array_length_t offset, const f_array_length_t stop, const f_array_lengths_t except_at, f_string_ranges_t except_in, FILE * const stream) F_attribute_visibility_internal_d;
-#endif // !defined(_di_f_print_except_in_raw_) || !defined(_di_f_print_except_dynamic_in_raw_) || !defined(_di_f_print_except_in_dynamic_partial_raw_)
+#endif // !defined(_di_f_print_except_in_raw_) || !defined(_di_f_print_except_in_dynamic_raw_) || !defined(_di_f_print_except_in_dynamic_partial_raw_)
 
 /**
  * Private implementation of f_print_except_in_raw_safely().
@@ -257,9 +257,9 @@ extern "C" {
  * @see f_print_except_in_dynamic_raw_safely()
  * @see f_print_except_in_dynamic_partial_raw_safely()
  */
-#if !defined(_di_f_print_except_in_raw_safely_) || !defined(_di_f_print_except_dynamic_in_raw_safely_) || !defined(_di_f_print_except_in_dynamic_partial_raw_safely_)
+#if !defined(_di_f_print_except_in_raw_safely_) || !defined(_di_f_print_except_in_dynamic_raw_safely_) || !defined(_di_f_print_except_in_dynamic_partial_raw_safely_)
   extern f_status_t private_f_print_except_in_raw_safely(const f_string_t string, const f_array_length_t offset, const f_array_length_t stop, const f_array_lengths_t except_at, f_string_ranges_t except_in, FILE * const stream) F_attribute_visibility_internal_d;
-#endif // !defined(_di_f_print_except_in_raw_safely_) || !defined(_di_f_print_except_dynamic_in_raw_safely_) || !defined(_di_f_print_except_in_dynamic_partial_raw_safely_)
+#endif // !defined(_di_f_print_except_in_raw_safely_) || !defined(_di_f_print_except_in_dynamic_raw_safely_) || !defined(_di_f_print_except_in_dynamic_partial_raw_safely_)
 
 /**
  * Private implementation of f_print_except_in_safely().
@@ -294,9 +294,9 @@ extern "C" {
  * @see f_print_except_in_dynamic_safely()
  * @see f_print_except_in_dynamic_partial_safely()
  */
-#if !defined(_di_f_print_except_in_safely_) || !defined(_di_f_print_except_dynamic_in_safely_) || !defined(_di_f_print_except_in_dynamic_partial_safely_)
+#if !defined(_di_f_print_except_in_safely_) || !defined(_di_f_print_except_in_dynamic_safely_) || !defined(_di_f_print_except_in_dynamic_partial_safely_)
   extern f_status_t private_f_print_except_in_safely(const f_string_t string, const f_array_length_t offset, const f_array_length_t stop, const f_array_lengths_t except_at, f_string_ranges_t except_in, FILE * const stream) F_attribute_visibility_internal_d;
-#endif // !defined(_di_f_print_except_in_safely_) || !defined(_di_f_print_except_dynamic_in_safely_) || !defined(_di_f_print_except_in_dynamic_partial_safely_)
+#endif // !defined(_di_f_print_except_in_safely_) || !defined(_di_f_print_except_in_dynamic_safely_) || !defined(_di_f_print_except_in_dynamic_partial_safely_)
 
 /**
  * Private implementation of f_print_except_raw().
diff --git a/level_0/f_type_array/c/type_array/private-array_length.c b/level_0/f_type_array/c/type_array/private-array_length.c
index b82aacb..d460204 100644
--- a/level_0/f_type_array/c/type_array/private-array_length.c
+++ b/level_0/f_type_array/c/type_array/private-array_length.c
@@ -51,7 +51,7 @@ extern "C" {
   }
 #endif // !defined(_di_f_array_lengths_append_) || !defined(_di_f_array_lengths_append_all_) || !defined(_di_f_array_lengthss_append_all_)
 
-#if !defined(_di_f_array_lengths_resize_) || !defined(_di_f_array_lengths_append_) || !defined(_di_f_array_lengths_decimate_by_) || !defined(_di_f_array_lengthss_append_)
+#if !defined(_di_f_array_lengths_resize_) || !defined(_di_f_array_lengths_append_) || !defined(_di_f_array_lengths_decrease_by_) || !defined(_di_f_array_lengthss_append_)
   f_status_t private_f_array_lengths_resize(const f_array_length_t length, f_array_lengths_t *lengths) {
 
     const f_status_t status = f_memory_resize(lengths->size, length, sizeof(f_array_length_t), (void **) & lengths->array);
@@ -65,7 +65,7 @@ extern "C" {
 
     return F_none;
   }
-#endif // !defined(_di_f_array_lengths_resize_) || !defined(_di_f_array_lengths_append_) || !defined(_di_f_array_lengths_decimate_by_) || !defined(_di_f_array_lengthss_append_)
+#endif // !defined(_di_f_array_lengths_resize_) || !defined(_di_f_array_lengths_append_) || !defined(_di_f_array_lengths_decrease_by_) || !defined(_di_f_array_lengthss_append_)
 
 #if !defined(_di_f_array_lengthss_adjust_) || !defined(_di_f_array_lengthss_decimate_by_)
   f_status_t private_f_array_lengthss_adjust(const f_array_length_t length, f_array_lengthss_t *lengthss) {
diff --git a/level_0/f_type_array/c/type_array/private-array_length.h b/level_0/f_type_array/c/type_array/private-array_length.h
index f6645ce..b5ef27d 100644
--- a/level_0/f_type_array/c/type_array/private-array_length.h
+++ b/level_0/f_type_array/c/type_array/private-array_length.h
@@ -103,12 +103,12 @@ extern "C" {
  *
  * @see f_array_lengths_resize()
  * @see f_array_lengths_append()
- * @see f_array_lengths_decimate_by()
+ * @see f_array_lengths_decrease_by()
  * @see f_array_lengthss_append()
  */
-#if !defined(_di_f_array_lengths_resize_) || !defined(_di_f_array_lengths_append_) || !defined(_di_f_array_lengths_decimate_by_) || !defined(_di_f_array_lengthss_append_)
+#if !defined(_di_f_array_lengths_resize_) || !defined(_di_f_array_lengths_append_) || !defined(_di_f_array_lengths_decrease_by_) || !defined(_di_f_array_lengthss_append_)
   extern f_status_t private_f_array_lengths_resize(const f_array_length_t length, f_array_lengths_t *lengths) F_attribute_visibility_internal_d;
-#endif // !defined(_di_f_array_lengths_resize_) || !defined(_di_f_array_lengths_append_) || !defined(_di_f_array_lengths_decimate_by_) || !defined(_di_f_array_lengthss_append_)
+#endif // !defined(_di_f_array_lengths_resize_) || !defined(_di_f_array_lengths_append_) || !defined(_di_f_array_lengths_decrease_by_) || !defined(_di_f_array_lengthss_append_)
 
 /**
  * Private implementation for resizing the lengthss array.
diff --git a/level_0/f_type_array/c/type_array/private-cell.c b/level_0/f_type_array/c/type_array/private-cell.c
index 5943d4b..6ebe38c 100644
--- a/level_0/f_type_array/c/type_array/private-cell.c
+++ b/level_0/f_type_array/c/type_array/private-cell.c
@@ -54,7 +54,7 @@ extern "C" {
   }
 #endif // !defined(_di_f_cells_append_) || !defined(_di_f_cells_append_all_) || !defined(_di_f_cellss_append_all_)
 
-#if !defined(_di_f_cells_resize_) || !defined(_di_f_cells_append_) || !defined(_di_f_cells_decimate_by_) || !defined(_di_f_cellss_append_)
+#if !defined(_di_f_cells_resize_) || !defined(_di_f_cells_append_) || !defined(_di_f_cells_decrease_by_) || !defined(_di_f_cellss_append_)
   f_status_t private_f_cells_resize(const f_array_length_t length, f_cells_t *cells) {
 
     const f_status_t status = f_memory_resize(cells->size, length, sizeof(f_cell_t), (void **) & cells->array);
@@ -68,7 +68,7 @@ extern "C" {
 
     return F_none;
   }
-#endif // !defined(_di_f_cells_resize_) || !defined(_di_f_cells_append_) || !defined(_di_f_cells_decimate_by_) || !defined(_di_f_cellss_append_)
+#endif // !defined(_di_f_cells_resize_) || !defined(_di_f_cells_append_) || !defined(_di_f_cells_decrease_by_) || !defined(_di_f_cellss_append_)
 
 #if !defined(_di_f_cellss_adjust_) || !defined(_di_f_cellss_decimate_by_)
   f_status_t private_f_cellss_adjust(const f_array_length_t length, f_cellss_t *cellss) {
diff --git a/level_0/f_type_array/c/type_array/private-cell.h b/level_0/f_type_array/c/type_array/private-cell.h
index 0c61d5c..8b2e358 100644
--- a/level_0/f_type_array/c/type_array/private-cell.h
+++ b/level_0/f_type_array/c/type_array/private-cell.h
@@ -103,12 +103,12 @@ extern "C" {
  *
  * @see f_cells_resize()
  * @see f_cells_append()
- * @see f_cells_decimate_by()
+ * @see f_cells_decrease_by()
  * @see f_cellss_append()
  */
-#if !defined(_di_f_cells_resize_) || !defined(_di_f_cells_append_) || !defined(_di_f_cells_decimate_by_) || !defined(_di_f_cellss_append_)
+#if !defined(_di_f_cells_resize_) || !defined(_di_f_cells_append_) || !defined(_di_f_cells_decrease_by_) || !defined(_di_f_cellss_append_)
   extern f_status_t private_f_cells_resize(const f_array_length_t length, f_cells_t *cells) F_attribute_visibility_internal_d;
-#endif // !defined(_di_f_cells_resize_) || !defined(_di_f_cells_append_) || !defined(_di_f_cells_decimate_by_) || !defined(_di_f_cellss_append_)
+#endif // !defined(_di_f_cells_resize_) || !defined(_di_f_cells_append_) || !defined(_di_f_cells_decrease_by_) || !defined(_di_f_cellss_append_)
 
 /**
  * Private implementation for resizing the cellss array.
diff --git a/level_0/f_type_array/c/type_array/private-fll_id.c b/level_0/f_type_array/c/type_array/private-fll_id.c
index ab24b42..ee16a4a 100644
--- a/level_0/f_type_array/c/type_array/private-fll_id.c
+++ b/level_0/f_type_array/c/type_array/private-fll_id.c
@@ -58,7 +58,7 @@ extern "C" {
   }
 #endif // !defined(_di_f_fll_ids_append_) || !defined(_di_f_fll_ids_append_all_) || !defined(_di_f_fll_idss_append_all_)
 
-#if !defined(_di_f_fll_ids_resize_) || !defined(_di_f_fll_ids_append_) || !defined(_di_f_fll_ids_decimate_by_) || !defined(_di_f_fll_idss_append_)
+#if !defined(_di_f_fll_ids_resize_) || !defined(_di_f_fll_ids_append_) || !defined(_di_f_fll_ids_decrease_by_) || !defined(_di_f_fll_idss_append_)
   f_status_t private_f_fll_ids_resize(const f_array_length_t length, f_fll_ids_t *ids) {
 
     const f_status_t status = f_memory_resize(ids->size, length, sizeof(f_fll_id_t), (void **) & ids->array);
@@ -72,7 +72,7 @@ extern "C" {
 
     return F_none;
   }
-#endif // !defined(_di_f_fll_ids_resize_) || !defined(_di_f_fll_ids_append_) || !defined(_di_f_fll_ids_decimate_by_) || !defined(_di_f_fll_idss_append_)
+#endif // !defined(_di_f_fll_ids_resize_) || !defined(_di_f_fll_ids_append_) || !defined(_di_f_fll_ids_decrease_by_) || !defined(_di_f_fll_idss_append_)
 
 #if !defined(_di_f_fll_idss_adjust_) || !defined(_di_f_fll_idss_decimate_by_)
   f_status_t private_f_fll_idss_adjust(const f_array_length_t length, f_fll_idss_t *idss) {
diff --git a/level_0/f_type_array/c/type_array/private-fll_id.h b/level_0/f_type_array/c/type_array/private-fll_id.h
index d9e87a5..e01f289 100644
--- a/level_0/f_type_array/c/type_array/private-fll_id.h
+++ b/level_0/f_type_array/c/type_array/private-fll_id.h
@@ -103,12 +103,12 @@ extern "C" {
  *
  * @see f_fll_ids_resize()
  * @see f_fll_ids_append()
- * @see f_fll_ids_decimate_by()
+ * @see f_fll_ids_decrease_by()
  * @see f_fll_idss_append()
  */
-#if !defined(_di_f_fll_ids_resize_) || !defined(_di_f_fll_ids_append_) || !defined(_di_f_fll_ids_decimate_by_) || !defined(_di_f_fll_idss_append_)
+#if !defined(_di_f_fll_ids_resize_) || !defined(_di_f_fll_ids_append_) || !defined(_di_f_fll_ids_decrease_by_) || !defined(_di_f_fll_idss_append_)
   extern f_status_t private_f_fll_ids_resize(const f_array_length_t length, f_fll_ids_t *fll_ids) F_attribute_visibility_internal_d;
-#endif // !defined(_di_f_fll_ids_resize_) || !defined(_di_f_fll_ids_append_) || !defined(_di_f_fll_ids_decimate_by_) || !defined(_di_f_fll_idss_append_)
+#endif // !defined(_di_f_fll_ids_resize_) || !defined(_di_f_fll_ids_append_) || !defined(_di_f_fll_ids_decrease_by_) || !defined(_di_f_fll_idss_append_)
 
 /**
  * Private implementation for resizing the fll_idss array.
diff --git a/level_0/f_type_array/c/type_array/private-int128.c b/level_0/f_type_array/c/type_array/private-int128.c
index fb629f9..d1be50c 100644
--- a/level_0/f_type_array/c/type_array/private-int128.c
+++ b/level_0/f_type_array/c/type_array/private-int128.c
@@ -51,7 +51,7 @@ extern "C" {
   }
 #endif // !defined(_di_f_int128s_append_) || !defined(_di_f_int128s_append_all_) || !defined(_di_f_int128ss_append_all_)
 
-#if !defined(_di_f_int128s_resize_) || !defined(_di_f_int128s_append_) || !defined(_di_f_int128s_decimate_by_) || !defined(_di_f_int128ss_append_)
+#if !defined(_di_f_int128s_resize_) || !defined(_di_f_int128s_append_) || !defined(_di_f_int128s_decrease_by_) || !defined(_di_f_int128ss_append_)
   f_status_t private_f_int128s_resize(const f_array_length_t length, f_int128s_t *int128s) {
 
     const f_status_t status = f_memory_resize(int128s->size, length, sizeof(f_int128s_t), (void **) & int128s->array);
@@ -65,7 +65,7 @@ extern "C" {
 
     return F_none;
   }
-#endif // !defined(_di_f_int128s_resize_) || !defined(_di_f_int128s_append_) || !defined(_di_f_int128s_decimate_by_) || !defined(_di_f_int128ss_append_)
+#endif // !defined(_di_f_int128s_resize_) || !defined(_di_f_int128s_append_) || !defined(_di_f_int128s_decrease_by_) || !defined(_di_f_int128ss_append_)
 
 #if !defined(_di_f_int128ss_adjust_) || !defined(_di_f_int128ss_decimate_by_)
   f_status_t private_f_int128ss_adjust(const f_array_length_t length, f_int128ss_t *int128ss) {
diff --git a/level_0/f_type_array/c/type_array/private-int128.h b/level_0/f_type_array/c/type_array/private-int128.h
index fb58663..0ab8455 100644
--- a/level_0/f_type_array/c/type_array/private-int128.h
+++ b/level_0/f_type_array/c/type_array/private-int128.h
@@ -103,12 +103,12 @@ extern "C" {
  *
  * @see f_int128s_resize()
  * @see f_int128s_append()
- * @see f_int128s_decimate_by()
+ * @see f_int128s_decrease_by()
  * @see f_int128ss_append()
  */
-#if !defined(_di_f_int128s_resize_) || !defined(_di_f_int128s_append_) || !defined(_di_f_int128s_decimate_by_) || !defined(_di_f_int128ss_append_)
+#if !defined(_di_f_int128s_resize_) || !defined(_di_f_int128s_append_) || !defined(_di_f_int128s_decrease_by_) || !defined(_di_f_int128ss_append_)
   extern f_status_t private_f_int128s_resize(const f_array_length_t length, f_int128s_t *int128s) F_attribute_visibility_internal_d;
-#endif // !defined(_di_f_int128s_resize_) || !defined(_di_f_int128s_append_) || !defined(_di_f_int128s_decimate_by_) || !defined(_di_f_int128ss_append_)
+#endif // !defined(_di_f_int128s_resize_) || !defined(_di_f_int128s_append_) || !defined(_di_f_int128s_decrease_by_) || !defined(_di_f_int128ss_append_)
 
 /**
  * Private implementation for resizing the int128ss array.
diff --git a/level_0/f_type_array/c/type_array/private-int16.c b/level_0/f_type_array/c/type_array/private-int16.c
index 6461206..756e8aa 100644
--- a/level_0/f_type_array/c/type_array/private-int16.c
+++ b/level_0/f_type_array/c/type_array/private-int16.c
@@ -51,7 +51,7 @@ extern "C" {
   }
 #endif // !defined(_di_f_int16s_append_) || !defined(_di_f_int16s_append_all_) || !defined(_di_f_int16ss_append_all_)
 
-#if !defined(_di_f_int16s_resize_) || !defined(_di_f_int16s_append_) || !defined(_di_f_int16s_decimate_by_) || !defined(_di_f_int16ss_append_)
+#if !defined(_di_f_int16s_resize_) || !defined(_di_f_int16s_append_) || !defined(_di_f_int16s_decrease_by_) || !defined(_di_f_int16ss_append_)
   f_status_t private_f_int16s_resize(const f_array_length_t length, f_int16s_t *int16s) {
 
     const f_status_t status = f_memory_resize(int16s->size, length, sizeof(int16_t), (void **) & int16s->array);
@@ -65,7 +65,7 @@ extern "C" {
 
     return F_none;
   }
-#endif // !defined(_di_f_int16s_resize_) || !defined(_di_f_int16s_append_) || !defined(_di_f_int16s_decimate_by_) || !defined(_di_f_int16ss_append_)
+#endif // !defined(_di_f_int16s_resize_) || !defined(_di_f_int16s_append_) || !defined(_di_f_int16s_decrease_by_) || !defined(_di_f_int16ss_append_)
 
 #if !defined(_di_f_int16ss_adjust_) || !defined(_di_f_int16ss_decimate_by_)
   f_status_t private_f_int16ss_adjust(const f_array_length_t length, f_int16ss_t *int16ss) {
diff --git a/level_0/f_type_array/c/type_array/private-int16.h b/level_0/f_type_array/c/type_array/private-int16.h
index 3b30b6d..199c996 100644
--- a/level_0/f_type_array/c/type_array/private-int16.h
+++ b/level_0/f_type_array/c/type_array/private-int16.h
@@ -103,12 +103,12 @@ extern "C" {
  *
  * @see f_int16s_resize()
  * @see f_int16s_append()
- * @see f_int16s_decimate_by()
+ * @see f_int16s_decrease_by()
  * @see f_int16ss_append()
  */
-#if !defined(_di_f_int16s_resize_) || !defined(_di_f_int16s_append_) || !defined(_di_f_int16s_decimate_by_) || !defined(_di_f_int16ss_append_)
+#if !defined(_di_f_int16s_resize_) || !defined(_di_f_int16s_append_) || !defined(_di_f_int16s_decrease_by_) || !defined(_di_f_int16ss_append_)
   extern f_status_t private_f_int16s_resize(const f_array_length_t length, f_int16s_t *int16s) F_attribute_visibility_internal_d;
-#endif // !defined(_di_f_int16s_resize_) || !defined(_di_f_int16s_append_) || !defined(_di_f_int16s_decimate_by_) || !defined(_di_f_int16ss_append_)
+#endif // !defined(_di_f_int16s_resize_) || !defined(_di_f_int16s_append_) || !defined(_di_f_int16s_decrease_by_) || !defined(_di_f_int16ss_append_)
 
 /**
  * Private implementation for resizing the int16ss array.
diff --git a/level_0/f_type_array/c/type_array/private-int32.c b/level_0/f_type_array/c/type_array/private-int32.c
index 263a548..b2010ea 100644
--- a/level_0/f_type_array/c/type_array/private-int32.c
+++ b/level_0/f_type_array/c/type_array/private-int32.c
@@ -51,7 +51,7 @@ extern "C" {
   }
 #endif // !defined(_di_f_int32s_append_) || !defined(_di_f_int32s_append_all_) || !defined(_di_f_int32ss_append_all_)
 
-#if !defined(_di_f_int32s_resize_) || !defined(_di_f_int32s_append_) || !defined(_di_f_int32s_decimate_by_) || !defined(_di_f_int32ss_append_)
+#if !defined(_di_f_int32s_resize_) || !defined(_di_f_int32s_append_) || !defined(_di_f_int32s_decrease_by_) || !defined(_di_f_int32ss_append_)
   f_status_t private_f_int32s_resize(const f_array_length_t length, f_int32s_t *int32s) {
 
     const f_status_t status = f_memory_resize(int32s->size, length, sizeof(int32_t), (void **) & int32s->array);
@@ -65,7 +65,7 @@ extern "C" {
 
     return F_none;
   }
-#endif // !defined(_di_f_int32s_resize_) || !defined(_di_f_int32s_append_) || !defined(_di_f_int32s_decimate_by_) || !defined(_di_f_int32ss_append_)
+#endif // !defined(_di_f_int32s_resize_) || !defined(_di_f_int32s_append_) || !defined(_di_f_int32s_decrease_by_) || !defined(_di_f_int32ss_append_)
 
 #if !defined(_di_f_int32ss_adjust_) || !defined(_di_f_int32ss_decimate_by_)
   f_status_t private_f_int32ss_adjust(const f_array_length_t length, f_int32ss_t *int32ss) {
diff --git a/level_0/f_type_array/c/type_array/private-int32.h b/level_0/f_type_array/c/type_array/private-int32.h
index a2cfc5c..9130845 100644
--- a/level_0/f_type_array/c/type_array/private-int32.h
+++ b/level_0/f_type_array/c/type_array/private-int32.h
@@ -103,12 +103,12 @@ extern "C" {
  *
  * @see f_int32s_resize()
  * @see f_int32s_append()
- * @see f_int32s_decimate_by()
+ * @see f_int32s_decrease_by()
  * @see f_int32ss_append()
  */
-#if !defined(_di_f_int32s_resize_) || !defined(_di_f_int32s_append_) || !defined(_di_f_int32s_decimate_by_) || !defined(_di_f_int32ss_append_)
+#if !defined(_di_f_int32s_resize_) || !defined(_di_f_int32s_append_) || !defined(_di_f_int32s_decrease_by_) || !defined(_di_f_int32ss_append_)
   extern f_status_t private_f_int32s_resize(const f_array_length_t length, f_int32s_t *int32s) F_attribute_visibility_internal_d;
-#endif // !defined(_di_f_int32s_resize_) || !defined(_di_f_int32s_append_) || !defined(_di_f_int32s_decimate_by_) || !defined(_di_f_int32ss_append_)
+#endif // !defined(_di_f_int32s_resize_) || !defined(_di_f_int32s_append_) || !defined(_di_f_int32s_decrease_by_) || !defined(_di_f_int32ss_append_)
 
 /**
  * Private implementation for resizing the int32ss array.
diff --git a/level_0/f_type_array/c/type_array/private-int64.c b/level_0/f_type_array/c/type_array/private-int64.c
index 9807165..f566daf 100644
--- a/level_0/f_type_array/c/type_array/private-int64.c
+++ b/level_0/f_type_array/c/type_array/private-int64.c
@@ -51,7 +51,7 @@ extern "C" {
   }
 #endif // !defined(_di_f_int64s_append_) || !defined(_di_f_int64s_append_all_) || !defined(_di_f_int64ss_append_all_)
 
-#if !defined(_di_f_int64s_resize_) || !defined(_di_f_int64s_append_) || !defined(_di_f_int64s_decimate_by_) || !defined(_di_f_int64ss_append_)
+#if !defined(_di_f_int64s_resize_) || !defined(_di_f_int64s_append_) || !defined(_di_f_int64s_decrease_by_) || !defined(_di_f_int64ss_append_)
   f_status_t private_f_int64s_resize(const f_array_length_t length, f_int64s_t *int64s) {
 
     const f_status_t status = f_memory_resize(int64s->size, length, sizeof(int64_t), (void **) & int64s->array);
@@ -65,7 +65,7 @@ extern "C" {
 
     return F_none;
   }
-#endif // !defined(_di_f_int64s_resize_) || !defined(_di_f_int64s_append_) || !defined(_di_f_int64s_decimate_by_) || !defined(_di_f_int64ss_append_)
+#endif // !defined(_di_f_int64s_resize_) || !defined(_di_f_int64s_append_) || !defined(_di_f_int64s_decrease_by_) || !defined(_di_f_int64ss_append_)
 
 #if !defined(_di_f_int64ss_adjust_) || !defined(_di_f_int64ss_decimate_by_)
   f_status_t private_f_int64ss_adjust(const f_array_length_t length, f_int64ss_t *int64ss) {
diff --git a/level_0/f_type_array/c/type_array/private-int64.h b/level_0/f_type_array/c/type_array/private-int64.h
index 02f8ad7..9273403 100644
--- a/level_0/f_type_array/c/type_array/private-int64.h
+++ b/level_0/f_type_array/c/type_array/private-int64.h
@@ -103,12 +103,12 @@ extern "C" {
  *
  * @see f_int64s_resize()
  * @see f_int64s_append()
- * @see f_int64s_decimate_by()
+ * @see f_int64s_decrease_by()
  * @see f_int64ss_append()
  */
-#if !defined(_di_f_int64s_resize_) || !defined(_di_f_int64s_append_) || !defined(_di_f_int64s_decimate_by_) || !defined(_di_f_int64ss_append_)
+#if !defined(_di_f_int64s_resize_) || !defined(_di_f_int64s_append_) || !defined(_di_f_int64s_decrease_by_) || !defined(_di_f_int64ss_append_)
   extern f_status_t private_f_int64s_resize(const f_array_length_t length, f_int64s_t *int64s) F_attribute_visibility_internal_d;
-#endif // !defined(_di_f_int64s_resize_) || !defined(_di_f_int64s_append_) || !defined(_di_f_int64s_decimate_by_) || !defined(_di_f_int64ss_append_)
+#endif // !defined(_di_f_int64s_resize_) || !defined(_di_f_int64s_append_) || !defined(_di_f_int64s_decrease_by_) || !defined(_di_f_int64ss_append_)
 
 /**
  * Private implementation for resizing the int64ss array.
diff --git a/level_0/f_type_array/c/type_array/private-int8.c b/level_0/f_type_array/c/type_array/private-int8.c
index 1d18694..35d5f34 100644
--- a/level_0/f_type_array/c/type_array/private-int8.c
+++ b/level_0/f_type_array/c/type_array/private-int8.c
@@ -51,7 +51,7 @@ extern "C" {
   }
 #endif // !defined(_di_f_int8s_append_) || !defined(_di_f_int8s_append_all_) || !defined(_di_f_int8ss_append_all_)
 
-#if !defined(_di_f_int8s_resize_) || !defined(_di_f_int8s_append_) || !defined(_di_f_int8s_decimate_by_) || !defined(_di_f_int8ss_append_)
+#if !defined(_di_f_int8s_resize_) || !defined(_di_f_int8s_append_) || !defined(_di_f_int8s_decrease_by_) || !defined(_di_f_int8ss_append_)
   f_status_t private_f_int8s_resize(const f_array_length_t length, f_int8s_t *int8s) {
 
     const f_status_t status = f_memory_resize(int8s->size, length, sizeof(int8_t), (void **) & int8s->array);
@@ -65,7 +65,7 @@ extern "C" {
 
     return F_none;
   }
-#endif // !defined(_di_f_int8s_resize_) || !defined(_di_f_int8s_append_) || !defined(_di_f_int8s_decimate_by_) || !defined(_di_f_int8ss_append_)
+#endif // !defined(_di_f_int8s_resize_) || !defined(_di_f_int8s_append_) || !defined(_di_f_int8s_decrease_by_) || !defined(_di_f_int8ss_append_)
 
 #if !defined(_di_f_int8ss_adjust_) || !defined(_di_f_int8ss_decimate_by_)
   f_status_t private_f_int8ss_adjust(const f_array_length_t length, f_int8ss_t *int8ss) {
diff --git a/level_0/f_type_array/c/type_array/private-int8.h b/level_0/f_type_array/c/type_array/private-int8.h
index 55e5661..ba6a3ff 100644
--- a/level_0/f_type_array/c/type_array/private-int8.h
+++ b/level_0/f_type_array/c/type_array/private-int8.h
@@ -103,12 +103,12 @@ extern "C" {
  *
  * @see f_int8s_resize()
  * @see f_int8s_append()
- * @see f_int8s_decimate_by()
+ * @see f_int8s_decrease_by()
  * @see f_int8ss_append()
  */
-#if !defined(_di_f_int8s_resize_) || !defined(_di_f_int8s_append_) || !defined(_di_f_int8s_decimate_by_) || !defined(_di_f_int8ss_append_)
+#if !defined(_di_f_int8s_resize_) || !defined(_di_f_int8s_append_) || !defined(_di_f_int8s_decrease_by_) || !defined(_di_f_int8ss_append_)
   extern f_status_t private_f_int8s_resize(const f_array_length_t length, f_int8s_t *int8s) F_attribute_visibility_internal_d;
-#endif // !defined(_di_f_int8s_resize_) || !defined(_di_f_int8s_append_) || !defined(_di_f_int8s_decimate_by_) || !defined(_di_f_int8ss_append_)
+#endif // !defined(_di_f_int8s_resize_) || !defined(_di_f_int8s_append_) || !defined(_di_f_int8s_decrease_by_) || !defined(_di_f_int8ss_append_)
 
 /**
  * Private implementation for resizing the int8ss array.
diff --git a/level_1/fl_string/c/private-string.c b/level_1/fl_string/c/private-string.c
index 73186d8..04be360 100644
--- a/level_1/fl_string/c/private-string.c
+++ b/level_1/fl_string/c/private-string.c
@@ -37,7 +37,7 @@ extern "C" {
   }
 #endif // !defined(_di_fl_string_compare_) || !defined(_di_fl_string_dynamic_compare_) || !defined(_di_fl_string_dynamic_compare_string_) || !defined(_di_fl_string_dynamic_partial_compare_) || !defined(_di_fl_string_dynamic_partial_compare_dynamic_)
 
-#if !defined(_di_fl_string_compare_except_) || !defined(_di_fl_string_dynamic_compare_except_) || !defined(_di_fl_string_dynamic_partial_compare_except_)
+#if !defined(_di_fl_string_compare_except_) || !defined(_di_fl_string_dynamic_compare_except_) || !defined(_di_fl_string_dynamic_compare_except_string_) || !defined(_di_fl_string_dynamic_partial_compare_except_) || !defined(_di_fl_string_dynamic_partial_compare_except_dynamic_) || !defined(_di_fl_string_dynamic_partial_compare_except_string_)
   f_status_t private_fl_string_compare_except(const f_string_t string1, const f_string_t string2, const f_array_length_t offset1, const f_array_length_t offset2, const f_array_length_t stop1, const f_array_length_t stop2, const f_array_lengths_t except1, const f_array_lengths_t except2) {
 
     f_array_length_t i1 = offset1;
@@ -105,9 +105,9 @@ extern "C" {
 
     return F_equal_to;
   }
-#endif // !defined(_di_fl_string_compare_except_) || !defined(_di_fl_string_dynamic_compare_except_) || !defined(_di_fl_string_dynamic_partial_compare_except_)
+#endif // !defined(_di_fl_string_compare_except_) || !defined(_di_fl_string_dynamic_compare_except_) || !defined(_di_fl_string_dynamic_compare_except_string_) || !defined(_di_fl_string_dynamic_partial_compare_except_) || !defined(_di_fl_string_dynamic_partial_compare_except_dynamic_) || !defined(_di_fl_string_dynamic_partial_compare_except_string_)
 
-#if !defined(_di_fl_string_compare_except_trim_) || !defined(_di_fl_string_dynamic_compare_except_trim_) || !defined(_di_fl_string_dynamic_partial_compare_except_trim_)
+#if !defined(_di_fl_string_compare_except_trim_) || !defined(_di_fl_string_dynamic_compare_except_trim_) || !defined(_di_fl_string_dynamic_compare_except_string_trim_) || !defined(_di_fl_string_dynamic_partial_compare_except_trim_) || !defined(_di_fl_string_dynamic_partial_compare_except_dynamic_trim_) || !defined(_di_fl_string_dynamic_partial_compare_except_string_trim_)
   f_status_t private_fl_string_compare_except_trim(const f_string_t string1, const f_string_t string2, const f_array_length_t offset1, const f_array_length_t offset2, const f_array_length_t stop1, const f_array_length_t stop2, const f_array_lengths_t except1, const f_array_lengths_t except2) {
 
     f_array_length_t i1 = offset1;
@@ -390,7 +390,7 @@ extern "C" {
 
     return F_equal_to;
   }
-#endif // !defined(_di_fl_string_compare_except_trim_) || !defined(_di_fl_string_dynamic_compare_except_trim_) || !defined(_di_fl_string_dynamic_partial_compare_except_trim_)
+#endif // !defined(_di_fl_string_compare_except_trim_) || !defined(_di_fl_string_dynamic_compare_except_trim_) || !defined(_di_fl_string_dynamic_compare_except_string_trim_) || !defined(_di_fl_string_dynamic_partial_compare_except_trim_) || !defined(_di_fl_string_dynamic_partial_compare_except_dynamic_trim_) || !defined(_di_fl_string_dynamic_partial_compare_except_string_trim_)
 
 #if !defined(_di_fl_string_compare_trim_) || !defined(_di_fl_string_dynamic_compare_trim_) || !defined(_di_fl_string_dynamic_partial_compare_trim_)
   f_status_t private_fl_string_compare_trim(const f_string_t string1, const f_string_t string2, const f_array_length_t offset1, const f_array_length_t offset2, const f_array_length_t stop1, const f_array_length_t stop2) {
diff --git a/level_1/fl_string/c/private-string.h b/level_1/fl_string/c/private-string.h
index 1bed2d8..7788c50 100644
--- a/level_1/fl_string/c/private-string.h
+++ b/level_1/fl_string/c/private-string.h
@@ -77,11 +77,14 @@ extern "C" {
  *
  * @see fl_string_compare_except()
  * @see fl_string_dynamic_compare_except()
+ * @see fl_string_dynamic_compare_except_string()
  * @see fl_string_dynamic_partial_compare_except()
+ * @see fl_string_dynamic_partial_compare_except_dynamic()
+ * @see fl_string_dynamic_partial_compare_except_string()
  */
-#if !defined(_di_fl_string_compare_except_) || !defined(_di_fl_string_dynamic_compare_except_) || !defined(_di_fl_string_dynamic_partial_compare_except_)
+#if !defined(_di_fl_string_compare_except_) || !defined(_di_fl_string_dynamic_compare_except_) || !defined(_di_fl_string_dynamic_compare_except_string_) || !defined(_di_fl_string_dynamic_partial_compare_except_) || !defined(_di_fl_string_dynamic_partial_compare_except_dynamic_) || !defined(_di_fl_string_dynamic_partial_compare_except_string_)
   extern f_status_t private_fl_string_compare_except(const f_string_t string1, const f_string_t string2, const f_array_length_t offset1, const f_array_length_t offset2, const f_array_length_t stop1, const f_array_length_t stop2, const f_array_lengths_t except1, const f_array_lengths_t except2) F_attribute_visibility_internal_d;
-#endif // !defined(_di_fl_string_compare_except_) || !defined(_di_fl_string_dynamic_compare_except_) || !defined(_di_fl_string_dynamic_partial_compare_except_)
+#endif // !defined(_di_fl_string_compare_except_) || !defined(_di_fl_string_dynamic_compare_except_) || !defined(_di_fl_string_dynamic_compare_except_string_) || !defined(_di_fl_string_dynamic_partial_compare_except_) || !defined(_di_fl_string_dynamic_partial_compare_except_dynamic_) || !defined(_di_fl_string_dynamic_partial_compare_except_string_)
 
 /**
  * Private implementation of fl_string_compare_except_trim().
@@ -121,11 +124,14 @@ extern "C" {
  *
  * @see fl_string_compare_except_trim()
  * @see fl_string_dynamic_compare_except_trim()
+ * @see fl_string_dynamic_compare_except_string_trim()
  * @see fl_string_dynamic_partial_compare_except_trim()
+ * @see fl_string_dynamic_partial_compare_except_dynamic_trim()
+ * @see fl_string_dynamic_partial_compare_except_string_trim()
  */
-#if !defined(_di_fl_string_compare_except_trim_) || !defined(_di_fl_string_dynamic_compare_except_trim_) || !defined(_di_fl_string_dynamic_partial_compare_except_trim_)
+#if !defined(_di_fl_string_compare_except_trim_) || !defined(_di_fl_string_dynamic_compare_except_trim_) || !defined(_di_fl_string_dynamic_compare_except_string_trim_) || !defined(_di_fl_string_dynamic_partial_compare_except_trim_) || !defined(_di_fl_string_dynamic_partial_compare_except_dynamic_trim_) || !defined(_di_fl_string_dynamic_partial_compare_except_string_trim_)
   extern f_status_t private_fl_string_compare_except_trim(const f_string_t string1, const f_string_t string2, const f_array_length_t offset1, const f_array_length_t offset2, const f_array_length_t stop1, const f_array_length_t stop2, const f_array_lengths_t except1, const f_array_lengths_t except2) F_attribute_visibility_internal_d;
-#endif // !defined(_di_fl_string_compare_except_trim_) || !defined(_di_fl_string_dynamic_compare_except_trim_) || !defined(_di_fl_string_dynamic_partial_compare_except_trim_)
+#endif // !defined(_di_fl_string_compare_except_trim_) || !defined(_di_fl_string_dynamic_compare_except_trim_) || !defined(_di_fl_string_dynamic_compare_except_string_trim_) || !defined(_di_fl_string_dynamic_partial_compare_except_trim_) || !defined(_di_fl_string_dynamic_partial_compare_except_dynamic_trim_) || !defined(_di_fl_string_dynamic_partial_compare_except_string_trim_)
 
 /**
  * Private implementation of fl_string_compare_trim().
-- 
1.8.3.1