Update: Finish memory array related changes.

There are still the append() and append_all() function to change but I am going to leave that for another time.
This finishes the recent set of Progress commits addressing the memory array related code.

I have observed a notable reduction in binary size but the primary goal here is reduction of duplicate code and simplification of code.

I should eventually be able to re-introduce macros to map these helper functions back to the base array type to reduce binary size by a significant amount.
This should only be done once the API has stabilized more.

diff --git a/level_0/f_string/c/string.c b/level_0/f_string/c/string.c
index 20a94c20d20d16e7a434f1a60c6c494cef014938..3cc631a987e4e071547f2a75a517c72e6ebffe84 100644 (file)
--- a/level_0/f_string/c/string.c
+++ b/level_0/f_string/c/string.c
@@ -131,7 +131,7 @@ extern "C" {
     if (!length) return F_data_not;
 
     if (glue_length && destination->used) {
-      f_status_t status = private_f_string_append_nulless(glue, glue_length, destination);
+      const f_status_t status = private_f_string_append_nulless(glue, glue_length, destination);
       if (F_status_is_error(status)) return status;
     }
 

diff --git a/level_0/f_string/c/string/dynamic.c b/level_0/f_string/c/string/dynamic.c
index d99c68bc2abe98be5175e45821e7df2f88f7aa70..2e59c70472cfd5f3429639a643a005127288b78d 100644 (file)
--- a/level_0/f_string/c/string/dynamic.c
+++ b/level_0/f_string/c/string/dynamic.c
@@ -7,12 +7,12 @@ extern "C" {
 #endif
 
 #ifndef _di_f_string_dynamic_adjust_
-  f_status_t f_string_dynamic_adjust(const f_number_unsigned_t length, f_string_dynamic_t * const dynamic) {
+  f_status_t f_string_dynamic_adjust(const f_number_unsigned_t length, f_string_dynamic_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!dynamic) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    return f_memory_array_adjust(length, sizeof(f_string_t), (void **) &dynamic->string, &dynamic->used, &dynamic->size);
+    return f_memory_array_adjust(length, sizeof(f_string_t), (void **) &structure->string, &structure->used, &structure->size);
   }
 #endif // _di_f_string_dynamic_adjust_
 
@@ -105,42 +105,42 @@ extern "C" {
 #endif // _di_f_string_dynamic_append_nulless_
 
 #ifndef _di_f_string_dynamic_decimate_by_
-  f_status_t f_string_dynamic_decimate_by(const f_number_unsigned_t amount, f_string_dynamic_t * const dynamic) {
+  f_status_t f_string_dynamic_decimate_by(const f_number_unsigned_t amount, f_string_dynamic_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!dynamic) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    return f_memory_array_decimate_by(amount, sizeof(f_string_t), (void **) &dynamic->string, &dynamic->used, &dynamic->size);
+    return f_memory_array_decimate_by(amount, sizeof(f_string_t), (void **) &structure->string, &structure->used, &structure->size);
   }
 #endif // _di_f_string_dynamic_decimate_by_
 
 #ifndef _di_f_string_dynamic_decrease_by_
-  f_status_t f_string_dynamic_decrease_by(const f_number_unsigned_t amount, f_string_dynamic_t * const dynamic) {
+  f_status_t f_string_dynamic_decrease_by(const f_number_unsigned_t amount, f_string_dynamic_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!dynamic) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    return f_memory_array_decrease_by(amount, sizeof(f_string_t), (void **) &dynamic->string, &dynamic->used, &dynamic->size);
+    return f_memory_array_decrease_by(amount, sizeof(f_string_t), (void **) &structure->string, &structure->used, &structure->size);
   }
 #endif // _di_f_string_dynamic_decrease_by_
 
 #ifndef _di_f_string_dynamic_increase_
-  f_status_t f_string_dynamic_increase(const f_number_unsigned_t step, f_string_dynamic_t * const dynamic) {
+  f_status_t f_string_dynamic_increase(const f_number_unsigned_t step, f_string_dynamic_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!dynamic) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    return f_memory_array_increase(step, sizeof(f_string_t), (void **) &dynamic->string, &dynamic->used, &dynamic->size);
+    return f_memory_array_increase(step, sizeof(f_string_t), (void **) &structure->string, &structure->used, &structure->size);
   }
 #endif // _di_f_string_dynamic_increase_
 
 #ifndef _di_f_string_dynamic_increase_by_
-  f_status_t f_string_dynamic_increase_by(const f_number_unsigned_t amount, f_string_dynamic_t * const dynamic) {
+  f_status_t f_string_dynamic_increase_by(const f_number_unsigned_t amount, f_string_dynamic_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!dynamic) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    return f_memory_array_increase_by(amount, sizeof(f_string_t), (void **) &dynamic->string, &dynamic->used, &dynamic->size);
+    return f_memory_array_increase_by(amount, sizeof(f_string_t), (void **) &structure->string, &structure->used, &structure->size);
   }
 #endif // _di_f_string_dynamic_increase_by_
 
@@ -609,29 +609,29 @@ extern "C" {
 #endif // _di_f_string_dynamic_prepend_nulless_
 
 #ifndef _di_f_string_dynamic_resize_
-  f_status_t f_string_dynamic_resize(const f_number_unsigned_t length, f_string_dynamic_t * const buffer) {
+  f_status_t f_string_dynamic_resize(const f_number_unsigned_t length, f_string_dynamic_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!buffer) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    return f_memory_array_resize(length, sizeof(f_string_t), (void **) &buffer->string, &buffer->used, &buffer->size);
+    return f_memory_array_resize(length, sizeof(f_string_t), (void **) &structure->string, &structure->used, &structure->size);
   }
 #endif // _di_f_string_dynamic_resize_
 
 #ifndef _di_f_string_dynamic_seek_line_
-  f_status_t f_string_dynamic_seek_line(const f_string_static_t buffer, f_string_range_t * const range) {
+  f_status_t f_string_dynamic_seek_line(const f_string_static_t structure, f_string_range_t * const range) {
     #ifndef _di_level_0_parameter_checking_
       if (!range) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    if (!buffer.used) return F_data_not;
+    if (!structure.used) return F_data_not;
     if (range->start > range->stop) return F_data_not_stop;
 
-    while (buffer.string[range->start] != f_string_eol_s.string[0]) {
+    while (structure.string[range->start] != f_string_eol_s.string[0]) {
 
       ++range->start;
 
-      if (range->start >= buffer.used) return F_none_eos;
+      if (range->start >= structure.used) return F_none_eos;
       if (range->start > range->stop) return F_none_stop;
     } // while
 
@@ -640,21 +640,21 @@ extern "C" {
 #endif // _di_f_string_dynamic_seek_line_
 
 #ifndef _di_f_string_dynamic_seek_line_to_
-  f_status_t f_string_dynamic_seek_line_to(const f_string_static_t buffer, const f_char_t seek_to_this, f_string_range_t * const range) {
+  f_status_t f_string_dynamic_seek_line_to(const f_string_static_t structure, const f_char_t seek_to_this, f_string_range_t * const range) {
     #ifndef _di_level_0_parameter_checking_
       if (!range) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    if (!buffer.used) return F_data_not;
+    if (!structure.used) return F_data_not;
     if (range->start > range->stop) return F_data_not_stop;
 
-    while (buffer.string[range->start] != seek_to_this) {
+    while (structure.string[range->start] != seek_to_this) {
 
-      if (buffer.string[range->start] == f_string_eol_s.string[0]) return F_none_eol;
+      if (structure.string[range->start] == f_string_eol_s.string[0]) return F_none_eol;
 
       ++range->start;
 
-      if (range->start >= buffer.used) return F_none_eos;
+      if (range->start >= structure.used) return F_none_eos;
       if (range->start > range->stop) return F_none_stop;
     } // while
 
@@ -663,19 +663,19 @@ extern "C" {
 #endif // _di_f_string_dynamic_seek_line_to_
 
 #ifndef _di_f_string_dynamic_seek_to_
-  f_status_t f_string_dynamic_seek_to(const f_string_static_t buffer, const f_char_t seek_to_this, f_string_range_t * const range) {
+  f_status_t f_string_dynamic_seek_to(const f_string_static_t structure, const f_char_t seek_to_this, f_string_range_t * const range) {
     #ifndef _di_level_0_parameter_checking_
       if (!range) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    if (!buffer.used) return F_data_not;
+    if (!structure.used) return F_data_not;
     if (range->start > range->stop) return F_data_not_stop;
 
-    while (buffer.string[range->start] != seek_to_this) {
+    while (structure.string[range->start] != seek_to_this) {
 
       ++range->start;
 
-      if (range->start >= buffer.used) return F_none_eos;
+      if (range->start >= structure.used) return F_none_eos;
       if (range->start > range->stop) return F_none_stop;
     } // while
 

diff --git a/level_0/f_string/c/string/dynamic.h b/level_0/f_string/c/string/dynamic.h
index f2026c5b532dd154a9415887c86a4a1b3caf171b..f6d90603fb214448657aca47045168c6880e2f6f 100644 (file)
--- a/level_0/f_string/c/string/dynamic.h
+++ b/level_0/f_string/c/string/dynamic.h
@@ -57,7 +57,7 @@ extern "C" {
  *
  * @param length
  *   The new size to use.
- * @param dynamic
+ * @param structure
  *   The string to resize.
  *
  * @return
@@ -67,7 +67,7 @@ extern "C" {
  *   F_parameter (with error bit) if a parameter is invalid.
  */
 #ifndef _di_f_string_dynamic_adjust_
-  extern f_status_t f_string_dynamic_adjust(const f_number_unsigned_t length, f_string_dynamic_t * const dynamic);
+  extern f_status_t f_string_dynamic_adjust(const f_number_unsigned_t length, f_string_dynamic_t * const structure);
 #endif // _di_f_string_dynamic_adjust_
 
 /**
@@ -167,7 +167,7 @@ extern "C" {
  *
  * @param amount
  *   A positive number representing how much to decrease the size by.
- * @param dynamic
+ * @param structure
  *   The string to resize.
  *
  * @return
@@ -180,7 +180,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_string_dynamic_decimate_by_
-  extern f_status_t f_string_dynamic_decimate_by(const f_number_unsigned_t amount, f_string_dynamic_t * const dynamic);
+  extern f_status_t f_string_dynamic_decimate_by(const f_number_unsigned_t amount, f_string_dynamic_t * const structure);
 #endif // _di_f_string_dynamic_decimate_by_
 
 /**
@@ -192,7 +192,7 @@ extern "C" {
  *
  * @param amount
  *   A positive number representing how much to decrease the size by.
- * @param dynamic
+ * @param structure
  *   The string to resize.
  *
  * @return
@@ -205,7 +205,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_string_dynamic_decrease_by_
-  extern f_status_t f_string_dynamic_decrease_by(const f_number_unsigned_t amount, f_string_dynamic_t * const dynamic);
+  extern f_status_t f_string_dynamic_decrease_by(const f_number_unsigned_t amount, f_string_dynamic_t * const structure);
 #endif // _di_f_string_dynamic_decrease_by_
 
 /**
@@ -218,7 +218,7 @@ extern "C" {
  * @param step
  *   The allocation step to use.
  *   Must be greater than 0.
- * @param dynamic
+ * @param structure
  *   The string to resize.
  *
  * @return
@@ -231,7 +231,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_string_dynamic_increase_
-  extern f_status_t f_string_dynamic_increase(const f_number_unsigned_t step, f_string_dynamic_t * const dynamic);
+  extern f_status_t f_string_dynamic_increase(const f_number_unsigned_t step, f_string_dynamic_t * const structure);
 #endif // _di_f_string_dynamic_increase_
 
 /**
@@ -243,7 +243,7 @@ extern "C" {
  *
  * @param amount
  *   A positive number representing how much to increase the size by.
- * @param dynamic
+ * @param structure
  *   The string to resize.
  *
  * @return
@@ -256,7 +256,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_string_dynamic_increase_by_
-  extern f_status_t f_string_dynamic_increase_by(const f_number_unsigned_t amount, f_string_dynamic_t * const dynamic);
+  extern f_status_t f_string_dynamic_increase_by(const f_number_unsigned_t amount, f_string_dynamic_t * const structure);
 #endif // _di_f_string_dynamic_increase_by_
 
 /**
@@ -800,7 +800,7 @@ extern "C" {
  *
  * @param length
  *   The new size to use.
- * @param buffer
+ * @param structure
  *   The string to resize.
  *
  * @return
@@ -811,13 +811,13 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_string_dynamic_resize_
-  extern f_status_t f_string_dynamic_resize(const f_number_unsigned_t length, f_string_dynamic_t * const buffer);
+  extern f_status_t f_string_dynamic_resize(const f_number_unsigned_t length, f_string_dynamic_t * const structure);
 #endif // _di_f_string_dynamic_resize_
 
 /**
  * Seek the buffer location forward until EOL is reached.
  *
- * @param buffer
+ * @param structure
  *   The buffer to traverse.
  * @param range
  *   A range within the buffer representing the start and stop locations.
@@ -835,13 +835,13 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_string_dynamic_seek_line_
-  extern f_status_t f_string_dynamic_seek_line(const f_string_static_t buffer, f_string_range_t * const range);
+  extern f_status_t f_string_dynamic_seek_line(const f_string_static_t structure, f_string_range_t * const range);
 #endif // _di_f_string_dynamic_seek_line_
 
 /**
  * Seek the buffer location forward until the character (1-byte wide) or EOL is reached.
  *
- * @param buffer
+ * @param structure
  *   The buffer to traverse.
  * @param seek_to_this
  *   A single-width character representing a character to seek to.
@@ -861,13 +861,13 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_string_dynamic_seek_line_to_
-  extern f_status_t f_string_dynamic_seek_line_to(const f_string_static_t buffer, const f_char_t seek_to_this, f_string_range_t * const range);
+  extern f_status_t f_string_dynamic_seek_line_to(const f_string_static_t structure, const f_char_t seek_to_this, f_string_range_t * const range);
 #endif // _di_f_string_dynamic_seek_line_to_
 
 /**
  * Seek the buffer location forward until the character (1-byte wide) is reached.
  *
- * @param buffer
+ * @param structure
  *   The buffer to traverse.
  * @param seek_to_this
  *   A single-width character representing a character to seek to.
@@ -887,7 +887,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_string_dynamic_seek_to_
-  extern f_status_t f_string_dynamic_seek_to(const f_string_static_t buffer, const f_char_t seek_to_this, f_string_range_t * const range);
+  extern f_status_t f_string_dynamic_seek_to(const f_string_static_t structure, const f_char_t seek_to_this, f_string_range_t * const range);
 #endif // _di_f_string_dynamic_seek_to_
 
 /**

diff --git a/level_0/f_string/c/string/dynamics.c b/level_0/f_string/c/string/dynamics.c
index 6067ddc3a4e5643cc27576fc324e8d77b9455ca7..1f475413c17e02e3621873279ec215a126f9538f 100644 (file)
--- a/level_0/f_string/c/string/dynamics.c
+++ b/level_0/f_string/c/string/dynamics.c
@@ -8,12 +8,12 @@ extern "C" {
 #endif
 
 #ifndef _di_f_string_dynamics_adjust_
-  f_status_t f_string_dynamics_adjust(const f_number_unsigned_t length, f_string_dynamics_t * const dynamics) {
+  f_status_t f_string_dynamics_adjust(const f_number_unsigned_t length, f_string_dynamics_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!dynamics) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    return private_f_string_dynamics_adjust(length, dynamics);
+    return private_f_string_dynamics_adjust(length, structure);
   }
 #endif // _di_f_string_dynamics_adjust_
 
@@ -42,47 +42,47 @@ extern "C" {
 #endif // _di_f_string_dynamics_append_all_
 
 #ifndef _di_f_string_dynamics_decimate_by_
-  f_status_t f_string_dynamics_decimate_by(const f_number_unsigned_t amount, f_string_dynamics_t * const dynamics) {
+  f_status_t f_string_dynamics_decimate_by(const f_number_unsigned_t amount, f_string_dynamics_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!dynamics) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
     if (!amount) return F_data_not;
 
-    return private_f_string_dynamics_adjust((dynamics->size > amount) ? dynamics->size - amount : 0, dynamics);
+    return private_f_string_dynamics_adjust((structure->size > amount) ? structure->size - amount : 0, structure);
   }
 #endif // _di_f_string_dynamics_decimate_by_
 
 #ifndef _di_f_string_dynamics_decrease_by_
-  f_status_t f_string_dynamics_decrease_by(const f_number_unsigned_t amount, f_string_dynamics_t * const dynamics) {
+  f_status_t f_string_dynamics_decrease_by(const f_number_unsigned_t amount, f_string_dynamics_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!dynamics) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
     if (!amount) return F_data_not;
 
-    return private_f_string_dynamics_resize((dynamics->size > amount) ? dynamics->size - amount : 0, dynamics);
+    return private_f_string_dynamics_resize((structure->size > amount) ? structure->size - amount : 0, structure);
   }
 #endif // _di_f_string_dynamics_decrease_by_
 
 #ifndef _di_f_string_dynamics_increase_
-  f_status_t f_string_dynamics_increase(const f_number_unsigned_t step, f_string_dynamics_t * const dynamics) {
+  f_status_t f_string_dynamics_increase(const f_number_unsigned_t step, f_string_dynamics_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!dynamics) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
     if (!step) return F_data_not;
 
-    if (dynamics->used + 1 > dynamics->size) {
-      f_number_unsigned_t length = dynamics->used + step;
+    if (structure->used + 1 > structure->size) {
+      f_number_unsigned_t length = structure->used + step;
 
       if (length > F_number_t_size_unsigned_d) {
-        if (dynamics->used + 1 > F_number_t_size_unsigned_d) return F_status_set_error(F_array_too_large);
+        if (structure->used + 1 > F_number_t_size_unsigned_d) return F_status_set_error(F_array_too_large);
 
         length = F_number_t_size_unsigned_d;
       }
 
-      return private_f_string_dynamics_resize(length, dynamics);
+      return private_f_string_dynamics_resize(length, structure);
     }
 
     return F_data_not;
@@ -90,20 +90,20 @@ extern "C" {
 #endif // _di_f_string_dynamics_increase_
 
 #ifndef _di_f_string_dynamics_increase_by_
-  f_status_t f_string_dynamics_increase_by(const f_number_unsigned_t amount, f_string_dynamics_t * const dynamics) {
+  f_status_t f_string_dynamics_increase_by(const f_number_unsigned_t amount, f_string_dynamics_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!dynamics) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
     if (amount) {
-      if (dynamics->used >= F_number_t_size_unsigned_d) return F_status_set_error(F_array_too_large);
+      if (structure->used >= F_number_t_size_unsigned_d) return F_status_set_error(F_array_too_large);
 
-      const f_number_unsigned_t length = dynamics->used + amount;
+      const f_number_unsigned_t length = structure->used + amount;
 
-      if (length > dynamics->size) {
+      if (length > structure->size) {
         if (length > F_number_t_size_unsigned_d) return F_status_set_error(F_array_too_large);
 
-        return private_f_string_dynamics_resize(dynamics->used + amount, dynamics);
+        return private_f_string_dynamics_resize(structure->used + amount, structure);
       }
     }
 
@@ -112,12 +112,12 @@ extern "C" {
 #endif // _di_f_string_dynamics_increase_by_
 
 #ifndef _di_f_string_dynamics_resize_
-  f_status_t f_string_dynamics_resize(const f_number_unsigned_t length, f_string_dynamics_t * const dynamics) {
+  f_status_t f_string_dynamics_resize(const f_number_unsigned_t length, f_string_dynamics_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!dynamics) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    return private_f_string_dynamics_resize(length, dynamics);
+    return private_f_string_dynamics_resize(length, structure);
   }
 #endif // _di_f_string_dynamics_resize_
 

diff --git a/level_0/f_string/c/string/dynamics.h b/level_0/f_string/c/string/dynamics.h
index a1b5c099d947499efe75e1df5023ca9ac9778112..bed662a568231701263c4232e43baa49cc8c1e7d 100644 (file)
--- a/level_0/f_string/c/string/dynamics.h
+++ b/level_0/f_string/c/string/dynamics.h
@@ -50,7 +50,7 @@ extern "C" {
  *
  * @param length
  *   The new size to use.
- * @param dynamics
+ * @param structure
  *   The array to resize.
  *
  * @return
@@ -61,7 +61,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_adjust().
  */
 #ifndef _di_f_string_dynamics_adjust_
-  extern f_status_t f_string_dynamics_adjust(const f_number_unsigned_t length, f_string_dynamics_t * const dynamics);
+  extern f_status_t f_string_dynamics_adjust(const f_number_unsigned_t length, f_string_dynamics_t * const structure);
 #endif // _di_f_string_dynamics_adjust_
 
 /**
@@ -115,7 +115,7 @@ extern "C" {
  *
  * @param amount
  *   A positive number representing how much to decimate the size by.
- * @param dynamics
+ * @param structure
  *   The array to resize.
  *
  * @return
@@ -127,7 +127,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_string_dynamics_decimate_by_
-  extern f_status_t f_string_dynamics_decimate_by(const f_number_unsigned_t amount, f_string_dynamics_t * const dynamics);
+  extern f_status_t f_string_dynamics_decimate_by(const f_number_unsigned_t amount, f_string_dynamics_t * const structure);
 #endif // _di_f_string_dynamics_decimate_by_
 
 /**
@@ -139,7 +139,7 @@ extern "C" {
  *
  * @param amount
  *   A positive number representing how much to decrease the size by.
- * @param dynamics
+ * @param structure
  *   The array to resize.
  *
  * @return
@@ -151,7 +151,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_string_dynamics_decrease_by_
-  extern f_status_t f_string_dynamics_decrease_by(const f_number_unsigned_t amount, f_string_dynamics_t * const dynamics);
+  extern f_status_t f_string_dynamics_decrease_by(const f_number_unsigned_t amount, f_string_dynamics_t * const structure);
 #endif // _di_f_string_dynamics_decrease_by_
 
 /**
@@ -163,7 +163,7 @@ extern "C" {
  * @param step
  *   The allocation step to use.
  *   Must be greater than 0.
- * @param dynamics
+ * @param structure
  *   The array to resize.
  *
  * @return
@@ -176,7 +176,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_string_dynamics_increase_
-  extern f_status_t f_string_dynamics_increase(const f_number_unsigned_t step, f_string_dynamics_t * const dynamics);
+  extern f_status_t f_string_dynamics_increase(const f_number_unsigned_t step, f_string_dynamics_t * const structure);
 #endif // _di_f_string_dynamics_increase_
 
 /**
@@ -188,7 +188,7 @@ extern "C" {
  *
  * @param amount
  *   A positive number representing how much to increase the size by.
- * @param dynamics
+ * @param structure
  *   The array to resize.
  *
  * @return
@@ -201,7 +201,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_string_dynamics_increase_by_
-  extern f_status_t f_string_dynamics_increase_by(const f_number_unsigned_t amount, f_string_dynamics_t * const dynamics);
+  extern f_status_t f_string_dynamics_increase_by(const f_number_unsigned_t amount, f_string_dynamics_t * const structure);
 #endif // _di_f_string_dynamics_increase_by_
 
 /**
@@ -209,7 +209,7 @@ extern "C" {
  *
  * @param length
  *   The new size to use.
- * @param dynamics
+ * @param structure
  *   The array to resize.
  *
  * @return
@@ -220,7 +220,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_string_dynamics_resize_
-  extern f_status_t f_string_dynamics_resize(const f_number_unsigned_t length, f_string_dynamics_t * const dynamics);
+  extern f_status_t f_string_dynamics_resize(const f_number_unsigned_t length, f_string_dynamics_t * const structure);
 #endif // _di_f_string_dynamics_resize_
 
 #ifdef __cplusplus

diff --git a/level_0/f_string/c/string/dynamicss.c b/level_0/f_string/c/string/dynamicss.c
index dae3a3be0087a97a1a06bfc8a63dc72192a7f80b..eecad3a8f310340e2610d08f1b83ca78d794d3f2 100644 (file)
--- a/level_0/f_string/c/string/dynamicss.c
+++ b/level_0/f_string/c/string/dynamicss.c
@@ -9,12 +9,12 @@ extern "C" {
 #endif
 
 #ifndef _di_f_string_dynamicss_adjust_
-  f_status_t f_string_dynamicss_adjust(const f_number_unsigned_t length, f_string_dynamicss_t * const dynamicss) {
+  f_status_t f_string_dynamicss_adjust(const f_number_unsigned_t length, f_string_dynamicss_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!dynamicss) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    return private_f_string_dynamicss_adjust(length, dynamicss);
+    return private_f_string_dynamicss_adjust(length, structure);
   }
 #endif // _di_f_string_dynamicss_adjust_
 
@@ -76,47 +76,47 @@ extern "C" {
 #endif // _di_f_string_dynamicss_append_all_
 
 #ifndef _di_f_string_dynamicss_decimate_by_
-  f_status_t f_string_dynamicss_decimate_by(const f_number_unsigned_t amount, f_string_dynamicss_t * const dynamicss) {
+  f_status_t f_string_dynamicss_decimate_by(const f_number_unsigned_t amount, f_string_dynamicss_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!dynamicss) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
     if (!amount) return F_data_not;
 
-    return private_f_string_dynamicss_adjust((dynamicss->size > amount) ? dynamicss->size - amount : 0, dynamicss);
+    return private_f_string_dynamicss_adjust((structure->size > amount) ? structure->size - amount : 0, structure);
   }
 #endif // _di_f_string_dynamicss_decimate_by_
 
 #ifndef _di_f_string_dynamicss_decrease_by_
-  f_status_t f_string_dynamicss_decrease_by(const f_number_unsigned_t amount, f_string_dynamicss_t * const dynamicss) {
+  f_status_t f_string_dynamicss_decrease_by(const f_number_unsigned_t amount, f_string_dynamicss_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!dynamicss) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
     if (!amount) return F_data_not;
 
-    return private_f_string_dynamicss_resize((dynamicss->size > amount) ? dynamicss->size - amount : 0, dynamicss);
+    return private_f_string_dynamicss_resize((structure->size > amount) ? structure->size - amount : 0, structure);
   }
 #endif // _di_f_string_dynamicss_decrease_by_
 
 #ifndef _di_f_string_dynamicss_increase_
-  f_status_t f_string_dynamicss_increase(const f_number_unsigned_t step, f_string_dynamicss_t * const dynamicss) {
+  f_status_t f_string_dynamicss_increase(const f_number_unsigned_t step, f_string_dynamicss_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!dynamicss) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
     if (!step) return F_data_not;
 
-    if (dynamicss->used + 1 > dynamicss->size) {
-      f_number_unsigned_t length = dynamicss->used + step;
+    if (structure->used + 1 > structure->size) {
+      f_number_unsigned_t length = structure->used + step;
 
       if (length > F_number_t_size_unsigned_d) {
-        if (dynamicss->used + 1 > F_number_t_size_unsigned_d) return F_status_set_error(F_array_too_large);
+        if (structure->used + 1 > F_number_t_size_unsigned_d) return F_status_set_error(F_array_too_large);
 
         length = F_number_t_size_unsigned_d;
       }
 
-      return private_f_string_dynamicss_resize(length, dynamicss);
+      return private_f_string_dynamicss_resize(length, structure);
     }
 
     return F_data_not;
@@ -124,20 +124,20 @@ extern "C" {
 #endif // _di_f_string_dynamicss_increase_
 
 #ifndef _di_f_string_dynamicss_increase_by_
-  f_status_t f_string_dynamicss_increase_by(const f_number_unsigned_t amount, f_string_dynamicss_t * const dynamicss) {
+  f_status_t f_string_dynamicss_increase_by(const f_number_unsigned_t amount, f_string_dynamicss_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!dynamicss) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
     if (amount) {
-      if (dynamicss->used >= F_number_t_size_unsigned_d) return F_status_set_error(F_array_too_large);
+      if (structure->used >= F_number_t_size_unsigned_d) return F_status_set_error(F_array_too_large);
 
-      const f_number_unsigned_t length = dynamicss->used + amount;
+      const f_number_unsigned_t length = structure->used + amount;
 
-      if (length > dynamicss->size) {
+      if (length > structure->size) {
         if (length > F_number_t_size_unsigned_d) return F_status_set_error(F_array_too_large);
 
-        return private_f_string_dynamicss_resize(dynamicss->used + amount, dynamicss);
+        return private_f_string_dynamicss_resize(structure->used + amount, structure);
       }
     }
 
@@ -146,12 +146,12 @@ extern "C" {
 #endif // _di_f_string_dynamicss_increase_by_
 
 #ifndef _di_f_string_dynamicss_resize_
-  f_status_t f_string_dynamicss_resize(const f_number_unsigned_t length, f_string_dynamicss_t * const dynamicss) {
+  f_status_t f_string_dynamicss_resize(const f_number_unsigned_t length, f_string_dynamicss_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!dynamicss) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    return private_f_string_dynamicss_resize(length, dynamicss);
+    return private_f_string_dynamicss_resize(length, structure);
   }
 #endif // _di_f_string_dynamicss_resize_
 

diff --git a/level_0/f_string/c/string/dynamicss.h b/level_0/f_string/c/string/dynamicss.h
index 5a3755cf75588fc87b0674ae6d446c5bcf484060..38e986fc98af745cbcc2389079823b66431d6765 100644 (file)
--- a/level_0/f_string/c/string/dynamicss.h
+++ b/level_0/f_string/c/string/dynamicss.h
@@ -50,7 +50,7 @@ extern "C" {
  *
  * @param length
  *   The new size to use.
- * @param dynamicss
+ * @param structure
  *   The array to resize.
  *
  * @return
@@ -61,7 +61,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_adjust().
  */
 #ifndef _di_f_string_dynamicss_adjust_
-  extern f_status_t f_string_dynamicss_adjust(const f_number_unsigned_t length, f_string_dynamicss_t * const dynamicss);
+  extern f_status_t f_string_dynamicss_adjust(const f_number_unsigned_t length, f_string_dynamicss_t * const structure);
 #endif // _di_f_string_dynamicss_adjust_
 
 /**
@@ -115,7 +115,7 @@ extern "C" {
  *
  * @param amount
  *   A positive number representing how much to decimate the size by.
- * @param dynamicss
+ * @param structure
  *   The array to resize.
  *
  * @return
@@ -127,7 +127,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_string_dynamicss_decimate_by_
-  extern f_status_t f_string_dynamicss_decimate_by(const f_number_unsigned_t amount, f_string_dynamicss_t * const dynamicss);
+  extern f_status_t f_string_dynamicss_decimate_by(const f_number_unsigned_t amount, f_string_dynamicss_t * const structure);
 #endif // _di_f_string_dynamicss_decimate_by_
 
 /**
@@ -139,7 +139,7 @@ extern "C" {
  *
  * @param amount
  *   A positive number representing how much to decrease the size by.
- * @param dynamicss
+ * @param structure
  *   The array to resize.
  *
  * @return
@@ -151,7 +151,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_string_dynamicss_decrease_by_
-  extern f_status_t f_string_dynamicss_decrease_by(const f_number_unsigned_t amount, f_string_dynamicss_t * const dynamicss);
+  extern f_status_t f_string_dynamicss_decrease_by(const f_number_unsigned_t amount, f_string_dynamicss_t * const structure);
 #endif // _di_f_string_dynamicss_decrease_by_
 
 /**
@@ -163,7 +163,7 @@ extern "C" {
  * @param step
  *   The allocation step to use.
  *   Must be greater than 0.
- * @param dynamicss
+ * @param structure
  *   The array to resize.
  *
  * @return
@@ -176,7 +176,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_string_dynamicss_increase_
-  extern f_status_t f_string_dynamicss_increase(const f_number_unsigned_t step, f_string_dynamicss_t * const dynamicss);
+  extern f_status_t f_string_dynamicss_increase(const f_number_unsigned_t step, f_string_dynamicss_t * const structure);
 #endif // _di_f_string_dynamicss_increase_
 
 /**
@@ -188,7 +188,7 @@ extern "C" {
  *
  * @param amount
  *   A positive number representing how much to increase the size by.
- * @param dynamicss
+ * @param structure
  *   The array to resize.
  *
  * @return
@@ -201,7 +201,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_string_dynamicss_increase_by_
-  extern f_status_t f_string_dynamicss_increase_by(const f_number_unsigned_t amount, f_string_dynamicss_t * const dynamicss);
+  extern f_status_t f_string_dynamicss_increase_by(const f_number_unsigned_t amount, f_string_dynamicss_t * const structure);
 #endif // _di_f_string_dynamicss_increase_by_
 
 /**
@@ -209,7 +209,7 @@ extern "C" {
  *
  * @param length
  *   The new size to use.
- * @param dynamicss
+ * @param structure
  *   The array to resize.
  *
  * @return
@@ -220,7 +220,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_string_dynamicss_resize_
-  extern f_status_t f_string_dynamicss_resize(const f_number_unsigned_t length, f_string_dynamicss_t * const dynamicss);
+  extern f_status_t f_string_dynamicss_resize(const f_number_unsigned_t length, f_string_dynamicss_t * const structure);
 #endif // _di_f_string_dynamicss_resize_
 
 #ifdef __cplusplus

diff --git a/level_0/f_string/c/string/map_multis.c b/level_0/f_string/c/string/map_multis.c
index 5f8cb3648367b752d222463498144713db2eeb1c..d806035ee9d4e6df56bfe3bd4cd2626826904cea 100644 (file)
--- a/level_0/f_string/c/string/map_multis.c
+++ b/level_0/f_string/c/string/map_multis.c
@@ -9,12 +9,12 @@ extern "C" {
 #endif
 
 #ifndef _di_f_string_map_multis_adjust_
-  f_status_t f_string_map_multis_adjust(const f_number_unsigned_t length, f_string_map_multis_t * const map_multis) {
+  f_status_t f_string_map_multis_adjust(const f_number_unsigned_t length, f_string_map_multis_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!map_multis) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    return private_f_string_map_multis_adjust(length, map_multis);
+    return private_f_string_map_multis_adjust(length, structure);
   }
 #endif // _di_f_string_map_multis_adjust_
 
@@ -63,45 +63,45 @@ extern "C" {
 #endif // _di_f_string_map_multis_append_all_
 
 #ifndef _di_f_string_map_multis_decimate_by_
-  f_status_t f_string_map_multis_decimate_by(const f_number_unsigned_t amount, f_string_map_multis_t * const map_multis) {
+  f_status_t f_string_map_multis_decimate_by(const f_number_unsigned_t amount, f_string_map_multis_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!map_multis) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
     if (!amount) return F_data_not;
 
-    return private_f_string_map_multis_adjust((map_multis->size > amount) ? map_multis->size - amount : 0, map_multis);
+    return private_f_string_map_multis_adjust((structure->size > amount) ? structure->size - amount : 0, structure);
   }
 #endif // _di_f_string_map_multis_decimate_by_
 
 #ifndef _di_f_string_map_multis_decrease_by_
-  f_status_t f_string_map_multis_decrease_by(const f_number_unsigned_t amount, f_string_map_multis_t * const map_multis) {
+  f_status_t f_string_map_multis_decrease_by(const f_number_unsigned_t amount, f_string_map_multis_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!map_multis) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
     if (!amount) return F_data_not;
 
-    return private_f_string_map_multis_resize((map_multis->size > amount) ? map_multis->size - amount : 0, map_multis);
+    return private_f_string_map_multis_resize((structure->size > amount) ? structure->size - amount : 0, structure);
   }
 #endif // _di_f_string_map_multis_decrease_by_
 
 #ifndef _di_f_string_map_multis_increase_
-  f_status_t f_string_map_multis_increase(const f_number_unsigned_t step, f_string_map_multis_t * const map_multis) {
+  f_status_t f_string_map_multis_increase(const f_number_unsigned_t step, f_string_map_multis_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!map_multis) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    if (step && map_multis->used + 1 > map_multis->size) {
-      f_number_unsigned_t length = map_multis->used + step;
+    if (step && structure->used + 1 > structure->size) {
+      f_number_unsigned_t length = structure->used + step;
 
       if (length > F_number_t_size_unsigned_d) {
-        if (map_multis->used + 1 > F_number_t_size_unsigned_d) return F_status_set_error(F_array_too_large);
+        if (structure->used + 1 > F_number_t_size_unsigned_d) return F_status_set_error(F_array_too_large);
 
         length = F_number_t_size_unsigned_d;
       }
 
-      return private_f_string_map_multis_resize(length, map_multis);
+      return private_f_string_map_multis_resize(length, structure);
     }
 
     return F_data_not;
@@ -109,20 +109,20 @@ extern "C" {
 #endif // _di_f_string_map_multis_increase_
 
 #ifndef _di_f_string_map_multis_increase_by_
-  f_status_t f_string_map_multis_increase_by(const f_number_unsigned_t amount, f_string_map_multis_t * const map_multis) {
+  f_status_t f_string_map_multis_increase_by(const f_number_unsigned_t amount, f_string_map_multis_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!map_multis) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
     if (amount) {
-      if (map_multis->used >= F_number_t_size_unsigned_d) return F_status_set_error(F_array_too_large);
+      if (structure->used >= F_number_t_size_unsigned_d) return F_status_set_error(F_array_too_large);
 
-      const f_number_unsigned_t length = map_multis->used + amount;
+      const f_number_unsigned_t length = structure->used + amount;
 
-      if (length > map_multis->size) {
+      if (length > structure->size) {
         if (length > F_number_t_size_unsigned_d) return F_status_set_error(F_array_too_large);
 
-        return private_f_string_map_multis_resize(length, map_multis);
+        return private_f_string_map_multis_resize(length, structure);
       }
     }
 
@@ -131,12 +131,12 @@ extern "C" {
 #endif // _di_f_string_map_multis_increase_by_
 
 #ifndef _di_f_string_map_multis_resize_
-  f_status_t f_string_map_multis_resize(const f_number_unsigned_t length, f_string_map_multis_t * const map_multis) {
+  f_status_t f_string_map_multis_resize(const f_number_unsigned_t length, f_string_map_multis_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!map_multis) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    return private_f_string_map_multis_resize(length, map_multis);
+    return private_f_string_map_multis_resize(length, structure);
   }
 #endif // _di_f_string_map_multis_resize_
 

diff --git a/level_0/f_string/c/string/map_multis.h b/level_0/f_string/c/string/map_multis.h
index 4fde6a5bd7fd6578526d99d7ddd44c05e1de64ca..4cb52594ce76ff0bbdc2504365db1c1b290785a4 100644 (file)
--- a/level_0/f_string/c/string/map_multis.h
+++ b/level_0/f_string/c/string/map_multis.h
@@ -54,7 +54,7 @@ extern "C" {
  *
  * @param length
  *   The new size to use.
- * @param map_multis
+ * @param structure
  *   The map_multis array to resize.
  *
  * @return
@@ -65,7 +65,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_string_map_multis_adjust_
-  extern f_status_t f_string_map_multis_adjust(const f_number_unsigned_t length, f_string_map_multis_t * const map_multis);
+  extern f_status_t f_string_map_multis_adjust(const f_number_unsigned_t length, f_string_map_multis_t * const structure);
 #endif // _di_f_string_map_multis_adjust_
 
 /**
@@ -118,7 +118,7 @@ extern "C" {
  *
  * @param amount
  *   A positive number representing how much to decimate the size by.
- * @param map_multis
+ * @param structure
  *   The map_multis array to resize.
  *
  * @return
@@ -130,7 +130,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_string_map_multis_decimate_by_
-  extern f_status_t f_string_map_multis_decimate_by(const f_number_unsigned_t amount, f_string_map_multis_t * const map_multis);
+  extern f_status_t f_string_map_multis_decimate_by(const f_number_unsigned_t amount, f_string_map_multis_t * const structure);
 #endif // _di_f_string_map_multis_decimate_by_
 
 /**
@@ -142,7 +142,7 @@ extern "C" {
  *
  * @param amount
  *   A positive number representing how much to decrease the size by.
- * @param map_multis
+ * @param structure
  *   The map_multis array to resize.
  *
  * @return
@@ -153,7 +153,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_string_map_multis_decrease_by_
-  extern f_status_t f_string_map_multis_decrease_by(const f_number_unsigned_t amount, f_string_map_multis_t * const map_multis);
+  extern f_status_t f_string_map_multis_decrease_by(const f_number_unsigned_t amount, f_string_map_multis_t * const structure);
 #endif // _di_f_string_map_multis_decrease_by_
 
 /**
@@ -165,7 +165,7 @@ extern "C" {
  * @param step
  *   The allocation step to use.
  *   Must be greater than 0.
- * @param map_multis
+ * @param structure
  *   The map_multis array to resize.
  *
  * @return
@@ -178,7 +178,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_string_map_multis_increase_
-  extern f_status_t f_string_map_multis_increase(const f_number_unsigned_t step, f_string_map_multis_t * const map_multis);
+  extern f_status_t f_string_map_multis_increase(const f_number_unsigned_t step, f_string_map_multis_t * const structure);
 #endif // _di_f_string_map_multis_increase_
 
 /**
@@ -190,7 +190,7 @@ extern "C" {
  *
  * @param amount
  *   A positive number representing how much to increase the size by.
- * @param map_multis
+ * @param structure
  *   The map_multis array to resize.
  *
  * @return
@@ -203,7 +203,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_string_map_multis_increase_by_
-  extern f_status_t f_string_map_multis_increase_by(const f_number_unsigned_t amount, f_string_map_multis_t * const map_multis);
+  extern f_status_t f_string_map_multis_increase_by(const f_number_unsigned_t amount, f_string_map_multis_t * const structure);
 #endif // _di_f_string_map_multis_increase_by_
 
 /**
@@ -211,7 +211,7 @@ extern "C" {
  *
  * @param length
  *   The new size to use.
- * @param map_multis
+ * @param structure
  *   The map_multis array to adjust.
  *
  * @return
@@ -222,7 +222,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_string_map_multis_resize_
-  extern f_status_t f_string_map_multis_resize(const f_number_unsigned_t length, f_string_map_multis_t * const map_multis);
+  extern f_status_t f_string_map_multis_resize(const f_number_unsigned_t length, f_string_map_multis_t * const structure);
 #endif // _di_f_string_map_multis_resize_
 
 #ifdef __cplusplus

diff --git a/level_0/f_string/c/string/map_multiss.c b/level_0/f_string/c/string/map_multiss.c
index 2dd2c4a9cfb737e02ffc67c372881955cac70ad6..3b3cea9183b5020e714596fa696e72b75b2b5893 100644 (file)
--- a/level_0/f_string/c/string/map_multiss.c
+++ b/level_0/f_string/c/string/map_multiss.c
@@ -10,12 +10,12 @@ extern "C" {
 #endif
 
 #ifndef _di_f_string_map_multiss_adjust_
-  f_status_t f_string_map_multiss_adjust(const f_number_unsigned_t length, f_string_map_multiss_t * const map_multiss) {
+  f_status_t f_string_map_multiss_adjust(const f_number_unsigned_t length, f_string_map_multiss_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!map_multiss) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    return private_f_string_map_multiss_adjust(length, map_multiss);
+    return private_f_string_map_multiss_adjust(length, structure);
   }
 #endif // _di_f_string_map_multiss_adjust_
 
@@ -77,45 +77,45 @@ extern "C" {
 #endif // _di_f_string_map_multiss_append_all_
 
 #ifndef _di_f_string_map_multiss_decimate_by_
-  f_status_t f_string_map_multiss_decimate_by(const f_number_unsigned_t amount, f_string_map_multiss_t * const map_multiss) {
+  f_status_t f_string_map_multiss_decimate_by(const f_number_unsigned_t amount, f_string_map_multiss_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!map_multiss) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
     if (!amount) return F_data_not;
 
-    return private_f_string_map_multiss_adjust((map_multiss->size > amount) ? map_multiss->size - amount : 0, map_multiss);
+    return private_f_string_map_multiss_adjust((structure->size > amount) ? structure->size - amount : 0, structure);
   }
 #endif // _di_f_string_map_multiss_decimate_by_
 
 #ifndef _di_f_string_map_multiss_decrease_by_
-  f_status_t f_string_map_multiss_decrease_by(const f_number_unsigned_t amount, f_string_map_multiss_t * const map_multiss) {
+  f_status_t f_string_map_multiss_decrease_by(const f_number_unsigned_t amount, f_string_map_multiss_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!map_multiss) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
     if (!amount) return F_data_not;
 
-    return private_f_string_map_multiss_resize((map_multiss->size > amount) ? map_multiss->size - amount : 0, map_multiss);
+    return private_f_string_map_multiss_resize((structure->size > amount) ? structure->size - amount : 0, structure);
   }
 #endif // _di_f_string_map_multiss_decrease_by_
 
 #ifndef _di_f_string_map_multiss_increase_
-  f_status_t f_string_map_multiss_increase(const f_number_unsigned_t step, f_string_map_multiss_t * const map_multiss) {
+  f_status_t f_string_map_multiss_increase(const f_number_unsigned_t step, f_string_map_multiss_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!map_multiss) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    if (step && map_multiss->used + 1 > map_multiss->size) {
-      f_number_unsigned_t length = map_multiss->used + step;
+    if (step && structure->used + 1 > structure->size) {
+      f_number_unsigned_t length = structure->used + step;
 
       if (length > F_number_t_size_unsigned_d) {
-        if (map_multiss->used + 1 > F_number_t_size_unsigned_d) return F_status_set_error(F_array_too_large);
+        if (structure->used + 1 > F_number_t_size_unsigned_d) return F_status_set_error(F_array_too_large);
 
         length = F_number_t_size_unsigned_d;
       }
 
-      return private_f_string_map_multiss_resize(length, map_multiss);
+      return private_f_string_map_multiss_resize(length, structure);
     }
 
     return F_data_not;
@@ -123,20 +123,20 @@ extern "C" {
 #endif // _di_f_string_map_multiss_increase_
 
 #ifndef _di_f_string_map_multiss_increase_by_
-  f_status_t f_string_map_multiss_increase_by(const f_number_unsigned_t amount, f_string_map_multiss_t * const map_multiss) {
+  f_status_t f_string_map_multiss_increase_by(const f_number_unsigned_t amount, f_string_map_multiss_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!map_multiss) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
     if (amount) {
-      if (map_multiss->used >= F_number_t_size_unsigned_d) return F_status_set_error(F_array_too_large);
+      if (structure->used >= F_number_t_size_unsigned_d) return F_status_set_error(F_array_too_large);
 
-      const f_number_unsigned_t length = map_multiss->used + amount;
+      const f_number_unsigned_t length = structure->used + amount;
 
-      if (length > map_multiss->size) {
+      if (length > structure->size) {
         if (length > F_number_t_size_unsigned_d) return F_status_set_error(F_array_too_large);
 
-        return private_f_string_map_multiss_resize(length, map_multiss);
+        return private_f_string_map_multiss_resize(length, structure);
       }
     }
 
@@ -145,12 +145,12 @@ extern "C" {
 #endif // _di_f_string_map_multiss_increase_by_
 
 #ifndef _di_f_string_map_multiss_resize_
-  f_status_t f_string_map_multiss_resize(const f_number_unsigned_t length, f_string_map_multiss_t * const map_multiss) {
+  f_status_t f_string_map_multiss_resize(const f_number_unsigned_t length, f_string_map_multiss_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!map_multiss) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    return private_f_string_map_multiss_resize(length, map_multiss);
+    return private_f_string_map_multiss_resize(length, structure);
   }
 #endif // _di_f_string_map_multiss_resize_
 

diff --git a/level_0/f_string/c/string/map_multiss.h b/level_0/f_string/c/string/map_multiss.h
index 9ebd77d248ac4da72c3724b41f9363029e78bd5d..cc9614def48316461f3f916e7cef4dc87532e8b3 100644 (file)
--- a/level_0/f_string/c/string/map_multiss.h
+++ b/level_0/f_string/c/string/map_multiss.h
@@ -54,7 +54,7 @@ extern "C" {
  *
  * @param length
  *   The new size to use.
- * @param map_multiss
+ * @param structure
  *   The map_multiss array to resize.
  *
  * @return
@@ -65,7 +65,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_string_map_multiss_adjust_
-  extern f_status_t f_string_map_multiss_adjust(const f_number_unsigned_t length, f_string_map_multiss_t * const map_multiss);
+  extern f_status_t f_string_map_multiss_adjust(const f_number_unsigned_t length, f_string_map_multiss_t * const structure);
 #endif // _di_f_string_map_multiss_adjust_
 
 /**
@@ -118,7 +118,7 @@ extern "C" {
  *
  * @param amount
  *   A positive number representing how much to decimate the size by.
- * @param map_multiss
+ * @param structure
  *   The map_multiss array to resize.
  *
  * @return
@@ -130,7 +130,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_string_map_multiss_decimate_by_
-  extern f_status_t f_string_map_multiss_decimate_by(const f_number_unsigned_t amount, f_string_map_multiss_t * const map_multiss);
+  extern f_status_t f_string_map_multiss_decimate_by(const f_number_unsigned_t amount, f_string_map_multiss_t * const structure);
 #endif // _di_f_string_map_multiss_decimate_by_
 
 /**
@@ -142,7 +142,7 @@ extern "C" {
  *
  * @param amount
  *   A positive number representing how much to decrease the size by.
- * @param map_multiss
+ * @param structure
  *   The map_multiss array to resize.
  *
  * @return
@@ -153,7 +153,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_string_map_multiss_decrease_by_
-  extern f_status_t f_string_map_multiss_decrease_by(const f_number_unsigned_t amount, f_string_map_multiss_t * const map_multiss);
+  extern f_status_t f_string_map_multiss_decrease_by(const f_number_unsigned_t amount, f_string_map_multiss_t * const structure);
 #endif // _di_f_string_map_multiss_decrease_by_
 
 /**
@@ -165,7 +165,7 @@ extern "C" {
  * @param step
  *   The allocation step to use.
  *   Must be greater than 0.
- * @param map_multiss
+ * @param structure
  *   The map_multiss array to resize.
  *
  * @return
@@ -178,7 +178,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_string_map_multiss_increase_
-  extern f_status_t f_string_map_multiss_increase(const f_number_unsigned_t step, f_string_map_multiss_t * const map_multiss);
+  extern f_status_t f_string_map_multiss_increase(const f_number_unsigned_t step, f_string_map_multiss_t * const structure);
 #endif // _di_f_string_map_multiss_increase_
 
 /**
@@ -190,7 +190,7 @@ extern "C" {
  *
  * @param amount
  *   A positive number representing how much to increase the size by.
- * @param map_multiss
+ * @param structure
  *   The map_multiss array to resize.
  *
  * @return
@@ -203,7 +203,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_string_map_multiss_increase_by_
-  extern f_status_t f_string_map_multiss_increase_by(const f_number_unsigned_t amount, f_string_map_multiss_t * const map_multiss);
+  extern f_status_t f_string_map_multiss_increase_by(const f_number_unsigned_t amount, f_string_map_multiss_t * const structure);
 #endif // _di_f_string_map_multiss_increase_by_
 
 /**
@@ -211,7 +211,7 @@ extern "C" {
  *
  * @param length
  *   The new size to use.
- * @param map_multiss
+ * @param structure
  *   The map_multiss array to adjust.
  *
  * @return
@@ -222,7 +222,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_string_map_multiss_resize_
-  extern f_status_t f_string_map_multiss_resize(const f_number_unsigned_t length, f_string_map_multiss_t * const map_multiss);
+  extern f_status_t f_string_map_multiss_resize(const f_number_unsigned_t length, f_string_map_multiss_t * const structure);
 #endif // _di_f_string_map_multiss_resize_
 
 #ifdef __cplusplus

diff --git a/level_0/f_string/c/string/maps.c b/level_0/f_string/c/string/maps.c
index fa95676c80dd16bf9a7a61fbe36853ecfbdedf2e..cc7fb37a420e83f6197c867323c391779c517b27 100644 (file)
--- a/level_0/f_string/c/string/maps.c
+++ b/level_0/f_string/c/string/maps.c
@@ -7,12 +7,12 @@ extern "C" {
 #endif
 
 #ifndef _di_f_string_maps_adjust_
-  f_status_t f_string_maps_adjust(const f_number_unsigned_t length, f_string_maps_t * const maps) {
+  f_status_t f_string_maps_adjust(const f_number_unsigned_t length, f_string_maps_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!maps) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    return private_f_string_maps_adjust(length, maps);
+    return private_f_string_maps_adjust(length, structure);
   }
 #endif // _di_f_string_maps_adjust_
 
@@ -61,45 +61,45 @@ extern "C" {
 #endif // _di_f_string_maps_append_all_
 
 #ifndef _di_f_string_maps_decimate_by_
-  f_status_t f_string_maps_decimate_by(const f_number_unsigned_t amount, f_string_maps_t * const maps) {
+  f_status_t f_string_maps_decimate_by(const f_number_unsigned_t amount, f_string_maps_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!maps) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
     if (!amount) return F_data_not;
 
-    return private_f_string_maps_adjust((maps->size > amount) ? maps->size - amount : 0, maps);
+    return private_f_string_maps_adjust((structure->size > amount) ? structure->size - amount : 0, structure);
   }
 #endif // _di_f_string_maps_decimate_by_
 
 #ifndef _di_f_string_maps_decrease_by_
-  f_status_t f_string_maps_decrease_by(const f_number_unsigned_t amount, f_string_maps_t * const maps) {
+  f_status_t f_string_maps_decrease_by(const f_number_unsigned_t amount, f_string_maps_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!maps) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
     if (!amount) return F_data_not;
 
-    return private_f_string_maps_resize((maps->size > amount) ? maps->size - amount : 0, maps);
+    return private_f_string_maps_resize((structure->size > amount) ? structure->size - amount : 0, structure);
   }
 #endif // _di_f_string_maps_decrease_by_
 
 #ifndef _di_f_string_maps_increase_
-  f_status_t f_string_maps_increase(const f_number_unsigned_t step, f_string_maps_t * const maps) {
+  f_status_t f_string_maps_increase(const f_number_unsigned_t step, f_string_maps_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!maps) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    if (step && maps->used + 1 > maps->size) {
-      f_number_unsigned_t length = maps->used + step;
+    if (step && structure->used + 1 > structure->size) {
+      f_number_unsigned_t length = structure->used + step;
 
       if (length > F_number_t_size_unsigned_d) {
-        if (maps->used + 1 > F_number_t_size_unsigned_d) return F_status_set_error(F_array_too_large);
+        if (structure->used + 1 > F_number_t_size_unsigned_d) return F_status_set_error(F_array_too_large);
 
         length = F_number_t_size_unsigned_d;
       }
 
-      return private_f_string_maps_resize(length, maps);
+      return private_f_string_maps_resize(length, structure);
     }
 
     return F_data_not;
@@ -107,20 +107,20 @@ extern "C" {
 #endif // _di_f_string_maps_increase_
 
 #ifndef _di_f_string_maps_increase_by_
-  f_status_t f_string_maps_increase_by(const f_number_unsigned_t amount, f_string_maps_t * const maps) {
+  f_status_t f_string_maps_increase_by(const f_number_unsigned_t amount, f_string_maps_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!maps) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
     if (amount) {
-      if (maps->used >= F_number_t_size_unsigned_d) return F_status_set_error(F_array_too_large);
+      if (structure->used >= F_number_t_size_unsigned_d) return F_status_set_error(F_array_too_large);
 
-      const f_number_unsigned_t length = maps->used + amount;
+      const f_number_unsigned_t length = structure->used + amount;
 
-      if (length > maps->size) {
+      if (length > structure->size) {
         if (length > F_number_t_size_unsigned_d) return F_status_set_error(F_array_too_large);
 
-        return private_f_string_maps_resize(length, maps);
+        return private_f_string_maps_resize(length, structure);
       }
     }
 
@@ -129,12 +129,12 @@ extern "C" {
 #endif // _di_f_string_maps_increase_by_
 
 #ifndef _di_f_string_maps_resize_
-  f_status_t f_string_maps_resize(const f_number_unsigned_t length, f_string_maps_t * const maps) {
+  f_status_t f_string_maps_resize(const f_number_unsigned_t length, f_string_maps_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!maps) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    return private_f_string_maps_resize(length, maps);
+    return private_f_string_maps_resize(length, structure);
   }
 #endif // _di_f_string_maps_resize_
 

diff --git a/level_0/f_string/c/string/maps.h b/level_0/f_string/c/string/maps.h
index c8dc1fdc3102b27e1248de9bf8b917a8112fc4c9..55e83c20156fa54a92bd0496c24bc0bd16056993 100644 (file)
--- a/level_0/f_string/c/string/maps.h
+++ b/level_0/f_string/c/string/maps.h
@@ -54,7 +54,7 @@ extern "C" {
  *
  * @param length
  *   The new size to use.
- * @param maps
+ * @param structure
  *   The string maps array to resize.
  *
  * @return
@@ -65,7 +65,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_string_maps_adjust_
-  extern f_status_t f_string_maps_adjust(const f_number_unsigned_t length, f_string_maps_t * const maps);
+  extern f_status_t f_string_maps_adjust(const f_number_unsigned_t length, f_string_maps_t * const structure);
 #endif // _di_f_string_maps_adjust_
 
 /**
@@ -118,7 +118,7 @@ extern "C" {
  *
  * @param amount
  *   A positive number representing how much to decimate the size by.
- * @param maps
+ * @param structure
  *   The string maps array to resize.
  *
  * @return
@@ -130,7 +130,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_string_maps_decimate_by_
-  extern f_status_t f_string_maps_decimate_by(const f_number_unsigned_t amount, f_string_maps_t * const maps);
+  extern f_status_t f_string_maps_decimate_by(const f_number_unsigned_t amount, f_string_maps_t * const structure);
 #endif // _di_f_string_maps_decimate_by_
 
 /**
@@ -142,7 +142,7 @@ extern "C" {
  *
  * @param amount
  *   A positive number representing how much to decrease the size by.
- * @param maps
+ * @param structure
  *   The string maps array to resize.
  *
  * @return
@@ -153,7 +153,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_string_maps_decrease_by_
-  extern f_status_t f_string_maps_decrease_by(const f_number_unsigned_t amount, f_string_maps_t * const maps);
+  extern f_status_t f_string_maps_decrease_by(const f_number_unsigned_t amount, f_string_maps_t * const structure);
 #endif // _di_f_string_maps_decrease_by_
 
 /**
@@ -165,7 +165,7 @@ extern "C" {
  * @param step
  *   The allocation step to use.
  *   Must be greater than 0.
- * @param maps
+ * @param structure
  *   The string maps array to resize.
  *
  * @return
@@ -178,7 +178,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_string_maps_increase_
-  extern f_status_t f_string_maps_increase(const f_number_unsigned_t step, f_string_maps_t * const maps);
+  extern f_status_t f_string_maps_increase(const f_number_unsigned_t step, f_string_maps_t * const structure);
 #endif // _di_f_string_maps_increase_
 
 /**
@@ -190,7 +190,7 @@ extern "C" {
  *
  * @param amount
  *   A positive number representing how much to increase the size by.
- * @param maps
+ * @param structure
  *   The string maps array to resize.
  *
  * @return
@@ -203,7 +203,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_string_maps_increase_by_
-  extern f_status_t f_string_maps_increase_by(const f_number_unsigned_t amount, f_string_maps_t * const maps);
+  extern f_status_t f_string_maps_increase_by(const f_number_unsigned_t amount, f_string_maps_t * const structure);
 #endif // _di_f_string_maps_increase_by_
 
 /**
@@ -211,7 +211,7 @@ extern "C" {
  *
  * @param length
  *   The new size to use.
- * @param maps
+ * @param structure
  *   The string maps array to adjust.
  *
  * @return
@@ -222,7 +222,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_string_maps_resize_
-  extern f_status_t f_string_maps_resize(const f_number_unsigned_t length, f_string_maps_t * const maps);
+  extern f_status_t f_string_maps_resize(const f_number_unsigned_t length, f_string_maps_t * const structure);
 #endif // _di_f_string_maps_resize_
 
 #ifdef __cplusplus

diff --git a/level_0/f_string/c/string/mapss.c b/level_0/f_string/c/string/mapss.c
index 6e86e6f52a093cbebeef43109425d4cf2dca913b..5df1e482c6917adbcf0f7d9c8b6e50bc43830a0e 100644 (file)
--- a/level_0/f_string/c/string/mapss.c
+++ b/level_0/f_string/c/string/mapss.c
@@ -8,12 +8,12 @@ extern "C" {
 #endif
 
 #ifndef _di_f_string_mapss_adjust_
-  f_status_t f_string_mapss_adjust(const f_number_unsigned_t length, f_string_mapss_t * const mapss) {
+  f_status_t f_string_mapss_adjust(const f_number_unsigned_t length, f_string_mapss_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!mapss) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    return private_f_string_mapss_adjust(length, mapss);
+    return private_f_string_mapss_adjust(length, structure);
   }
 #endif // _di_f_string_mapss_adjust_
 
@@ -75,45 +75,45 @@ extern "C" {
 #endif // _di_f_string_mapss_append_all_
 
 #ifndef _di_f_string_mapss_decimate_by_
-  f_status_t f_string_mapss_decimate_by(const f_number_unsigned_t amount, f_string_mapss_t * const mapss) {
+  f_status_t f_string_mapss_decimate_by(const f_number_unsigned_t amount, f_string_mapss_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!mapss) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
     if (!amount) return F_data_not;
 
-    return private_f_string_mapss_adjust((mapss->size > amount) ? mapss->size - amount : 0, mapss);
+    return private_f_string_mapss_adjust((structure->size > amount) ? structure->size - amount : 0, structure);
   }
 #endif // _di_f_string_mapss_decimate_by_
 
 #ifndef _di_f_string_mapss_decrease_by_
-  f_status_t f_string_mapss_decrease_by(const f_number_unsigned_t amount, f_string_mapss_t * const mapss) {
+  f_status_t f_string_mapss_decrease_by(const f_number_unsigned_t amount, f_string_mapss_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!mapss) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
     if (!amount) return F_data_not;
 
-    return private_f_string_mapss_resize((mapss->size > amount) ? mapss->size - amount : 0, mapss);
+    return private_f_string_mapss_resize((structure->size > amount) ? structure->size - amount : 0, structure);
   }
 #endif // _di_f_string_mapss_decrease_by_
 
 #ifndef _di_f_string_mapss_increase_
-  f_status_t f_string_mapss_increase(const f_number_unsigned_t step, f_string_mapss_t * const mapss) {
+  f_status_t f_string_mapss_increase(const f_number_unsigned_t step, f_string_mapss_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!mapss) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    if (step && mapss->used + 1 > mapss->size) {
-      f_number_unsigned_t length = mapss->used + step;
+    if (step && structure->used + 1 > structure->size) {
+      f_number_unsigned_t length = structure->used + step;
 
       if (length > F_number_t_size_unsigned_d) {
-        if (mapss->used + 1 > F_number_t_size_unsigned_d) return F_status_set_error(F_array_too_large);
+        if (structure->used + 1 > F_number_t_size_unsigned_d) return F_status_set_error(F_array_too_large);
 
         length = F_number_t_size_unsigned_d;
       }
 
-      return private_f_string_mapss_resize(length, mapss);
+      return private_f_string_mapss_resize(length, structure);
     }
 
     return F_data_not;
@@ -121,20 +121,20 @@ extern "C" {
 #endif // _di_f_string_mapss_increase_
 
 #ifndef _di_f_string_mapss_increase_by_
-  f_status_t f_string_mapss_increase_by(const f_number_unsigned_t amount, f_string_mapss_t * const mapss) {
+  f_status_t f_string_mapss_increase_by(const f_number_unsigned_t amount, f_string_mapss_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!mapss) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
     if (amount) {
-      if (mapss->used >= F_number_t_size_unsigned_d) return F_status_set_error(F_array_too_large);
+      if (structure->used >= F_number_t_size_unsigned_d) return F_status_set_error(F_array_too_large);
 
-      const f_number_unsigned_t length = mapss->used + amount;
+      const f_number_unsigned_t length = structure->used + amount;
 
-      if (length > mapss->size) {
+      if (length > structure->size) {
         if (length > F_number_t_size_unsigned_d) return F_status_set_error(F_array_too_large);
 
-        return private_f_string_mapss_resize(length, mapss);
+        return private_f_string_mapss_resize(length, structure);
       }
     }
 
@@ -143,12 +143,12 @@ extern "C" {
 #endif // _di_f_string_mapss_increase_by_
 
 #ifndef _di_f_string_mapss_resize_
-  f_status_t f_string_mapss_resize(const f_number_unsigned_t length, f_string_mapss_t * const mapss) {
+  f_status_t f_string_mapss_resize(const f_number_unsigned_t length, f_string_mapss_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!mapss) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    return private_f_string_mapss_resize(length, mapss);
+    return private_f_string_mapss_resize(length, structure);
   }
 #endif // _di_f_string_mapss_resize_
 

diff --git a/level_0/f_string/c/string/mapss.h b/level_0/f_string/c/string/mapss.h
index 563bf4722acfc7cd24d23042738b99013e4e930d..b086d0f9064982e00050bbeaef910695e7714d16 100644 (file)
--- a/level_0/f_string/c/string/mapss.h
+++ b/level_0/f_string/c/string/mapss.h
@@ -54,7 +54,7 @@ extern "C" {
  *
  * @param length
  *   The new size to use.
- * @param mapss
+ * @param structure
  *   The string mapss array to resize.
  *
  * @return
@@ -65,7 +65,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_string_mapss_adjust_
-  extern f_status_t f_string_mapss_adjust(const f_number_unsigned_t length, f_string_mapss_t * const mapss);
+  extern f_status_t f_string_mapss_adjust(const f_number_unsigned_t length, f_string_mapss_t * const structure);
 #endif // _di_f_string_mapss_adjust_
 
 /**
@@ -118,7 +118,7 @@ extern "C" {
  *
  * @param amount
  *   A positive number representing how much to decimate the size by.
- * @param mapss
+ * @param structure
  *   The string mapss array to resize.
  *
  * @return
@@ -130,7 +130,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_string_mapss_decimate_by_
-  extern f_status_t f_string_mapss_decimate_by(const f_number_unsigned_t amount, f_string_mapss_t * const mapss);
+  extern f_status_t f_string_mapss_decimate_by(const f_number_unsigned_t amount, f_string_mapss_t * const structure);
 #endif // _di_f_string_mapss_decimate_by_
 
 /**
@@ -142,7 +142,7 @@ extern "C" {
  *
  * @param amount
  *   A positive number representing how much to decrease the size by.
- * @param mapss
+ * @param structure
  *   The string mapss array to resize.
  *
  * @return
@@ -154,7 +154,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_string_mapss_decrease_by_
-  extern f_status_t f_string_mapss_decrease_by(const f_number_unsigned_t amount, f_string_mapss_t * const mapss);
+  extern f_status_t f_string_mapss_decrease_by(const f_number_unsigned_t amount, f_string_mapss_t * const structure);
 #endif // _di_f_string_mapss_decrease_by_
 
 /**
@@ -166,7 +166,7 @@ extern "C" {
  * @param step
  *   The allocation step to use.
  *   Must be greater than 0.
- * @param mapss
+ * @param structure
  *   The string mapss array to resize.
  *
  * @return
@@ -179,7 +179,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_string_mapss_increase_
-  extern f_status_t f_string_mapss_increase(const f_number_unsigned_t step, f_string_mapss_t * const mapss);
+  extern f_status_t f_string_mapss_increase(const f_number_unsigned_t step, f_string_mapss_t * const structure);
 #endif // _di_f_string_mapss_increase_
 
 /**
@@ -191,7 +191,7 @@ extern "C" {
  *
  * @param amount
  *   A positive number representing how much to increase the size by.
- * @param mapss
+ * @param structure
  *   The string mapss array to resize.
  *
  * @return
@@ -204,7 +204,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_string_mapss_increase_by_
-  extern f_status_t f_string_mapss_increase_by(const f_number_unsigned_t amount, f_string_mapss_t * const mapss);
+  extern f_status_t f_string_mapss_increase_by(const f_number_unsigned_t amount, f_string_mapss_t * const structure);
 #endif // _di_f_string_mapss_increase_by_
 
 /**
@@ -212,7 +212,7 @@ extern "C" {
  *
  * @param length
  *   The new size to use.
- * @param mapss
+ * @param structure
  *   The string mapss array to adjust.
  *
  * @return
@@ -223,7 +223,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_string_mapss_resize_
-  extern f_status_t f_string_mapss_resize(const f_number_unsigned_t length, f_string_mapss_t * const mapss);
+  extern f_status_t f_string_mapss_resize(const f_number_unsigned_t length, f_string_mapss_t * const structure);
 #endif // _di_f_string_mapss_resize_
 
 #ifdef __cplusplus

diff --git a/level_0/f_string/c/string/private-dynamics.c b/level_0/f_string/c/string/private-dynamics.c
index b6472f134e6f1846e8e96c81254c51a5953d8cba..b36949b3cdf939f986b848fe3e8fdbe67687686f 100644 (file)
--- a/level_0/f_string/c/string/private-dynamics.c
+++ b/level_0/f_string/c/string/private-dynamics.c
@@ -8,17 +8,17 @@ extern "C" {
 #endif
 
 #if !defined(_di_f_string_dynamics_adjust_) || !defined(_di_f_string_dynamics_append_) || !defined(_di_f_string_dynamics_decimate_by_) || !defined(_di_f_string_map_multis_adjust_) || !defined(_di_f_string_map_multis_append_)
-  f_status_t private_f_string_dynamics_adjust(const f_number_unsigned_t length, f_string_dynamics_t * const dynamics) {
+  f_status_t private_f_string_dynamics_adjust(const f_number_unsigned_t length, f_string_dynamics_t * const structure) {
 
     f_status_t status = F_none;
 
-    for (f_number_unsigned_t i = length; i < dynamics->size; ++i) {
+    for (f_number_unsigned_t i = length; i < structure->size; ++i) {
 
-      status = f_memory_array_adjust(0, sizeof(f_string_t), (void **) &dynamics->array[i].string, &dynamics->array[i].used, &dynamics->array[i].size);
+      status = f_memory_array_adjust(0, sizeof(f_string_t), (void **) &structure->array[i].string, &structure->array[i].used, &structure->array[i].size);
       if (F_status_is_error(status)) return status;
     } // for
 
-    return f_memory_array_adjust(length, sizeof(f_string_dynamic_t), (void **) &dynamics->array, &dynamics->used, &dynamics->size);
+    return f_memory_array_adjust(length, sizeof(f_string_dynamic_t), (void **) &structure->array, &structure->used, &structure->size);
   }
 #endif // !defined(_di_f_string_dynamics_adjust_) || !defined(_di_f_string_dynamics_append_) || !defined(_di_f_string_dynamics_decimate_by_) || !defined(_di_f_string_map_multis_adjust_) || !defined(_di_f_string_map_multis_append_)
 
@@ -70,17 +70,17 @@ extern "C" {
 #endif // !defined(_di_f_string_dynamics_append_all_) || !defined(_di_f_string_map_multis_append_) || !defined(_di_f_string_map_multis_append_all_)
 
 #if !defined(_di_f_string_dynamics_decrease_by_) || !defined(_di_f_string_dynamics_increase_) || !defined(_di_f_string_dynamics_increase_by_) || !defined(f_string_dynamics_resize) || !defined(_di_f_string_map_multis_append_) || !defined(_di_f_string_map_multis_append_all_) || !defined(_di_f_string_map_multis_decrease_by_) || !defined(_di_f_string_map_multis_increase_) || !defined(_di_f_string_map_multis_increase_by_) || !defined(_di_f_string_map_multis_resize_) || !defined(_di_f_string_map_multiss_append_) || !defined(_di_f_string_map_multiss_append_all_) || !defined(_di_f_string_map_multiss_decrease_by_) || !defined(_di_f_string_map_multiss_increase_) || !defined(_di_f_string_map_multiss_increase_by_)
-  f_status_t private_f_string_dynamics_resize(const f_number_unsigned_t length, f_string_dynamics_t * const dynamics) {
+  f_status_t private_f_string_dynamics_resize(const f_number_unsigned_t length, f_string_dynamics_t * const structure) {
 
     f_status_t status = F_none;
 
-    for (f_number_unsigned_t i = length; i < dynamics->size; ++i) {
+    for (f_number_unsigned_t i = length; i < structure->size; ++i) {
 
-      status = f_memory_array_resize(0, sizeof(f_string_t), (void **) &dynamics->array[i].string, &dynamics->array[i].used, &dynamics->array[i].size);
+      status = f_memory_array_resize(0, sizeof(f_string_t), (void **) &structure->array[i].string, &structure->array[i].used, &structure->array[i].size);
       if (F_status_is_error(status)) return status;
     } // for
 
-    return f_memory_array_resize(length, sizeof(f_string_dynamic_t), (void **) &dynamics->array, &dynamics->used, &dynamics->size);
+    return f_memory_array_resize(length, sizeof(f_string_dynamic_t), (void **) &structure->array, &structure->used, &structure->size);
   }
 #endif // !defined(_di_f_string_dynamics_decrease_by_) || !defined(_di_f_string_dynamics_increase_) || !defined(_di_f_string_dynamics_increase_by_) || !defined(f_string_dynamics_resize) || !defined(_di_f_string_map_multis_append_) || !defined(_di_f_string_map_multis_append_all_) || !defined(_di_f_string_map_multis_decrease_by_) || !defined(_di_f_string_map_multis_increase_) || !defined(_di_f_string_map_multis_increase_by_) || !defined(_di_f_string_map_multis_resize_) || !defined(_di_f_string_map_multiss_append_) || !defined(_di_f_string_map_multiss_append_all_) || !defined(_di_f_string_map_multiss_decrease_by_) || !defined(_di_f_string_map_multiss_increase_) || !defined(_di_f_string_map_multiss_increase_by_)
 

diff --git a/level_0/f_string/c/string/private-dynamics.h b/level_0/f_string/c/string/private-dynamics.h
index 611591ecc5f8c46abad17c6b7eb6b2e3b1a95825..c6ae012003e0a22a777ef6fb8b9c74378ed45bd7 100644 (file)
--- a/level_0/f_string/c/string/private-dynamics.h
+++ b/level_0/f_string/c/string/private-dynamics.h
@@ -22,7 +22,7 @@ extern "C" {
  *
  * @param length
  *   The new size to use.
- * @param dynamics
+ * @param structure
  *   The dynamics to adjust.
  *
  * @return
@@ -41,7 +41,7 @@ extern "C" {
  * @see f_string_map_multis_append()
  */
 #if !defined(_di_f_string_dynamics_adjust_) || !defined(_di_f_string_dynamics_append_) || !defined(_di_f_string_dynamics_decimate_by_) || !defined(_di_f_string_map_multis_adjust_) || !defined(_di_f_string_map_multis_append_)
-  extern f_status_t private_f_string_dynamics_adjust(const f_number_unsigned_t length, f_string_dynamics_t * const dynamics) F_attribute_visibility_internal_d;
+  extern f_status_t private_f_string_dynamics_adjust(const f_number_unsigned_t length, f_string_dynamics_t * const structure) F_attribute_visibility_internal_d;
 #endif // !defined(_di_f_string_dynamics_adjust_) || !defined(_di_f_string_dynamics_append_) || !defined(_di_f_string_dynamics_decimate_by_) || !defined(_di_f_string_map_multis_adjust_) || !defined(_di_f_string_map_multis_append_)
 
 /**
@@ -105,7 +105,7 @@ extern "C" {
  *
  * @param length
  *   The new size to use.
- * @param dynamics
+ * @param structure
  *   The dynamics to resize.
  *
  * @return
@@ -134,7 +134,7 @@ extern "C" {
  * @see f_string_map_multiss_increase_by()
  */
 #if !defined(_di_f_string_dynamics_decrease_by_) || !defined(_di_f_string_dynamics_increase_) || !defined(_di_f_string_dynamics_increase_by_) || !defined(f_string_dynamics_resize) || !defined(_di_f_string_map_multis_append_) || !defined(_di_f_string_map_multis_append_all_) || !defined(_di_f_string_map_multis_decrease_by_) || !defined(_di_f_string_map_multis_increase_) || !defined(_di_f_string_map_multis_increase_by_) || !defined(_di_f_string_map_multis_resize_) || !defined(_di_f_string_map_multiss_append_) || !defined(_di_f_string_map_multiss_append_all_) || !defined(_di_f_string_map_multiss_decrease_by_) || !defined(_di_f_string_map_multiss_increase_) || !defined(_di_f_string_map_multiss_increase_by_)
-  extern f_status_t private_f_string_dynamics_resize(const f_number_unsigned_t length, f_string_dynamics_t * const dynamics) F_attribute_visibility_internal_d;
+  extern f_status_t private_f_string_dynamics_resize(const f_number_unsigned_t length, f_string_dynamics_t * const structure) F_attribute_visibility_internal_d;
 #endif // !defined(_di_f_string_dynamics_decrease_by_) || !defined(_di_f_string_dynamics_increase_) || !defined(_di_f_string_dynamics_increase_by_) || !defined(f_string_dynamics_resize) || !defined(_di_f_string_map_multis_append_) || !defined(_di_f_string_map_multis_append_all_) || !defined(_di_f_string_map_multis_decrease_by_) || !defined(_di_f_string_map_multis_increase_) || !defined(_di_f_string_map_multis_increase_by_) || !defined(_di_f_string_map_multis_resize_) || !defined(_di_f_string_map_multiss_append_) || !defined(_di_f_string_map_multiss_append_all_) || !defined(_di_f_string_map_multiss_decrease_by_) || !defined(_di_f_string_map_multiss_increase_) || !defined(_di_f_string_map_multiss_increase_by_)
 
 #ifdef __cplusplus

diff --git a/level_0/f_string/c/string/private-dynamicss.c b/level_0/f_string/c/string/private-dynamicss.c
index 6c7cbd56c37708fe025c61da79a2dd51ad11656e..372539c1e6d0410d9dd4bf13aa675289d9aa8212 100644 (file)
--- a/level_0/f_string/c/string/private-dynamicss.c
+++ b/level_0/f_string/c/string/private-dynamicss.c
@@ -9,32 +9,32 @@ extern "C" {
 #endif
 
 #if !defined(_di_f_string_dynamicss_adjust_) || !defined(_di_f_string_dynamicss_append_) || !defined(_di_f_string_dynamicss_decimate_by_) || !defined(_di_f_string_map_multis_adjust_) || !defined(_di_f_string_map_multis_append_)
-  f_status_t private_f_string_dynamicss_adjust(const f_number_unsigned_t length, f_string_dynamicss_t * const dynamicss) {
+  f_status_t private_f_string_dynamicss_adjust(const f_number_unsigned_t length, f_string_dynamicss_t * const structure) {
 
     f_status_t status = F_none;
 
-    for (f_number_unsigned_t i = length; i < dynamicss->size; ++i) {
+    for (f_number_unsigned_t i = length; i < structure->size; ++i) {
 
-      status = private_f_string_dynamics_adjust(0, &dynamicss->array[i]);
+      status = private_f_string_dynamics_adjust(0, &structure->array[i]);
       if (F_status_is_error(status)) return status;
     } // for
 
-    return f_memory_array_adjust(length, sizeof(f_string_dynamics_t), (void **) &dynamicss->array, &dynamicss->used, &dynamicss->size);
+    return f_memory_array_adjust(length, sizeof(f_string_dynamics_t), (void **) &structure->array, &structure->used, &structure->size);
   }
 #endif // !defined(_di_f_string_dynamicss_adjust_) || !defined(_di_f_string_dynamicss_append_) || !defined(_di_f_string_dynamicss_decimate_by_) || !defined(_di_f_string_map_multis_adjust_) || !defined(_di_f_string_map_multis_append_)
 
 #if !defined(_di_f_string_dynamicss_decrease_by_) || !defined(_di_f_string_dynamicss_increase_) || !defined(_di_f_string_dynamicss_increase_by_) || !defined(_di_f_string_dynamicss_append_all_) || !defined(_di_f_string_map_multis_append_all_)
-  f_status_t private_f_string_dynamicss_resize(const f_number_unsigned_t length, f_string_dynamicss_t * const dynamicss) {
+  f_status_t private_f_string_dynamicss_resize(const f_number_unsigned_t length, f_string_dynamicss_t * const structure) {
 
     f_status_t status = F_none;
 
-    for (f_number_unsigned_t i = length; i < dynamicss->size; ++i) {
+    for (f_number_unsigned_t i = length; i < structure->size; ++i) {
 
-      status = private_f_string_dynamics_resize(0, &dynamicss->array[i]);
+      status = private_f_string_dynamics_resize(0, &structure->array[i]);
       if (F_status_is_error(status)) return status;
     } // for
 
-    return f_memory_array_resize(length, sizeof(f_string_dynamics_t), (void **) &dynamicss->array, &dynamicss->used, &dynamicss->size);
+    return f_memory_array_resize(length, sizeof(f_string_dynamics_t), (void **) &structure->array, &structure->used, &structure->size);
   }
 #endif // !defined(_di_f_string_dynamicss_decrease_by_) || !defined(_di_f_string_dynamicss_increase_) || !defined(_di_f_string_dynamicss_increase_by_) || !defined(_di_f_string_dynamicss_append_all_) || !defined(_di_f_string_map_multis_append_all_)
 

diff --git a/level_0/f_string/c/string/private-dynamicss.h b/level_0/f_string/c/string/private-dynamicss.h
index decf9eabb0e5c1acbb2f5330dd2778407619814d..882622fe2967897d74df37d397c3711d126c6a8d 100644 (file)
--- a/level_0/f_string/c/string/private-dynamicss.h
+++ b/level_0/f_string/c/string/private-dynamicss.h
@@ -22,7 +22,7 @@ extern "C" {
  *
  * @param length
  *   The new size to use.
- * @param dynamicss
+ * @param structure
  *   The dynamicss to adjust.
  *
  * @return
@@ -41,7 +41,7 @@ extern "C" {
  * @see f_string_map_multis_append()
  */
 #if !defined(_di_f_string_dynamicss_adjust_) || !defined(_di_f_string_dynamicss_append_) || !defined(_di_f_string_dynamicss_decimate_by_) || !defined(_di_f_string_map_multis_adjust_) || !defined(_di_f_string_map_multis_append_)
-  extern f_status_t private_f_string_dynamicss_adjust(const f_number_unsigned_t length, f_string_dynamicss_t * const dynamicss) F_attribute_visibility_internal_d;
+  extern f_status_t private_f_string_dynamicss_adjust(const f_number_unsigned_t length, f_string_dynamicss_t * const structure) F_attribute_visibility_internal_d;
 #endif // !defined(_di_f_string_dynamicss_adjust_) || !defined(_di_f_string_dynamicss_append_) || !defined(_di_f_string_dynamicss_decimate_by_) || !defined(_di_f_string_map_multis_adjust_) || !defined(_di_f_string_map_multis_append_)
 
 /**
@@ -51,7 +51,7 @@ extern "C" {
  *
  * @param length
  *   The new size to use.
- * @param dynamicss
+ * @param structure
  *   The dynamicss to resize.
  *
  * @return
@@ -70,7 +70,7 @@ extern "C" {
  * @see f_string_map_multis_append_all()
  */
 #if !defined(_di_f_string_dynamicss_decrease_by_) || !defined(_di_f_string_dynamicss_increase_) || !defined(_di_f_string_dynamicss_increase_by_) || !defined(_di_f_string_dynamicss_append_all_) || !defined(_di_f_string_map_multis_append_all_)
-  extern f_status_t private_f_string_dynamicss_resize(const f_number_unsigned_t length, f_string_dynamicss_t * const dynamicss) F_attribute_visibility_internal_d;
+  extern f_status_t private_f_string_dynamicss_resize(const f_number_unsigned_t length, f_string_dynamicss_t * const structure) F_attribute_visibility_internal_d;
 #endif // !defined(_di_f_string_dynamicss_decrease_by_) || !defined(_di_f_string_dynamicss_increase_) || !defined(_di_f_string_dynamicss_increase_by_) || !defined(_di_f_string_dynamicss_append_all_) || !defined(_di_f_string_map_multis_append_all_)
 
 #ifdef __cplusplus

diff --git a/level_0/f_string/c/string/private-map_multis.c b/level_0/f_string/c/string/private-map_multis.c
index 328ce65f97443a4a0d1040a511749cd8f471d7a8..8001b1b9ffec8f812128f45f69116ae8926cf301 100644 (file)
--- a/level_0/f_string/c/string/private-map_multis.c
+++ b/level_0/f_string/c/string/private-map_multis.c
@@ -9,20 +9,20 @@ extern "C" {
 #endif
 
 #if !defined(_di_f_string_map_multis_adjust_) || !defined(_di_f_string_map_multis_decimate_by_)
-  f_status_t private_f_string_map_multis_adjust(const f_number_unsigned_t length, f_string_map_multis_t * const map_multis) {
+  f_status_t private_f_string_map_multis_adjust(const f_number_unsigned_t length, f_string_map_multis_t * const structure) {
 
     f_status_t status = F_none;
 
-    for (f_number_unsigned_t i = length; i < map_multis->size; ++i) {
+    for (f_number_unsigned_t i = length; i < structure->size; ++i) {
 
-      status = f_memory_array_adjust(0, sizeof(f_string_t), (void **) &map_multis->array[i].name.string, &map_multis->array[i].name.used, &map_multis->array[i].name.size);
+      status = f_memory_array_adjust(0, sizeof(f_string_t), (void **) &structure->array[i].name.string, &structure->array[i].name.used, &structure->array[i].name.size);
       if (F_status_is_error(status)) return status;
 
-      status = private_f_string_dynamics_adjust(0, &map_multis->array[i].value);
+      status = private_f_string_dynamics_adjust(0, &structure->array[i].value);
       if (F_status_is_error(status)) return status;
     } // for
 
-    return f_memory_array_adjust(length, sizeof(f_string_map_multi_t), (void **) &map_multis->array, &map_multis->used, &map_multis->size);
+    return f_memory_array_adjust(length, sizeof(f_string_map_multi_t), (void **) &structure->array, &structure->used, &structure->size);
   }
 #endif // !defined(_di_f_string_map_multis_adjust_) || !defined(_di_f_string_map_multis_decimate_by_)
 
@@ -57,20 +57,20 @@ extern "C" {
 #endif // !defined(_di_f_string_map_multis_append_all_) || !defined(_di_f_string_map_multiss_append_) || !defined(_di_f_string_map_multiss_append_all_)
 
 #if !defined(_di_f_string_map_multis_append_) || !defined(_di_f_string_map_multis_append_all_) || !defined(_di_f_string_map_multis_decrease_by_) || !defined(_di_f_string_map_multis_increase_) || !defined(_di_f_string_map_multis_increase_by_) || !defined(_di_f_string_map_multis_resize_) || !defined(_di_f_string_map_multiss_append_) || !defined(_di_f_string_map_multiss_append_all_) || !defined(_di_f_string_map_multiss_decrease_by_) || !defined(_di_f_string_map_multiss_increase_) || !defined(_di_f_string_map_multiss_increase_by_)
-  f_status_t private_f_string_map_multis_resize(const f_number_unsigned_t length, f_string_map_multis_t * const map_multis) {
+  f_status_t private_f_string_map_multis_resize(const f_number_unsigned_t length, f_string_map_multis_t * const structure) {
 
     f_status_t status = F_none;
 
-    for (f_number_unsigned_t i = length; i < map_multis->size; ++i) {
+    for (f_number_unsigned_t i = length; i < structure->size; ++i) {
 
-      status = f_memory_array_resize(0, sizeof(f_string_t), (void **) &map_multis->array[i].name.string, &map_multis->array[i].name.used, &map_multis->array[i].name.size);
+      status = f_memory_array_resize(0, sizeof(f_string_t), (void **) &structure->array[i].name.string, &structure->array[i].name.used, &structure->array[i].name.size);
       if (F_status_is_error(status)) return status;
 
-      status = private_f_string_dynamics_resize(0, &map_multis->array[i].value);
+      status = private_f_string_dynamics_resize(0, &structure->array[i].value);
       if (F_status_is_error(status)) return status;
     } // for
 
-    return f_memory_array_resize(length, sizeof(f_string_map_multi_t), (void **) &map_multis->array, &map_multis->used, &map_multis->size);
+    return f_memory_array_resize(length, sizeof(f_string_map_multi_t), (void **) &structure->array, &structure->used, &structure->size);
   }
 #endif // !defined(_di_f_string_map_multis_append_) || !defined(_di_f_string_map_multis_append_all_) || !defined(_di_f_string_map_multis_decrease_by_) || !defined(_di_f_string_map_multis_increase_) || !defined(_di_f_string_map_multis_increase_by_) || !defined(_di_f_string_map_multis_resize_) || !defined(_di_f_string_map_multiss_append_) || !defined(_di_f_string_map_multiss_append_all_) || !defined(_di_f_string_map_multiss_decrease_by_) || !defined(_di_f_string_map_multiss_increase_) || !defined(_di_f_string_map_multiss_increase_by_)
 

diff --git a/level_0/f_string/c/string/private-map_multiss.c b/level_0/f_string/c/string/private-map_multiss.c
index e2d5afa157ef0680b5fd53914fb4e9ae746f22b9..b1fd1af3ec36ef28f0fc280bb549932c9e6c299b 100644 (file)
--- a/level_0/f_string/c/string/private-map_multiss.c
+++ b/level_0/f_string/c/string/private-map_multiss.c
@@ -10,32 +10,32 @@ extern "C" {
 #endif
 
 #if !defined(_di_f_string_map_multiss_adjust_) || !defined(_di_f_string_map_multiss_decimate_by_)
-  f_status_t private_f_string_map_multiss_adjust(const f_number_unsigned_t length, f_string_map_multiss_t * const map_multiss) {
+  f_status_t private_f_string_map_multiss_adjust(const f_number_unsigned_t length, f_string_map_multiss_t * const structure) {
 
     f_status_t status = F_none;
 
-    for (f_number_unsigned_t i = length; i < map_multiss->size; ++i) {
+    for (f_number_unsigned_t i = length; i < structure->size; ++i) {
 
-      status = private_f_string_map_multis_adjust(0, &map_multiss->array[i]);
+      status = private_f_string_map_multis_adjust(0, &structure->array[i]);
       if (F_status_is_error(status)) return status;
     } // for
 
-    return f_memory_array_adjust(length, sizeof(f_string_map_multis_t), (void **) &map_multiss->array, &map_multiss->used, &map_multiss->size);
+    return f_memory_array_adjust(length, sizeof(f_string_map_multis_t), (void **) &structure->array, &structure->used, &structure->size);
   }
 #endif // !defined(_di_f_string_map_multiss_adjust_) || !defined(_di_f_string_map_multiss_decimate_by_)
 
 #if !defined(_di_f_string_map_multiss_decrease_by_) || !defined(_di_f_string_map_multiss_increase_) || !defined(_di_f_string_map_multiss_increase_by_)
-  f_status_t private_f_string_map_multiss_resize(const f_number_unsigned_t length, f_string_map_multiss_t * const map_multiss) {
+  f_status_t private_f_string_map_multiss_resize(const f_number_unsigned_t length, f_string_map_multiss_t * const structure) {
 
     f_status_t status = F_none;
 
-    for (f_number_unsigned_t i = length; i < map_multiss->size; ++i) {
+    for (f_number_unsigned_t i = length; i < structure->size; ++i) {
 
-      status = private_f_string_map_multis_resize(0, &map_multiss->array[i]);
+      status = private_f_string_map_multis_resize(0, &structure->array[i]);
       if (F_status_is_error(status)) return status;
     } // for
 
-    return f_memory_array_resize(length, sizeof(f_string_map_multis_t), (void **) &map_multiss->array, &map_multiss->used, &map_multiss->size);
+    return f_memory_array_resize(length, sizeof(f_string_map_multis_t), (void **) &structure->array, &structure->used, &structure->size);
   }
 #endif // !defined(_di_f_string_map_multiss_decrease_by_) || !defined(_di_f_string_map_multiss_increase_) || !defined(_di_f_string_map_multiss_increase_by_)
 

diff --git a/level_0/f_string/c/string/private-map_multiss.h b/level_0/f_string/c/string/private-map_multiss.h
index 2cacd1b641c6eac9b84dc84c2e5057261a78d1e7..1f6dd6a215a18ac944c7c5fedab5ec9bcf90beca 100644 (file)
--- a/level_0/f_string/c/string/private-map_multiss.h
+++ b/level_0/f_string/c/string/private-map_multiss.h
@@ -22,7 +22,7 @@ extern "C" {
  *
  * @param length
  *   The new size to use.
- * @param map_multiss
+ * @param structure
  *   The map_multiss to adjust.
  *
  * @return
@@ -37,7 +37,7 @@ extern "C" {
  * @see f_string_map_multiss_adjust()
  */
 #if !defined(_di_f_string_map_multiss_adjust_) || !defined(_di_f_string_map_multiss_decimate_by_)
-  extern f_status_t private_f_string_map_multiss_adjust(const f_number_unsigned_t length, f_string_map_multiss_t * const map_multiss) F_attribute_visibility_internal_d;
+  extern f_status_t private_f_string_map_multiss_adjust(const f_number_unsigned_t length, f_string_map_multiss_t * const structure) F_attribute_visibility_internal_d;
 #endif // !defined(_di_f_string_map_multiss_adjust_) || !defined(_di_f_string_map_multiss_decimate_by_)
 
 /**
@@ -47,7 +47,7 @@ extern "C" {
  *
  * @param length
  *   The new size to use.
- * @param map_multiss
+ * @param structure
  *   The map_multiss to resize.
  *
  * @return
@@ -64,7 +64,7 @@ extern "C" {
  * @see f_string_map_multiss_increase_by()
  */
 #if !defined(_di_f_string_map_multiss_decrease_by_) || !defined(_di_f_string_map_multiss_increase_) || !defined(_di_f_string_map_multiss_increase_by_)
-  extern f_status_t private_f_string_map_multiss_resize(const f_number_unsigned_t length, f_string_map_multiss_t * const map_multiss) F_attribute_visibility_internal_d;
+  extern f_status_t private_f_string_map_multiss_resize(const f_number_unsigned_t length, f_string_map_multiss_t * const structure) F_attribute_visibility_internal_d;
 #endif // !defined(_di_f_string_map_multiss_decrease_by_) || !defined(_di_f_string_map_multiss_increase_) || !defined(_di_f_string_map_multiss_increase_by_)
 
 #ifdef __cplusplus

diff --git a/level_0/f_string/c/string/private-maps.c b/level_0/f_string/c/string/private-maps.c
index 86b54c926d02aec7d629bfaaac9bb8187bf9b4e5..f02f0d6fbe222e052070afee31a1843420222d44 100644 (file)
--- a/level_0/f_string/c/string/private-maps.c
+++ b/level_0/f_string/c/string/private-maps.c
@@ -8,20 +8,20 @@ extern "C" {
 #endif
 
 #if !defined(_di_f_string_maps_adjust_) || !defined(_di_f_string_maps_decimate_by_)
-  f_status_t private_f_string_maps_adjust(const f_number_unsigned_t length, f_string_maps_t * const maps) {
+  f_status_t private_f_string_maps_adjust(const f_number_unsigned_t length, f_string_maps_t * const structure) {
 
     f_status_t status = F_none;
 
-    for (f_number_unsigned_t i = length; i < maps->size; ++i) {
+    for (f_number_unsigned_t i = length; i < structure->size; ++i) {
 
-      status = f_memory_array_adjust(0, sizeof(f_string_t), (void **) &maps->array[i].name.string, &maps->array[i].name.used, &maps->array[i].name.size);
+      status = f_memory_array_adjust(0, sizeof(f_string_t), (void **) &structure->array[i].name.string, &structure->array[i].name.used, &structure->array[i].name.size);
       if (F_status_is_error(status)) return status;
 
-      status = f_memory_array_adjust(0, sizeof(f_string_t), (void **) &maps->array[i].value.string, &maps->array[i].value.used, &maps->array[i].value.size);
+      status = f_memory_array_adjust(0, sizeof(f_string_t), (void **) &structure->array[i].value.string, &structure->array[i].value.used, &structure->array[i].value.size);
       if (F_status_is_error(status)) return status;
     } // for
 
-    return f_memory_array_adjust(length, sizeof(f_string_map_t), (void **) &maps->array, &maps->used, &maps->size);
+    return f_memory_array_adjust(length, sizeof(f_string_map_t), (void **) &structure->array, &structure->used, &structure->size);
   }
 #endif // !defined(_di_f_string_maps_adjust_) || !defined(_di_f_string_maps_decimate_by_)
 
@@ -56,20 +56,20 @@ extern "C" {
 #endif // !defined(_di_f_string_maps_append_all_) || !defined(_di_f_string_mapss_append_) || !defined(_di_f_string_mapss_append_all_)
 
 #if !defined(_di_f_string_maps_append_) || !defined(_di_f_string_maps_append_all_) || !defined(_di_f_string_maps_decrease_by_) || !defined(_di_f_string_maps_increase_) || !defined(_di_f_string_maps_increase_by_) || !defined(_di_f_string_maps_resize_) || !defined(_di_f_string_mapss_append_) || !defined(_di_f_string_mapss_append_all_) || !defined(_di_f_string_mapss_decrease_by_) || !defined(_di_f_string_mapss_increase_) || !defined(_di_f_string_mapss_increase_by_)
-  f_status_t private_f_string_maps_resize(const f_number_unsigned_t length, f_string_maps_t * const maps) {
+  f_status_t private_f_string_maps_resize(const f_number_unsigned_t length, f_string_maps_t * const structure) {
 
     f_status_t status = F_none;
 
-    for (f_number_unsigned_t i = length; i < maps->size; ++i) {
+    for (f_number_unsigned_t i = length; i < structure->size; ++i) {
 
-      status = f_memory_array_resize(0, sizeof(f_string_t), (void **) &maps->array[i].name.string, &maps->array[i].name.used, &maps->array[i].name.size);
+      status = f_memory_array_resize(0, sizeof(f_string_t), (void **) &structure->array[i].name.string, &structure->array[i].name.used, &structure->array[i].name.size);
       if (F_status_is_error(status)) return status;
 
-      status = f_memory_array_resize(0, sizeof(f_string_t), (void **) &maps->array[i].value.string, &maps->array[i].value.used, &maps->array[i].value.size);
+      status = f_memory_array_resize(0, sizeof(f_string_t), (void **) &structure->array[i].value.string, &structure->array[i].value.used, &structure->array[i].value.size);
       if (F_status_is_error(status)) return status;
     } // for
 
-    return f_memory_array_resize(length, sizeof(f_string_map_t), (void **) &maps->array, &maps->used, &maps->size);
+    return f_memory_array_resize(length, sizeof(f_string_map_t), (void **) &structure->array, &structure->used, &structure->size);
   }
 #endif // !defined(_di_f_string_maps_append_) || !defined(_di_f_string_maps_append_all_) || !defined(_di_f_string_maps_decrease_by_) || !defined(_di_f_string_maps_increase_) || !defined(_di_f_string_maps_increase_by_) || !defined(_di_f_string_maps_resize_) || !defined(_di_f_string_mapss_append_) || !defined(_di_f_string_mapss_append_all_) || !defined(_di_f_string_mapss_decrease_by_) || !defined(_di_f_string_mapss_increase_) || !defined(_di_f_string_mapss_increase_by_)
 

diff --git a/level_0/f_string/c/string/private-maps.h b/level_0/f_string/c/string/private-maps.h
index ae0641293b652bdc9797e73cf3b7e098a7d161ec..91b01c1c406f2e55b40fe23f8010ca98044251a5 100644 (file)
--- a/level_0/f_string/c/string/private-maps.h
+++ b/level_0/f_string/c/string/private-maps.h
@@ -22,7 +22,7 @@ extern "C" {
  *
  * @param length
  *   The new size to use.
- * @param maps
+ * @param structure
  *   The maps to adjust.
  *
  * @return
@@ -37,7 +37,7 @@ extern "C" {
  * @see f_string_maps_adjust()
  */
 #if !defined(_di_f_string_maps_adjust_) || !defined(_di_f_string_maps_decimate_by_)
-  extern f_status_t private_f_string_maps_adjust(const f_number_unsigned_t length, f_string_maps_t * const maps) F_attribute_visibility_internal_d;
+  extern f_status_t private_f_string_maps_adjust(const f_number_unsigned_t length, f_string_maps_t * const structure) F_attribute_visibility_internal_d;
 #endif // !defined(_di_f_string_maps_adjust_) || !defined(_di_f_string_maps_decimate_by_)
 
 /**
@@ -74,7 +74,7 @@ extern "C" {
  *
  * @param length
  *   The new size to use.
- * @param maps
+ * @param structure
  *   The maps to resize.
  *
  * @return
@@ -98,7 +98,7 @@ extern "C" {
  * @see f_string_mapss_increase_by()
  */
 #if !defined(_di_f_string_maps_append_) || !defined(_di_f_string_maps_append_all_) || !defined(_di_f_string_maps_decrease_by_) || !defined(_di_f_string_maps_increase_) || !defined(_di_f_string_maps_increase_by_) || !defined(_di_f_string_maps_resize_) || !defined(_di_f_string_mapss_append_) || !defined(_di_f_string_mapss_append_all_) || !defined(_di_f_string_mapss_decrease_by_) || !defined(_di_f_string_mapss_increase_) || !defined(_di_f_string_mapss_increase_by_)
-  extern f_status_t private_f_string_maps_resize(const f_number_unsigned_t length, f_string_maps_t * const maps) F_attribute_visibility_internal_d;
+  extern f_status_t private_f_string_maps_resize(const f_number_unsigned_t length, f_string_maps_t * const structure) F_attribute_visibility_internal_d;
 #endif // !defined(_di_f_string_maps_append_) || !defined(_di_f_string_maps_append_all_) || !defined(_di_f_string_maps_decrease_by_) || !defined(_di_f_string_maps_increase_) || !defined(_di_f_string_maps_increase_by_) || !defined(_di_f_string_maps_resize_) || !defined(_di_f_string_mapss_append_) || !defined(_di_f_string_mapss_append_all_) || !defined(_di_f_string_mapss_decrease_by_) || !defined(_di_f_string_mapss_increase_) || !defined(_di_f_string_mapss_increase_by_)
 
 #ifdef __cplusplus

diff --git a/level_0/f_string/c/string/private-mapss.c b/level_0/f_string/c/string/private-mapss.c
index 961a1cc058e596fe389de822185a01e350ce2387..fb5a3c2cb491705db2730a60c8fadaa295106035 100644 (file)
--- a/level_0/f_string/c/string/private-mapss.c
+++ b/level_0/f_string/c/string/private-mapss.c
@@ -9,32 +9,32 @@ extern "C" {
 #endif
 
 #if !defined(_di_f_string_mapss_adjust_) || !defined(_di_f_string_mapss_decimate_by_)
-  f_status_t private_f_string_mapss_adjust(const f_number_unsigned_t length, f_string_mapss_t * const mapss) {
+  f_status_t private_f_string_mapss_adjust(const f_number_unsigned_t length, f_string_mapss_t * const structure) {
 
     f_status_t status = F_none;
 
-    for (f_number_unsigned_t i = length; i < mapss->size; ++i) {
+    for (f_number_unsigned_t i = length; i < structure->size; ++i) {
 
-      status = private_f_string_maps_adjust(0, &mapss->array[i]);
+      status = private_f_string_maps_adjust(0, &structure->array[i]);
       if (F_status_is_error(status)) return status;
     } // for
 
-    return f_memory_array_adjust(length, sizeof(f_string_maps_t), (void **) &mapss->array, &mapss->used, &mapss->size);
+    return f_memory_array_adjust(length, sizeof(f_string_maps_t), (void **) &structure->array, &structure->used, &structure->size);
   }
 #endif // !defined(_di_f_string_mapss_adjust_) || !defined(_di_f_string_mapss_decimate_by_)
 
 #if !defined(_di_f_string_mapss_decrease_by_) || !defined(_di_f_string_mapss_increase_) || !defined(_di_f_string_mapss_increase_by_)
-  f_status_t private_f_string_mapss_resize(const f_number_unsigned_t length, f_string_mapss_t * const mapss) {
+  f_status_t private_f_string_mapss_resize(const f_number_unsigned_t length, f_string_mapss_t * const structure) {
 
     f_status_t status = F_none;
 
-    for (f_number_unsigned_t i = length; i < mapss->size; ++i) {
+    for (f_number_unsigned_t i = length; i < structure->size; ++i) {
 
-      status = private_f_string_maps_resize(0, &mapss->array[i]);
+      status = private_f_string_maps_resize(0, &structure->array[i]);
       if (F_status_is_error(status)) return status;
     } // for
 
-    return f_memory_array_resize(length, sizeof(f_string_maps_t), (void **) &mapss->array, &mapss->used, &mapss->size);
+    return f_memory_array_resize(length, sizeof(f_string_maps_t), (void **) &structure->array, &structure->used, &structure->size);
   }
 #endif // !defined(_di_f_string_mapss_decrease_by_) || !defined(_di_f_string_mapss_increase_) || !defined(_di_f_string_mapss_increase_by_)
 

diff --git a/level_0/f_string/c/string/private-mapss.h b/level_0/f_string/c/string/private-mapss.h
index 95a247aab4f293afb8e29c1087135365d1897cd2..19116a569c7c8e998c1eccc781fb3c251737bf8d 100644 (file)
--- a/level_0/f_string/c/string/private-mapss.h
+++ b/level_0/f_string/c/string/private-mapss.h
@@ -22,8 +22,8 @@ extern "C" {
  *
  * @param length
  *   The new size to use.
- * @param mapss
- *   The mapss to adjust.
+ * @param structure
+ *   The structure to adjust.
  *
  * @return
  *   F_none on success.
@@ -37,7 +37,7 @@ extern "C" {
  * @see f_string_mapss_adjust()
  */
 #if !defined(_di_f_string_mapss_adjust_) || !defined(_di_f_string_mapss_decimate_by_)
-  extern f_status_t private_f_string_mapss_adjust(const f_number_unsigned_t length, f_string_mapss_t * const mapss) F_attribute_visibility_internal_d;
+  extern f_status_t private_f_string_mapss_adjust(const f_number_unsigned_t length, f_string_mapss_t * const structure) F_attribute_visibility_internal_d;
 #endif // !defined(_di_f_string_mapss_adjust_) || !defined(_di_f_string_mapss_decimate_by_)
 
 /**
@@ -47,8 +47,8 @@ extern "C" {
  *
  * @param length
  *   The new size to use.
- * @param mapss
- *   The mapss to resize.
+ * @param structure
+ *   The structure to resize.
  *
  * @return
  *   F_none on success.
@@ -64,7 +64,7 @@ extern "C" {
  * @see f_string_mapss_increase_by()
  */
 #if !defined(_di_f_string_mapss_decrease_by_) || !defined(_di_f_string_mapss_increase_) || !defined(_di_f_string_mapss_increase_by_)
-  extern f_status_t private_f_string_mapss_resize(const f_number_unsigned_t length, f_string_mapss_t * const mapss) F_attribute_visibility_internal_d;
+  extern f_status_t private_f_string_mapss_resize(const f_number_unsigned_t length, f_string_mapss_t * const structure) F_attribute_visibility_internal_d;
 #endif // !defined(_di_f_string_mapss_decrease_by_) || !defined(_di_f_string_mapss_increase_) || !defined(_di_f_string_mapss_increase_by_)
 
 #ifdef __cplusplus

diff --git a/level_0/f_string/c/string/private-quantityss.c b/level_0/f_string/c/string/private-quantityss.c
index 43e9648ab76ea7da269e450ad31f26782243c65e..4b0a944a6d23b279f8acd752e6812f0c4fc5aba4 100644 (file)
--- a/level_0/f_string/c/string/private-quantityss.c
+++ b/level_0/f_string/c/string/private-quantityss.c
@@ -8,32 +8,32 @@ extern "C" {
 #endif
 
 #if !defined(_di_f_string_quantityss_adjust_) || !defined(_di_f_string_quantityss_decimate_by_)
-  f_status_t private_f_string_quantityss_adjust(const f_number_unsigned_t length, f_string_quantityss_t * const quantityss) {
+  f_status_t private_f_string_quantityss_adjust(const f_number_unsigned_t length, f_string_quantityss_t * const structure) {
 
     f_status_t status = F_none;
 
-    for (f_number_unsigned_t i = length; i < quantityss->size; ++i) {
+    for (f_number_unsigned_t i = length; i < structure->size; ++i) {
 
-      status = f_memory_array_adjust(length, sizeof(f_string_quantitys_t), (void **) &quantityss->array[i].array, &quantityss->array[i].used, &quantityss->array[i].size);
+      status = f_memory_array_adjust(length, sizeof(f_string_quantitys_t), (void **) &structure->array[i].array, &structure->array[i].used, &structure->array[i].size);
       if (F_status_is_error(status)) return status;
     } // for
 
-    return f_memory_array_adjust(length, sizeof(f_string_quantitys_t), (void **) &quantityss->array, &quantityss->used, &quantityss->size);
+    return f_memory_array_adjust(length, sizeof(f_string_quantitys_t), (void **) &structure->array, &structure->used, &structure->size);
   }
 #endif // !defined(_di_f_string_quantityss_adjust_) || !defined(_di_f_string_quantityss_decimate_by_)
 
 #if !defined(_di_f_string_quantityss_decrease_by_) || !defined(_di_f_string_quantityss_increase_) || !defined(_di_f_string_quantityss_increase_by_)
-  f_status_t private_f_string_quantityss_resize(const f_number_unsigned_t length, f_string_quantityss_t * const quantityss) {
+  f_status_t private_f_string_quantityss_resize(const f_number_unsigned_t length, f_string_quantityss_t * const structure) {
 
     f_status_t status = F_none;
 
-    for (f_number_unsigned_t i = length; i < quantityss->size; ++i) {
+    for (f_number_unsigned_t i = length; i < structure->size; ++i) {
 
-      status = f_memory_array_resize(0, sizeof(f_string_quantity_t), (void **) &quantityss->array[i].array, &quantityss->array[i].used, &quantityss->array[i].size);
+      status = f_memory_array_resize(0, sizeof(f_string_quantity_t), (void **) &structure->array[i].array, &structure->array[i].used, &structure->array[i].size);
       if (F_status_is_error(status)) return status;
     } // for
 
-    return f_memory_array_resize(length, sizeof(f_string_quantitys_t), (void **) &quantityss->array, &quantityss->used, &quantityss->size);
+    return f_memory_array_resize(length, sizeof(f_string_quantitys_t), (void **) &structure->array, &structure->used, &structure->size);
   }
 #endif // !defined(_di_f_string_quantityss_decrease_by_) || !defined(_di_f_string_quantityss_increase_) || !defined(_di_f_string_quantityss_increase_by_)
 

diff --git a/level_0/f_string/c/string/private-quantityss.h b/level_0/f_string/c/string/private-quantityss.h
index 6900746495c71f846a3cb7f8a10267ce5be31880..d28eb4da7283d8491203396697bf259f8d35e4c5 100644 (file)
--- a/level_0/f_string/c/string/private-quantityss.h
+++ b/level_0/f_string/c/string/private-quantityss.h
@@ -22,8 +22,8 @@ extern "C" {
  *
  * @param length
  *   The new size to use.
- * @param quantityss
- *   The quantityss to adjust.
+ * @param structure
+ *   The structure to adjust.
  *
  * @return
  *   F_none on success.
@@ -37,7 +37,7 @@ extern "C" {
  * @see f_string_quantityss_adjust()
  */
 #if !defined(_di_f_string_quantityss_adjust_) || !defined(_di_f_string_quantityss_decimate_by_)
-  extern f_status_t private_f_string_quantityss_adjust(const f_number_unsigned_t length, f_string_quantityss_t * const quantityss) F_attribute_visibility_internal_d;
+  extern f_status_t private_f_string_quantityss_adjust(const f_number_unsigned_t length, f_string_quantityss_t * const structure) F_attribute_visibility_internal_d;
 #endif // !defined(_di_f_string_quantityss_adjust_) || !defined(_di_f_string_quantityss_decimate_by_)
 
 /**
@@ -47,8 +47,8 @@ extern "C" {
  *
  * @param length
  *   The new size to use.
- * @param quantityss
- *   The quantityss to resize.
+ * @param structure
+ *   The structure to resize.
  *
  * @return
  *   F_none on success.
@@ -64,7 +64,7 @@ extern "C" {
  * @see f_string_quantityss_increase_by()
  */
 #if !defined(_di_f_string_quantityss_decrease_by_) || !defined(_di_f_string_quantityss_increase_) || !defined(_di_f_string_quantityss_increase_by_)
-  extern f_status_t private_f_string_quantityss_resize(const f_number_unsigned_t length, f_string_quantityss_t * const quantityss) F_attribute_visibility_internal_d;
+  extern f_status_t private_f_string_quantityss_resize(const f_number_unsigned_t length, f_string_quantityss_t * const structure) F_attribute_visibility_internal_d;
 #endif // !defined(_di_f_string_quantityss_decrease_by_) || !defined(_di_f_string_quantityss_increase_) || !defined(_di_f_string_quantityss_increase_by_)
 
 #ifdef __cplusplus

diff --git a/level_0/f_string/c/string/private-rangess.c b/level_0/f_string/c/string/private-rangess.c
index 376f9270d21bff795c5f878ffabaac1327fc1208..9cb754c13786872ba8d1f6705b30f29e726222a1 100644 (file)
--- a/level_0/f_string/c/string/private-rangess.c
+++ b/level_0/f_string/c/string/private-rangess.c
@@ -8,32 +8,32 @@ extern "C" {
 #endif
 
 #if !defined(_di_f_string_rangess_adjust_) || !defined(_di_f_string_rangess_decimate_by_)
-  f_status_t private_f_string_rangess_adjust(const f_number_unsigned_t length, f_string_rangess_t * const rangess) {
+  f_status_t private_f_string_rangess_adjust(const f_number_unsigned_t length, f_string_rangess_t * const structure) {
 
     f_status_t status = F_none;
 
-    for (f_number_unsigned_t i = length; i < rangess->size; ++i) {
+    for (f_number_unsigned_t i = length; i < structure->size; ++i) {
 
-      status = f_memory_array_adjust(0, sizeof(f_string_range_t), (void **) &rangess->array[i].array, &rangess->array[i].used, &rangess->array[i].size);
+      status = f_memory_array_adjust(0, sizeof(f_string_range_t), (void **) &structure->array[i].array, &structure->array[i].used, &structure->array[i].size);
       if (F_status_is_error(status)) return status;
     } // for
 
-    return f_memory_array_adjust(length, sizeof(f_string_ranges_t), (void **) &rangess->array, &rangess->used, &rangess->size);
+    return f_memory_array_adjust(length, sizeof(f_string_ranges_t), (void **) &structure->array, &structure->used, &structure->size);
   }
 #endif // !defined(_di_f_string_rangess_adjust_) || !defined(_di_f_string_rangess_decimate_by_)
 
 #if !defined(_di_f_string_ranges_append_) || !defined(_di_f_string_ranges_append_all_) || !defined(_di_f_string_ranges_decrease_by_) || !defined(_di_f_string_ranges_increase_) || !defined(_di_f_string_ranges_increase_by_) || !defined(_di_f_string_ranges_resize_) || !defined(_di_f_string_rangess_append_) || !defined(_di_f_string_rangess_append_all_) || !defined(_di_f_string_rangess_decrease_by_) || !defined(_di_f_string_rangess_increase_) || !defined(_di_f_string_rangess_increase_by_)
-  f_status_t private_f_string_rangess_resize(const f_number_unsigned_t length, f_string_rangess_t * const rangess) {
+  f_status_t private_f_string_rangess_resize(const f_number_unsigned_t length, f_string_rangess_t * const structure) {
 
     f_status_t status = F_none;
 
-    for (f_number_unsigned_t i = length; i < rangess->size; ++i) {
+    for (f_number_unsigned_t i = length; i < structure->size; ++i) {
 
-      status = f_memory_array_resize(0, sizeof(f_string_range_t), (void **) &rangess->array[i].array, &rangess->array[i].used, &rangess->array[i].size);
+      status = f_memory_array_resize(0, sizeof(f_string_range_t), (void **) &structure->array[i].array, &structure->array[i].used, &structure->array[i].size);
       if (F_status_is_error(status)) return status;
     } // for
 
-    return f_memory_array_resize(length, sizeof(f_string_ranges_t), (void **) &rangess->array, &rangess->used, &rangess->size);
+    return f_memory_array_resize(length, sizeof(f_string_ranges_t), (void **) &structure->array, &structure->used, &structure->size);
   }
 #endif // !defined(_di_f_string_ranges_append_) || !defined(_di_f_string_ranges_append_all_) || !defined(_di_f_string_ranges_decrease_by_) || !defined(_di_f_string_ranges_increase_) || !defined(_di_f_string_ranges_increase_by_) || !defined(_di_f_string_ranges_resize_) || !defined(_di_f_string_rangess_append_) || !defined(_di_f_string_rangess_append_all_) || !defined(_di_f_string_rangess_decrease_by_) || !defined(_di_f_string_rangess_increase_) || !defined(_di_f_string_rangess_increase_by_)
 

diff --git a/level_0/f_string/c/string/private-rangess.h b/level_0/f_string/c/string/private-rangess.h
index a021035407b17dba2e3d93fb3cb21a5fbe39a28d..44868ef601b75832a8aca7e6be0d4ac76f0249e7 100644 (file)
--- a/level_0/f_string/c/string/private-rangess.h
+++ b/level_0/f_string/c/string/private-rangess.h
@@ -22,8 +22,8 @@ extern "C" {
  *
  * @param length
  *   The new size to use.
- * @param rangess
- *   The rangess to adjust.
+ * @param structure
+ *   The structure to adjust.
  *
  * @return
  *   F_none on success.
@@ -36,7 +36,7 @@ extern "C" {
  * @see f_string_rangess_adjust()
  */
 #if !defined(_di_f_string_rangess_adjust_) || !defined(_di_f_string_rangess_decimate_by_)
-  extern f_status_t private_f_string_rangess_adjust(const f_number_unsigned_t length, f_string_rangess_t * const rangess) F_attribute_visibility_internal_d;
+  extern f_status_t private_f_string_rangess_adjust(const f_number_unsigned_t length, f_string_rangess_t * const structure) F_attribute_visibility_internal_d;
 #endif // !defined(_di_f_string_rangess_adjust_) || !defined(_di_f_string_rangess_decimate_by_)
 
 /**
@@ -46,8 +46,8 @@ extern "C" {
  *
  * @param length
  *   The new size to use.
- * @param rangess
- *   The rangess to resize.
+ * @param structure
+ *   The structure to resize.
  *
  * @return
  *   F_none on success.
@@ -64,7 +64,7 @@ extern "C" {
  * @see f_string_rangess_increase_by()
  */
 #if !defined(_di_f_string_ranges_append_) || !defined(_di_f_string_ranges_append_all_) || !defined(_di_f_string_ranges_decrease_by_) || !defined(_di_f_string_ranges_increase_) || !defined(_di_f_string_ranges_increase_by_) || !defined(_di_f_string_ranges_resize_) || !defined(_di_f_string_rangess_append_) || !defined(_di_f_string_rangess_append_all_) || !defined(_di_f_string_rangess_decrease_by_) || !defined(_di_f_string_rangess_increase_) || !defined(_di_f_string_rangess_increase_by_)
-  extern f_status_t private_f_string_rangess_resize(const f_number_unsigned_t length, f_string_rangess_t * const rangess) F_attribute_visibility_internal_d;
+  extern f_status_t private_f_string_rangess_resize(const f_number_unsigned_t length, f_string_rangess_t * const structure) F_attribute_visibility_internal_d;
 #endif // !defined(_di_f_string_ranges_append_) || !defined(_di_f_string_ranges_append_all_) || !defined(_di_f_string_ranges_decrease_by_) || !defined(_di_f_string_ranges_increase_) || !defined(_di_f_string_ranges_increase_by_) || !defined(_di_f_string_ranges_resize_) || !defined(_di_f_string_rangess_append_) || !defined(_di_f_string_rangess_append_all_) || !defined(_di_f_string_rangess_decrease_by_) || !defined(_di_f_string_rangess_increase_) || !defined(_di_f_string_rangess_increase_by_)
 
 #ifdef __cplusplus

diff --git a/level_0/f_string/c/string/private-triples.c b/level_0/f_string/c/string/private-triples.c
index 6512048479bb6afff0b75d431d1064503c523433..8c764bcff1343da9147e3cd7502b61b6a2bdad98 100644 (file)
--- a/level_0/f_string/c/string/private-triples.c
+++ b/level_0/f_string/c/string/private-triples.c
@@ -8,23 +8,23 @@ extern "C" {
 #endif
 
 #if !defined(_di_f_string_triples_adjust_) || !defined(_di_f_string_triples_decimate_by_)
-  f_status_t private_f_string_triples_adjust(const f_number_unsigned_t length, f_string_triples_t * const triples) {
+  f_status_t private_f_string_triples_adjust(const f_number_unsigned_t length, f_string_triples_t * const structure) {
 
     f_status_t status = F_none;
 
-    for (f_number_unsigned_t i = length; i < triples->size; ++i) {
+    for (f_number_unsigned_t i = length; i < structure->size; ++i) {
 
-      status = f_memory_array_adjust(0, sizeof(f_string_triple_t), (void **) &triples->array[i].a.string, &triples->array[i].a.used, &triples->array[i].a.size);
+      status = f_memory_array_adjust(0, sizeof(f_string_triple_t), (void **) &structure->array[i].a.string, &structure->array[i].a.used, &structure->array[i].a.size);
       if (F_status_is_error(status)) return status;
 
-      status = f_memory_array_adjust(0, sizeof(f_string_triple_t), (void **) &triples->array[i].b.string, &triples->array[i].b.used, &triples->array[i].b.size);
+      status = f_memory_array_adjust(0, sizeof(f_string_triple_t), (void **) &structure->array[i].b.string, &structure->array[i].b.used, &structure->array[i].b.size);
       if (F_status_is_error(status)) return status;
 
-      status = f_memory_array_adjust(0, sizeof(f_string_triple_t), (void **) &triples->array[i].c.string, &triples->array[i].c.used, &triples->array[i].c.size);
+      status = f_memory_array_adjust(0, sizeof(f_string_triple_t), (void **) &structure->array[i].c.string, &structure->array[i].c.used, &structure->array[i].c.size);
       if (F_status_is_error(status)) return status;
     } // for
 
-    return f_memory_array_adjust(length, sizeof(f_string_triple_t), (void **) &triples->array, &triples->used, &triples->size);
+    return f_memory_array_adjust(length, sizeof(f_string_triple_t), (void **) &structure->array, &structure->used, &structure->size);
   }
 #endif // !defined(_di_f_string_triples_adjust_) || !defined(_di_f_string_triples_decimate_by_)
 
@@ -65,23 +65,23 @@ extern "C" {
 #endif // !defined(_di_f_string_triples_append_all_) || !defined(_di_f_string_tripless_append_) || !defined(_di_f_string_tripless_append_all_)
 
 #if !defined(_di_f_string_triples_decrease_by_) || !defined(_di_f_string_triples_increase_) || !defined(_di_f_string_triples_increase_by_)
-  f_status_t private_f_string_triples_resize(const f_number_unsigned_t length, f_string_triples_t * const triples) {
+  f_status_t private_f_string_triples_resize(const f_number_unsigned_t length, f_string_triples_t * const structure) {
 
     f_status_t status = F_none;
 
-    for (f_number_unsigned_t i = length; i < triples->size; ++i) {
+    for (f_number_unsigned_t i = length; i < structure->size; ++i) {
 
-      status = f_memory_array_resize(0, sizeof(f_string_triple_t), (void **) &triples->array[i].a.string, &triples->array[i].a.used, &triples->array[i].a.size);
+      status = f_memory_array_resize(0, sizeof(f_string_triple_t), (void **) &structure->array[i].a.string, &structure->array[i].a.used, &structure->array[i].a.size);
       if (F_status_is_error(status)) return status;
 
-      status = f_memory_array_resize(0, sizeof(f_string_triple_t), (void **) &triples->array[i].b.string, &triples->array[i].b.used, &triples->array[i].b.size);
+      status = f_memory_array_resize(0, sizeof(f_string_triple_t), (void **) &structure->array[i].b.string, &structure->array[i].b.used, &structure->array[i].b.size);
       if (F_status_is_error(status)) return status;
 
-      status = f_memory_array_resize(0, sizeof(f_string_triple_t), (void **) &triples->array[i].c.string, &triples->array[i].c.used, &triples->array[i].c.size);
+      status = f_memory_array_resize(0, sizeof(f_string_triple_t), (void **) &structure->array[i].c.string, &structure->array[i].c.used, &structure->array[i].c.size);
       if (F_status_is_error(status)) return status;
     } // for
 
-    return f_memory_array_resize(length, sizeof(f_string_triple_t), (void **) &triples->array, &triples->used, &triples->size);
+    return f_memory_array_resize(length, sizeof(f_string_triple_t), (void **) &structure->array, &structure->used, &structure->size);
   }
 #endif // !defined(_di_f_string_triples_decrease_by_) || !defined(_di_f_string_triples_increase_) || !defined(_di_f_string_triples_increase_by_)
 

diff --git a/level_0/f_string/c/string/private-triples.h b/level_0/f_string/c/string/private-triples.h
index fb553ac3063b47319b493f696561309cc7e4f1c5..739e02dbff0c07586a078bea84c31f571f81f3bd 100644 (file)
--- a/level_0/f_string/c/string/private-triples.h
+++ b/level_0/f_string/c/string/private-triples.h
@@ -22,7 +22,7 @@ extern "C" {
  *
  * @param length
  *   The new size to use.
- * @param triples
+ * @param structure
  *   The triples to adjust.
  *
  * @return
@@ -36,7 +36,7 @@ extern "C" {
  * @see f_string_triples_adjust()
  */
 #if !defined(_di_f_string_triples_adjust_) || !defined(_di_f_string_triples_decimate_by_)
-  extern f_status_t private_f_string_triples_adjust(const f_number_unsigned_t length, f_string_triples_t * const triples) F_attribute_visibility_internal_d;
+  extern f_status_t private_f_string_triples_adjust(const f_number_unsigned_t length, f_string_triples_t * const structure) F_attribute_visibility_internal_d;
 #endif // !defined(_di_f_string_triples_adjust_) || !defined(_di_f_string_triples_decimate_by_)
 
 /**
@@ -72,7 +72,7 @@ extern "C" {
  *
  * @param length
  *   The new size to use.
- * @param triples
+ * @param structure
  *   The triples to resize.
  *
  * @return
@@ -88,7 +88,7 @@ extern "C" {
  * @see f_string_triples_increase_by()
  */
 #if !defined(_di_f_string_triples_decrease_by_) || !defined(_di_f_string_triples_increase_) || !defined(_di_f_string_triples_increase_by_)
-  extern f_status_t private_f_string_triples_resize(const f_number_unsigned_t length, f_string_triples_t * const triples) F_attribute_visibility_internal_d;
+  extern f_status_t private_f_string_triples_resize(const f_number_unsigned_t length, f_string_triples_t * const structure) F_attribute_visibility_internal_d;
 #endif // !defined(_di_f_string_triples_decrease_by_) || !defined(_di_f_string_triples_increase_) || !defined(_di_f_string_triples_increase_by_)
 
 /**
@@ -98,7 +98,7 @@ extern "C" {
  *
  * @param length
  *   The new size to use.
- * @param tripless
+ * @param structure
  *   The tripless to adjust.
  *
  * @return
@@ -112,7 +112,7 @@ extern "C" {
  * @see f_string_tripless_adjust()
  */
 #if !defined(_di_f_string_tripless_adjust_) || !defined(_di_f_string_tripless_decimate_by_)
-  extern f_status_t private_f_string_tripless_adjust(const f_number_unsigned_t length, f_string_tripless_t * const tripless) F_attribute_visibility_internal_d;
+  extern f_status_t private_f_string_tripless_adjust(const f_number_unsigned_t length, f_string_tripless_t * const structure) F_attribute_visibility_internal_d;
 #endif // !defined(_di_f_string_tripless_adjust_) || !defined(_di_f_string_tripless_decimate_by_)
 
 /**
@@ -122,7 +122,7 @@ extern "C" {
  *
  * @param length
  *   The new size to use.
- * @param tripless
+ * @param structure
  *   The tripless to resize.
  *
  * @return
@@ -138,7 +138,7 @@ extern "C" {
  * @see f_string_tripless_increase_by()
  */
 #if !defined(_di_f_string_tripless_decrease_by_) || !defined(_di_f_string_tripless_increase_) || !defined(_di_f_string_tripless_increase_by_)
-  extern f_status_t private_f_string_tripless_resize(const f_number_unsigned_t length, f_string_tripless_t * const tripless) F_attribute_visibility_internal_d;
+  extern f_status_t private_f_string_tripless_resize(const f_number_unsigned_t length, f_string_tripless_t * const structure) F_attribute_visibility_internal_d;
 #endif // !defined(_di_f_string_tripless_decrease_by_) || !defined(_di_f_string_tripless_increase_) || !defined(_di_f_string_tripless_increase_by_)
 
 #ifdef __cplusplus

diff --git a/level_0/f_string/c/string/private-tripless.c b/level_0/f_string/c/string/private-tripless.c
index 24eca7339fd3e7983e75e3b7288569e8f6628f68..efbc39fefb3596bcbd536a423c588cc408c53165 100644 (file)
--- a/level_0/f_string/c/string/private-tripless.c
+++ b/level_0/f_string/c/string/private-tripless.c
@@ -9,32 +9,32 @@ extern "C" {
 #endif
 
 #if !defined(_di_f_string_tripless_adjust_) || !defined(_di_f_string_tripless_decimate_by_)
-  f_status_t private_f_string_tripless_adjust(const f_number_unsigned_t length, f_string_tripless_t * const tripless) {
+  f_status_t private_f_string_tripless_adjust(const f_number_unsigned_t length, f_string_tripless_t * const structure) {
 
     f_status_t status = F_none;
 
-    for (f_number_unsigned_t i = length; i < tripless->size; ++i) {
+    for (f_number_unsigned_t i = length; i < structure->size; ++i) {
 
-      status = private_f_string_triples_adjust(0, &tripless->array[i]);
+      status = private_f_string_triples_adjust(0, &structure->array[i]);
       if (F_status_is_error(status)) return status;
     } // for
 
-    return f_memory_array_adjust(length, sizeof(f_string_triples_t), (void **) &tripless->array, &tripless->used, &tripless->size);
+    return f_memory_array_adjust(length, sizeof(f_string_triples_t), (void **) &structure->array, &structure->used, &structure->size);
   }
 #endif // !defined(_di_f_string_tripless_adjust_) || !defined(_di_f_string_tripless_decimate_by_)
 
 #if !defined(_di_f_string_tripless_decrease_by_) || !defined(_di_f_string_tripless_increase_) || !defined(_di_f_string_tripless_increase_by_)
-  f_status_t private_f_string_tripless_resize(const f_number_unsigned_t length, f_string_tripless_t * const tripless) {
+  f_status_t private_f_string_tripless_resize(const f_number_unsigned_t length, f_string_tripless_t * const structure) {
 
     f_status_t status = F_none;
 
-    for (f_number_unsigned_t i = length; i < tripless->size; ++i) {
+    for (f_number_unsigned_t i = length; i < structure->size; ++i) {
 
-      status = private_f_string_triples_resize(0, &tripless->array[i]);
+      status = private_f_string_triples_resize(0, &structure->array[i]);
       if (F_status_is_error(status)) return status;
     } // for
 
-    return f_memory_array_resize(length, sizeof(f_string_triples_t), (void **) &tripless->array, &tripless->used, &tripless->size);
+    return f_memory_array_resize(length, sizeof(f_string_triples_t), (void **) &structure->array, &structure->used, &structure->size);
   }
 #endif // !defined(_di_f_string_tripless_decrease_by_) || !defined(_di_f_string_tripless_increase_) || !defined(_di_f_string_tripless_increase_by_)
 

diff --git a/level_0/f_string/c/string/private-tripless.h b/level_0/f_string/c/string/private-tripless.h
index 7b1a28b43641de8da00e50b075492f1df98fd994..44bf4d4ad9027e258f4286801af8ee5be04e6644 100644 (file)
--- a/level_0/f_string/c/string/private-tripless.h
+++ b/level_0/f_string/c/string/private-tripless.h
@@ -22,7 +22,7 @@ extern "C" {
  *
  * @param length
  *   The new size to use.
- * @param tripless
+ * @param structure
  *   The tripless to adjust.
  *
  * @return
@@ -36,7 +36,7 @@ extern "C" {
  * @see f_string_tripless_adjust()
  */
 #if !defined(_di_f_string_tripless_adjust_) || !defined(_di_f_string_tripless_decimate_by_)
-  extern f_status_t private_f_string_tripless_adjust(const f_number_unsigned_t length, f_string_tripless_t * const tripless) F_attribute_visibility_internal_d;
+  extern f_status_t private_f_string_tripless_adjust(const f_number_unsigned_t length, f_string_tripless_t * const structure) F_attribute_visibility_internal_d;
 #endif // !defined(_di_f_string_tripless_adjust_) || !defined(_di_f_string_tripless_decimate_by_)
 
 /**
@@ -46,7 +46,7 @@ extern "C" {
  *
  * @param length
  *   The new size to use.
- * @param tripless
+ * @param structure
  *   The tripless to resize.
  *
  * @return
@@ -62,7 +62,7 @@ extern "C" {
  * @see f_string_tripless_increase_by()
  */
 #if !defined(_di_f_string_tripless_decrease_by_) || !defined(_di_f_string_tripless_increase_) || !defined(_di_f_string_tripless_increase_by_)
-  extern f_status_t private_f_string_tripless_resize(const f_number_unsigned_t length, f_string_tripless_t * const tripless) F_attribute_visibility_internal_d;
+  extern f_status_t private_f_string_tripless_resize(const f_number_unsigned_t length, f_string_tripless_t * const structure) F_attribute_visibility_internal_d;
 #endif // !defined(_di_f_string_tripless_decrease_by_) || !defined(_di_f_string_tripless_increase_) || !defined(_di_f_string_tripless_increase_by_)
 
 #ifdef __cplusplus

diff --git a/level_0/f_string/c/string/quantitys.c b/level_0/f_string/c/string/quantitys.c
index d1403ee76c9d46cd466f6fa783b3a0cb6aaced20..ef8d6aed8f9a7d69c80694fac1ddc32e0ea3cf7c 100644 (file)
--- a/level_0/f_string/c/string/quantitys.c
+++ b/level_0/f_string/c/string/quantitys.c
@@ -7,12 +7,12 @@ extern "C" {
 #endif
 
 #ifndef _di_f_string_quantitys_adjust_
-  f_status_t f_string_quantitys_adjust(const f_number_unsigned_t length, f_string_quantitys_t * const quantitys) {
+  f_status_t f_string_quantitys_adjust(const f_number_unsigned_t length, f_string_quantitys_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!quantitys) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    return f_memory_array_adjust(length, sizeof(f_string_quantity_t), (void **) &quantitys->array, &quantitys->used, &quantitys->size);
+    return f_memory_array_adjust(length, sizeof(f_string_quantity_t), (void **) &structure->array, &structure->used, &structure->size);
   }
 #endif // _di_f_string_quantitys_adjust_
 
@@ -47,53 +47,53 @@ extern "C" {
 #endif // _di_f_string_quantitys_append_all_
 
 #ifndef _di_f_string_quantitys_decimate_by_
-  f_status_t f_string_quantitys_decimate_by(const f_number_unsigned_t amount, f_string_quantitys_t * const quantitys) {
+  f_status_t f_string_quantitys_decimate_by(const f_number_unsigned_t amount, f_string_quantitys_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!quantitys) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    return f_memory_array_decimate_by(amount, sizeof(f_string_quantity_t), (void **) &quantitys->array, &quantitys->used, &quantitys->size);
+    return f_memory_array_decimate_by(amount, sizeof(f_string_quantity_t), (void **) &structure->array, &structure->used, &structure->size);
   }
 #endif // _di_f_string_quantitys_decimate_by_
 
 #ifndef _di_f_string_quantitys_decrease_by_
-  f_status_t f_string_quantitys_decrease_by(const f_number_unsigned_t amount, f_string_quantitys_t * const quantitys) {
+  f_status_t f_string_quantitys_decrease_by(const f_number_unsigned_t amount, f_string_quantitys_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!quantitys) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
 
-    return f_memory_array_decrease_by(amount, sizeof(f_string_quantity_t), (void **) &quantitys->array, &quantitys->used, &quantitys->size);
+    return f_memory_array_decrease_by(amount, sizeof(f_string_quantity_t), (void **) &structure->array, &structure->used, &structure->size);
   }
 #endif // _di_f_string_quantitys_decrease_by_
 
 #ifndef _di_f_string_quantitys_increase_
-  f_status_t f_string_quantitys_increase(const f_number_unsigned_t step, f_string_quantitys_t * const quantitys) {
+  f_status_t f_string_quantitys_increase(const f_number_unsigned_t step, f_string_quantitys_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!quantitys) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    return f_memory_array_increase(step, sizeof(f_string_quantity_t), (void **) &quantitys->array, &quantitys->used, &quantitys->size);
+    return f_memory_array_increase(step, sizeof(f_string_quantity_t), (void **) &structure->array, &structure->used, &structure->size);
   }
 #endif // _di_f_string_quantitys_increase_
 
 #ifndef _di_f_string_quantitys_increase_by_
-  f_status_t f_string_quantitys_increase_by(const f_number_unsigned_t amount, f_string_quantitys_t * const quantitys) {
+  f_status_t f_string_quantitys_increase_by(const f_number_unsigned_t amount, f_string_quantitys_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!quantitys) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    return f_memory_array_increase_by(amount, sizeof(f_string_quantity_t), (void **) &quantitys->array, &quantitys->used, &quantitys->size);
+    return f_memory_array_increase_by(amount, sizeof(f_string_quantity_t), (void **) &structure->array, &structure->used, &structure->size);
   }
 #endif // _di_f_string_quantitys_increase_by_
 
 #ifndef _di_f_string_quantitys_resize_
-  f_status_t f_string_quantitys_resize(const f_number_unsigned_t length, f_string_quantitys_t * const quantitys) {
+  f_status_t f_string_quantitys_resize(const f_number_unsigned_t length, f_string_quantitys_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!quantitys) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    return f_memory_array_resize(length, sizeof(f_string_quantity_t), (void **) &quantitys->array, &quantitys->used, &quantitys->size);
+    return f_memory_array_resize(length, sizeof(f_string_quantity_t), (void **) &structure->array, &structure->used, &structure->size);
   }
 #endif // _di_f_string_quantitys_resize_
 

diff --git a/level_0/f_string/c/string/quantitys.h b/level_0/f_string/c/string/quantitys.h
index d717b7232aac4c5dcdf4a15b9d80ca83a18d2ed5..ceed908304a024eff1bfaee86a8463409a9f1c75 100644 (file)
--- a/level_0/f_string/c/string/quantitys.h
+++ b/level_0/f_string/c/string/quantitys.h
@@ -54,7 +54,7 @@ extern "C" {
  *
  * @param length
  *   The new size to use.
- * @param quantitys
+ * @param structure
  *   The string quantitys array to resize.
  *
  * @return
@@ -65,7 +65,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_string_quantitys_adjust_
-  extern f_status_t f_string_quantitys_adjust(const f_number_unsigned_t length, f_string_quantitys_t * const quantitys);
+  extern f_status_t f_string_quantitys_adjust(const f_number_unsigned_t length, f_string_quantitys_t * const structure);
 #endif // _di_f_string_quantitys_adjust_
 
 /**
@@ -117,7 +117,7 @@ extern "C" {
  *
  * @param amount
  *   A positive number representing how much to decimate the size by.
- * @param quantitys
+ * @param structure
  *   The string quantitys array to resize.
  *
  * @return
@@ -129,7 +129,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_string_quantitys_decimate_by_
-  extern f_status_t f_string_quantitys_decimate_by(const f_number_unsigned_t amount, f_string_quantitys_t * const quantitys);
+  extern f_status_t f_string_quantitys_decimate_by(const f_number_unsigned_t amount, f_string_quantitys_t * const structure);
 #endif // _di_f_string_quantitys_decimate_by_
 
 /**
@@ -141,7 +141,7 @@ extern "C" {
  *
  * @param amount
  *   A positive number representing how much to decrease the size by.
- * @param quantitys
+ * @param structure
  *   The string quantitys array to resize.
  *
  * @return
@@ -152,7 +152,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_string_quantitys_decrease_by_
-  extern f_status_t f_string_quantitys_decrease_by(const f_number_unsigned_t amount, f_string_quantitys_t * const quantitys);
+  extern f_status_t f_string_quantitys_decrease_by(const f_number_unsigned_t amount, f_string_quantitys_t * const structure);
 #endif // _di_f_string_quantitys_decrease_by_
 
 /**
@@ -164,7 +164,7 @@ extern "C" {
  * @param step
  *   The allocation step to use.
  *   Must be greater than 0.
- * @param quantitys
+ * @param structure
  *   The string quantitys array to resize.
  *
  * @return
@@ -176,7 +176,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_string_quantitys_increase_
-  extern f_status_t f_string_quantitys_increase(const f_number_unsigned_t step, f_string_quantitys_t * const quantitys);
+  extern f_status_t f_string_quantitys_increase(const f_number_unsigned_t step, f_string_quantitys_t * const structure);
 #endif // _di_f_string_quantitys_increase_
 
 /**
@@ -188,7 +188,7 @@ extern "C" {
  *
  * @param amount
  *   A positive number representing how much to increase the size by.
- * @param quantitys
+ * @param structure
  *   The string quantitys array to resize.
  *
  * @return
@@ -200,7 +200,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_string_quantitys_increase_by_
-  extern f_status_t f_string_quantitys_increase_by(const f_number_unsigned_t amount, f_string_quantitys_t * const quantitys);
+  extern f_status_t f_string_quantitys_increase_by(const f_number_unsigned_t amount, f_string_quantitys_t * const structure);
 #endif // _di_f_string_quantitys_increase_by_
 
 /**
@@ -208,7 +208,7 @@ extern "C" {
  *
  * @param length
  *   The new size to use.
- * @param quantitys
+ * @param structure
  *   The string quantitys array to adjust.
  *
  * @return
@@ -219,7 +219,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_string_quantitys_resize_
-  extern f_status_t f_string_quantitys_resize(const f_number_unsigned_t length, f_string_quantitys_t * const quantitys);
+  extern f_status_t f_string_quantitys_resize(const f_number_unsigned_t length, f_string_quantitys_t * const structure);
 #endif // _di_f_string_quantitys_resize_
 
 #ifdef __cplusplus

diff --git a/level_0/f_string/c/string/quantityss.c b/level_0/f_string/c/string/quantityss.c
index 733efe75bf9d6fdbc3a785e9fc9b20e4e34246f8..c03b7d11360c45fe9c8b95609c147d259f52c136 100644 (file)
--- a/level_0/f_string/c/string/quantityss.c
+++ b/level_0/f_string/c/string/quantityss.c
@@ -8,12 +8,12 @@ extern "C" {
 #endif
 
 #ifndef _di_f_string_quantityss_adjust_
-  f_status_t f_string_quantityss_adjust(const f_number_unsigned_t length, f_string_quantityss_t * const quantityss) {
+  f_status_t f_string_quantityss_adjust(const f_number_unsigned_t length, f_string_quantityss_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!quantityss) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    return private_f_string_quantityss_adjust(length, quantityss);
+    return private_f_string_quantityss_adjust(length, structure);
   }
 #endif // _di_f_string_quantityss_adjust_
 
@@ -75,45 +75,45 @@ extern "C" {
 #endif // _di_f_string_quantityss_append_all_
 
 #ifndef _di_f_string_quantityss_decimate_by_
-  f_status_t f_string_quantityss_decimate_by(const f_number_unsigned_t amount, f_string_quantityss_t * const quantityss) {
+  f_status_t f_string_quantityss_decimate_by(const f_number_unsigned_t amount, f_string_quantityss_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!quantityss) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
     if (!amount) return F_data_not;
 
-    return private_f_string_quantityss_adjust((quantityss->size > amount) ? quantityss->size - amount : 0, quantityss);
+    return private_f_string_quantityss_adjust((structure->size > amount) ? structure->size - amount : 0, structure);
   }
 #endif // _di_f_string_quantityss_decimate_by_
 
 #ifndef _di_f_string_quantityss_decrease_by_
-  f_status_t f_string_quantityss_decrease_by(const f_number_unsigned_t amount, f_string_quantityss_t * const quantityss) {
+  f_status_t f_string_quantityss_decrease_by(const f_number_unsigned_t amount, f_string_quantityss_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!quantityss) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
     if (!amount) return F_data_not;
 
-    return private_f_string_quantityss_resize((quantityss->size > amount) ? quantityss->size - amount : 0, quantityss);
+    return private_f_string_quantityss_resize((structure->size > amount) ? structure->size - amount : 0, structure);
   }
 #endif // _di_f_string_quantityss_decrease_by_
 
 #ifndef _di_f_string_quantityss_increase_
-  f_status_t f_string_quantityss_increase(const f_number_unsigned_t step, f_string_quantityss_t * const quantityss) {
+  f_status_t f_string_quantityss_increase(const f_number_unsigned_t step, f_string_quantityss_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!quantityss) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    if (step && quantityss->used + 1 > quantityss->size) {
-      f_number_unsigned_t length = quantityss->used + step;
+    if (step && structure->used + 1 > structure->size) {
+      f_number_unsigned_t length = structure->used + step;
 
       if (length > F_number_t_size_unsigned_d) {
-        if (quantityss->used + 1 > F_number_t_size_unsigned_d) return F_status_set_error(F_array_too_large);
+        if (structure->used + 1 > F_number_t_size_unsigned_d) return F_status_set_error(F_array_too_large);
 
         length = F_number_t_size_unsigned_d;
       }
 
-      return private_f_string_quantityss_resize(length, quantityss);
+      return private_f_string_quantityss_resize(length, structure);
     }
 
     return F_data_not;
@@ -121,20 +121,20 @@ extern "C" {
 #endif // _di_f_string_quantityss_increase_
 
 #ifndef _di_f_string_quantityss_increase_by_
-  f_status_t f_string_quantityss_increase_by(const f_number_unsigned_t amount, f_string_quantityss_t * const quantityss) {
+  f_status_t f_string_quantityss_increase_by(const f_number_unsigned_t amount, f_string_quantityss_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!quantityss) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
     if (amount) {
-      if (quantityss->used >= F_number_t_size_unsigned_d) return F_status_set_error(F_array_too_large);
+      if (structure->used >= F_number_t_size_unsigned_d) return F_status_set_error(F_array_too_large);
 
-      const f_number_unsigned_t length = quantityss->used + amount;
+      const f_number_unsigned_t length = structure->used + amount;
 
-      if (length > quantityss->size) {
+      if (length > structure->size) {
         if (length > F_number_t_size_unsigned_d) return F_status_set_error(F_array_too_large);
 
-        return private_f_string_quantityss_resize(length, quantityss);
+        return private_f_string_quantityss_resize(length, structure);
       }
     }
 
@@ -143,12 +143,12 @@ extern "C" {
 #endif // _di_f_string_quantityss_increase_by_
 
 #ifndef _di_f_string_quantityss_resize_
-  f_status_t f_string_quantityss_resize(const f_number_unsigned_t length, f_string_quantityss_t * const quantityss) {
+  f_status_t f_string_quantityss_resize(const f_number_unsigned_t length, f_string_quantityss_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!quantityss) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    return private_f_string_quantityss_resize(length, quantityss);
+    return private_f_string_quantityss_resize(length, structure);
   }
 #endif // _di_f_string_quantityss_resize_
 

diff --git a/level_0/f_string/c/string/quantityss.h b/level_0/f_string/c/string/quantityss.h
index bbac71a55ec888aa17e644061f11ec3f0c899d9b..6467c2ca3ce7a5812a7773c218d15b33bcfe6ace 100644 (file)
--- a/level_0/f_string/c/string/quantityss.h
+++ b/level_0/f_string/c/string/quantityss.h
@@ -56,7 +56,7 @@ extern "C" {
  *
  * @param length
  *   The new size to use.
- * @param quantityss
+ * @param structure
  *   The string quantityss array to resize.
  *
  * @return
@@ -67,7 +67,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_string_quantityss_adjust_
-  extern f_status_t f_string_quantityss_adjust(const f_number_unsigned_t length, f_string_quantityss_t * const quantityss);
+  extern f_status_t f_string_quantityss_adjust(const f_number_unsigned_t length, f_string_quantityss_t * const structure);
 #endif // _di_f_string_quantityss_adjust_
 
 /**
@@ -119,7 +119,7 @@ extern "C" {
  *
  * @param amount
  *   A positive number representing how much to decimate the size by.
- * @param quantityss
+ * @param structure
  *   The string quantityss array to resize.
  *
  * @return
@@ -131,7 +131,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_string_quantityss_decimate_by_
-  extern f_status_t f_string_quantityss_decimate_by(const f_number_unsigned_t amount, f_string_quantityss_t * const quantityss);
+  extern f_status_t f_string_quantityss_decimate_by(const f_number_unsigned_t amount, f_string_quantityss_t * const structure);
 #endif // _di_f_string_quantityss_decimate_by_
 
 /**
@@ -143,7 +143,7 @@ extern "C" {
  *
  * @param amount
  *   A positive number representing how much to decrease the size by.
- * @param quantityss
+ * @param structure
  *   The string quantityss array to resize.
  *
  * @return
@@ -154,7 +154,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_string_quantityss_decrease_by_
-  extern f_status_t f_string_quantityss_decrease_by(const f_number_unsigned_t amount, f_string_quantityss_t * const quantityss);
+  extern f_status_t f_string_quantityss_decrease_by(const f_number_unsigned_t amount, f_string_quantityss_t * const structure);
 #endif // _di_f_string_quantityss_decrease_by_
 
 /**
@@ -166,7 +166,7 @@ extern "C" {
  * @param step
  *   The allocation step to use.
  *   Must be greater than 0.
- * @param quantityss
+ * @param structure
  *   The string quantityss array to resize.
  *
  * @return
@@ -179,7 +179,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_string_quantityss_increase_
-  extern f_status_t f_string_quantityss_increase(const f_number_unsigned_t step, f_string_quantityss_t * const quantityss);
+  extern f_status_t f_string_quantityss_increase(const f_number_unsigned_t step, f_string_quantityss_t * const structure);
 #endif // _di_f_string_quantityss_increase_
 
 /**
@@ -191,7 +191,7 @@ extern "C" {
  *
  * @param amount
  *   A positive number representing how much to increase the size by.
- * @param quantityss
+ * @param structure
  *   The string quantityss array to resize.
  *
  * @return
@@ -204,7 +204,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_string_quantityss_increase_by_
-  extern f_status_t f_string_quantityss_increase_by(const f_number_unsigned_t amount, f_string_quantityss_t * const quantityss);
+  extern f_status_t f_string_quantityss_increase_by(const f_number_unsigned_t amount, f_string_quantityss_t * const structure);
 #endif // _di_f_string_quantityss_increase_by_
 
 /**
@@ -212,7 +212,7 @@ extern "C" {
  *
  * @param length
  *   The new size to use.
- * @param quantityss
+ * @param structure
  *   The string quantityss array to adjust.
  *
  * @return
@@ -223,7 +223,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_string_quantityss_resize_
-  extern f_status_t f_string_quantityss_resize(const f_number_unsigned_t length, f_string_quantityss_t * const quantityss);
+  extern f_status_t f_string_quantityss_resize(const f_number_unsigned_t length, f_string_quantityss_t * const structure);
 #endif // _di_f_string_quantityss_resize_
 
 #ifdef __cplusplus

diff --git a/level_0/f_string/c/string/ranges.c b/level_0/f_string/c/string/ranges.c
index aedd32e83f3bb9a819ff80e83f5ccb8dcc47a59b..7528a8d4b8a57861d799f5fc8461c8fc805becc0 100644 (file)
--- a/level_0/f_string/c/string/ranges.c
+++ b/level_0/f_string/c/string/ranges.c
@@ -7,12 +7,12 @@ extern "C" {
 #endif
 
 #ifndef _di_f_string_ranges_adjust_
-  f_status_t f_string_ranges_adjust(const f_number_unsigned_t length, f_string_ranges_t * const ranges) {
+  f_status_t f_string_ranges_adjust(const f_number_unsigned_t length, f_string_ranges_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!ranges) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    return f_memory_array_adjust(length, sizeof(f_string_range_t), (void **) &ranges->array, &ranges->used, &ranges->size);
+    return f_memory_array_adjust(length, sizeof(f_string_range_t), (void **) &structure->array, &structure->used, &structure->size);
   }
 #endif // _di_f_string_ranges_adjust_
 
@@ -58,54 +58,54 @@ extern "C" {
 #endif // _di_f_string_ranges_append_all_
 
 #ifndef _di_f_string_ranges_decimate_by_
-  f_status_t f_string_ranges_decimate_by(const f_number_unsigned_t amount, f_string_ranges_t * const ranges) {
+  f_status_t f_string_ranges_decimate_by(const f_number_unsigned_t amount, f_string_ranges_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!ranges) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
     if (!amount) return F_data_not;
 
-    return f_memory_array_decimate_by(amount, sizeof(f_string_range_t), (void **) &ranges->array, &ranges->used, &ranges->size);
+    return f_memory_array_decimate_by(amount, sizeof(f_string_range_t), (void **) &structure->array, &structure->used, &structure->size);
   }
 #endif // _di_f_string_ranges_decimate_by_
 
 #ifndef _di_f_string_ranges_decrease_by_
-  f_status_t f_string_ranges_decrease_by(const f_number_unsigned_t amount, f_string_ranges_t * const ranges) {
+  f_status_t f_string_ranges_decrease_by(const f_number_unsigned_t amount, f_string_ranges_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!ranges) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    return f_memory_array_decrease_by(amount, sizeof(f_string_range_t), (void **) &ranges->array, &ranges->used, &ranges->size);
+    return f_memory_array_decrease_by(amount, sizeof(f_string_range_t), (void **) &structure->array, &structure->used, &structure->size);
   }
 #endif // _di_f_string_ranges_decrease_by_
 
 #ifndef _di_f_string_ranges_increase_
-  f_status_t f_string_ranges_increase(const f_number_unsigned_t step, f_string_ranges_t * const ranges) {
+  f_status_t f_string_ranges_increase(const f_number_unsigned_t step, f_string_ranges_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!ranges) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    return f_memory_array_increase(step, sizeof(f_string_range_t), (void **) &ranges->array, &ranges->used, &ranges->size);
+    return f_memory_array_increase(step, sizeof(f_string_range_t), (void **) &structure->array, &structure->used, &structure->size);
   }
 #endif // _di_f_string_ranges_increase_
 
 #ifndef _di_f_string_ranges_increase_by_
-  f_status_t f_string_ranges_increase_by(const f_number_unsigned_t amount, f_string_ranges_t * const ranges) {
+  f_status_t f_string_ranges_increase_by(const f_number_unsigned_t amount, f_string_ranges_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!ranges) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    return f_memory_array_increase_by(amount, sizeof(f_string_range_t), (void **) &ranges->array, &ranges->used, &ranges->size);
+    return f_memory_array_increase_by(amount, sizeof(f_string_range_t), (void **) &structure->array, &structure->used, &structure->size);
   }
 #endif // _di_f_string_ranges_increase_by_
 
 #ifndef _di_f_string_ranges_resize_
-  f_status_t f_string_ranges_resize(const f_number_unsigned_t length, f_string_ranges_t * const ranges) {
+  f_status_t f_string_ranges_resize(const f_number_unsigned_t length, f_string_ranges_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!ranges) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    return f_memory_array_resize(length, sizeof(f_string_range_t), (void **) &ranges->array, &ranges->used, &ranges->size);
+    return f_memory_array_resize(length, sizeof(f_string_range_t), (void **) &structure->array, &structure->used, &structure->size);
   }
 #endif // _di_f_string_ranges_resize_
 

diff --git a/level_0/f_string/c/string/ranges.h b/level_0/f_string/c/string/ranges.h
index 47640ad36d7d43f12c701a80c493aaf92070b13b..8347659ef24782afdce8130517341277b764ee60 100644 (file)
--- a/level_0/f_string/c/string/ranges.h
+++ b/level_0/f_string/c/string/ranges.h
@@ -54,7 +54,7 @@ extern "C" {
  *
  * @param length
  *   The new size to use.
- * @param ranges
+ * @param structure
  *   The string ranges array to resize.
  *
  * @return
@@ -64,7 +64,7 @@ extern "C" {
  *   F_parameter (with error bit) if a parameter is invalid.
  */
 #ifndef _di_f_string_ranges_adjust_
-  extern f_status_t f_string_ranges_adjust(const f_number_unsigned_t length, f_string_ranges_t * const ranges);
+  extern f_status_t f_string_ranges_adjust(const f_number_unsigned_t length, f_string_ranges_t * const structure);
 #endif // _di_f_string_ranges_adjust_
 
 /**
@@ -116,7 +116,7 @@ extern "C" {
  *
  * @param amount
  *   A positive number representing how much to decimate the size by.
- * @param ranges
+ * @param structure
  *   The string ranges array to resize.
  *
  * @return
@@ -128,7 +128,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_string_ranges_decimate_by_
-  extern f_status_t f_string_ranges_decimate_by(const f_number_unsigned_t amount, f_string_ranges_t * const ranges);
+  extern f_status_t f_string_ranges_decimate_by(const f_number_unsigned_t amount, f_string_ranges_t * const structure);
 #endif // _di_f_string_ranges_decimate_by_
 
 /**
@@ -140,7 +140,7 @@ extern "C" {
  *
  * @param amount
  *   A positive number representing how much to decrease the size by.
- * @param ranges
+ * @param structure
  *   The string ranges array to resize.
  *
  * @return
@@ -152,7 +152,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_string_ranges_decrease_by_
-  extern f_status_t f_string_ranges_decrease_by(const f_number_unsigned_t amount, f_string_ranges_t * const ranges);
+  extern f_status_t f_string_ranges_decrease_by(const f_number_unsigned_t amount, f_string_ranges_t * const structure);
 #endif // _di_f_string_ranges_decrease_by_
 
 /**
@@ -164,7 +164,7 @@ extern "C" {
  * @param step
  *   The allocation step to use.
  *   Must be greater than 0.
- * @param ranges
+ * @param structure
  *   The string ranges array to resize.
  *   F_data_not on success, but there is no reason to increase size (used + 1 <= size).
  *
@@ -177,7 +177,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_string_ranges_increase_
-  extern f_status_t f_string_ranges_increase(const f_number_unsigned_t step, f_string_ranges_t * const ranges);
+  extern f_status_t f_string_ranges_increase(const f_number_unsigned_t step, f_string_ranges_t * const structure);
 #endif // _di_f_string_ranges_increase_
 
 /**
@@ -189,7 +189,7 @@ extern "C" {
  *
  * @param amount
  *   A positive number representing how much to increase the size by.
- * @param ranges
+ * @param structure
  *   The string ranges array to resize.
  *
  * @return
@@ -202,7 +202,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_string_ranges_increase_by_
-  extern f_status_t f_string_ranges_increase_by(const f_number_unsigned_t amount, f_string_ranges_t * const ranges);
+  extern f_status_t f_string_ranges_increase_by(const f_number_unsigned_t amount, f_string_ranges_t * const structure);
 #endif // _di_f_string_ranges_increase_by_
 
 /**
@@ -210,7 +210,7 @@ extern "C" {
  *
  * @param length
  *   The new size to use.
- * @param ranges
+ * @param structure
  *   The string ranges array to adjust.
  *
  * @return
@@ -221,7 +221,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_string_ranges_resize_
-  extern f_status_t f_string_ranges_resize(const f_number_unsigned_t length, f_string_ranges_t * const ranges);
+  extern f_status_t f_string_ranges_resize(const f_number_unsigned_t length, f_string_ranges_t * const structure);
 #endif // _di_f_string_ranges_resize_
 
 #ifdef __cplusplus

diff --git a/level_0/f_string/c/string/rangess.c b/level_0/f_string/c/string/rangess.c
index 7a58c46f07fb2da17e2cf65084bb9469f2bc2229..0315dc24297dd089d7914f96c844ebb2c1894eba 100644 (file)
--- a/level_0/f_string/c/string/rangess.c
+++ b/level_0/f_string/c/string/rangess.c
@@ -8,12 +8,12 @@ extern "C" {
 #endif
 
 #ifndef _di_f_string_rangess_adjust_
-  f_status_t f_string_rangess_adjust(const f_number_unsigned_t length, f_string_rangess_t * const rangess) {
+  f_status_t f_string_rangess_adjust(const f_number_unsigned_t length, f_string_rangess_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!rangess) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    return private_f_string_rangess_adjust(length, rangess);
+    return private_f_string_rangess_adjust(length, structure);
   }
 #endif // _di_f_string_rangess_adjust_
 
@@ -75,45 +75,45 @@ extern "C" {
 #endif // _di_f_string_rangess_append_all_
 
 #ifndef _di_f_string_rangess_decimate_by_
-  f_status_t f_string_rangess_decimate_by(const f_number_unsigned_t amount, f_string_rangess_t * const rangess) {
+  f_status_t f_string_rangess_decimate_by(const f_number_unsigned_t amount, f_string_rangess_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!rangess) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
     if (!amount) return F_data_not;
 
-    return private_f_string_rangess_adjust((rangess->size > amount) ? rangess->size - amount : 0, rangess);
+    return private_f_string_rangess_adjust((structure->size > amount) ? structure->size - amount : 0, structure);
   }
 #endif // _di_f_string_rangess_decimate_by_
 
 #ifndef _di_f_string_rangess_decrease_by_
-  f_status_t f_string_rangess_decrease_by(const f_number_unsigned_t amount, f_string_rangess_t * const rangess) {
+  f_status_t f_string_rangess_decrease_by(const f_number_unsigned_t amount, f_string_rangess_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!rangess) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
     if (!amount) return F_data_not;
 
-    return private_f_string_rangess_resize((rangess->size > amount) ? rangess->size - amount : 0, rangess);
+    return private_f_string_rangess_resize((structure->size > amount) ? structure->size - amount : 0, structure);
   }
 #endif // _di_f_string_rangess_decrease_by_
 
 #ifndef _di_f_string_rangess_increase_
-  f_status_t f_string_rangess_increase(const f_number_unsigned_t step, f_string_rangess_t * const rangess) {
+  f_status_t f_string_rangess_increase(const f_number_unsigned_t step, f_string_rangess_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!rangess) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    if (step && rangess->used + 1 > rangess->size) {
-      f_number_unsigned_t length = rangess->used + step;
+    if (step && structure->used + 1 > structure->size) {
+      f_number_unsigned_t length = structure->used + step;
 
       if (length > F_number_t_size_unsigned_d) {
-        if (rangess->used + 1 > F_number_t_size_unsigned_d) return F_status_set_error(F_array_too_large);
+        if (structure->used + 1 > F_number_t_size_unsigned_d) return F_status_set_error(F_array_too_large);
 
         length = F_number_t_size_unsigned_d;
       }
 
-      return private_f_string_rangess_resize(length, rangess);
+      return private_f_string_rangess_resize(length, structure);
     }
 
     return F_data_not;
@@ -121,20 +121,20 @@ extern "C" {
 #endif // _di_f_string_rangess_increase_
 
 #ifndef _di_f_string_rangess_increase_by_
-  f_status_t f_string_rangess_increase_by(const f_number_unsigned_t amount, f_string_rangess_t * const rangess) {
+  f_status_t f_string_rangess_increase_by(const f_number_unsigned_t amount, f_string_rangess_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!rangess) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
     if (amount) {
-      if (rangess->used >= F_number_t_size_unsigned_d) return F_status_set_error(F_array_too_large);
+      if (structure->used >= F_number_t_size_unsigned_d) return F_status_set_error(F_array_too_large);
 
-      const f_number_unsigned_t length = rangess->used + amount;
+      const f_number_unsigned_t length = structure->used + amount;
 
-      if (length > rangess->size) {
+      if (length > structure->size) {
         if (length > F_number_t_size_unsigned_d) return F_status_set_error(F_array_too_large);
 
-        return private_f_string_rangess_resize(length, rangess);
+        return private_f_string_rangess_resize(length, structure);
       }
     }
 
@@ -143,12 +143,12 @@ extern "C" {
 #endif // _di_f_string_rangess_increase_by_
 
 #ifndef _di_f_string_rangess_resize_
-  f_status_t f_string_rangess_resize(const f_number_unsigned_t length, f_string_rangess_t * const rangess) {
+  f_status_t f_string_rangess_resize(const f_number_unsigned_t length, f_string_rangess_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!rangess) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    return private_f_string_rangess_resize(length, rangess);
+    return private_f_string_rangess_resize(length, structure);
   }
 #endif // _di_f_string_rangess_resize_
 

diff --git a/level_0/f_string/c/string/rangess.h b/level_0/f_string/c/string/rangess.h
index e5dd470e758645e9c975524f2c761c00f0171227..3364db7ea62f6c56de51aa4ad906387dfe3bf83e 100644 (file)
--- a/level_0/f_string/c/string/rangess.h
+++ b/level_0/f_string/c/string/rangess.h
@@ -56,7 +56,7 @@ extern "C" {
  *
  * @param length
  *   The new size to use.
- * @param rangess
+ * @param structure
  *   The string rangess array to resize.
  *
  * @return
@@ -67,7 +67,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_string_rangess_adjust_
-  extern f_status_t f_string_rangess_adjust(const f_number_unsigned_t length, f_string_rangess_t * const rangess);
+  extern f_status_t f_string_rangess_adjust(const f_number_unsigned_t length, f_string_rangess_t * const structure);
 #endif // _di_f_string_rangess_adjust_
 
 /**
@@ -119,7 +119,7 @@ extern "C" {
  *
  * @param amount
  *   A positive number representing how much to decimate the size by.
- * @param rangess
+ * @param structure
  *   The string rangess array to resize.
  *
  * @return
@@ -131,7 +131,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_string_rangess_decimate_by_
-  extern f_status_t f_string_rangess_decimate_by(const f_number_unsigned_t amount, f_string_rangess_t * const rangess);
+  extern f_status_t f_string_rangess_decimate_by(const f_number_unsigned_t amount, f_string_rangess_t * const structure);
 #endif // _di_f_string_rangess_decimate_by_
 
 /**
@@ -143,7 +143,7 @@ extern "C" {
  *
  * @param amount
  *   A positive number representing how much to decrease the size by.
- * @param rangess
+ * @param structure
  *   The string rangess array to resize.
  *
  * @return
@@ -155,7 +155,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_string_rangess_decrease_by_
-  extern f_status_t f_string_rangess_decrease_by(const f_number_unsigned_t amount, f_string_rangess_t * const rangess);
+  extern f_status_t f_string_rangess_decrease_by(const f_number_unsigned_t amount, f_string_rangess_t * const structure);
 #endif // _di_f_string_rangess_decrease_by_
 
 /**
@@ -167,7 +167,7 @@ extern "C" {
  * @param step
  *   The allocation step to use.
  *   Must be greater than 0.
- * @param rangess
+ * @param structure
  *   The string rangess array to resize.
  *
  * @return
@@ -180,7 +180,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_string_rangess_increase_
-  extern f_status_t f_string_rangess_increase(const f_number_unsigned_t step, f_string_rangess_t * const rangess);
+  extern f_status_t f_string_rangess_increase(const f_number_unsigned_t step, f_string_rangess_t * const structure);
 #endif // _di_f_string_rangess_increase_
 
 /**
@@ -192,7 +192,7 @@ extern "C" {
  *
  * @param amount
  *   A positive number representing how much to increase the size by.
- * @param rangess
+ * @param structure
  *   The string rangess array to resize.
  *
  * @return
@@ -205,7 +205,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_string_rangess_increase_by_
-  extern f_status_t f_string_rangess_increase_by(const f_number_unsigned_t amount, f_string_rangess_t * const rangess);
+  extern f_status_t f_string_rangess_increase_by(const f_number_unsigned_t amount, f_string_rangess_t * const structure);
 #endif // _di_f_string_rangess_increase_by_
 
 /**
@@ -213,7 +213,7 @@ extern "C" {
  *
  * @param length
  *   The new size to use.
- * @param rangess
+ * @param structure
  *   The string rangess array to adjust.
  *
  * @return
@@ -224,7 +224,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_string_rangess_resize_
-  extern f_status_t f_string_rangess_resize(const f_number_unsigned_t length, f_string_rangess_t * const rangess);
+  extern f_status_t f_string_rangess_resize(const f_number_unsigned_t length, f_string_rangess_t * const structure);
 #endif // _di_f_string_rangess_resize_
 
 #ifdef __cplusplus

diff --git a/level_0/f_string/c/string/triples.c b/level_0/f_string/c/string/triples.c
index f71558841cb3e752f0bf229f0aa08b9af8e3c2a7..1b0e7faf83be6e9755f17687c3cb5e977cfd7a6e 100644 (file)
--- a/level_0/f_string/c/string/triples.c
+++ b/level_0/f_string/c/string/triples.c
@@ -7,12 +7,12 @@ extern "C" {
 #endif
 
 #ifndef _di_f_string_triples_adjust_
-  f_status_t f_string_triples_adjust(const f_number_unsigned_t length, f_string_triples_t * const triples) {
+  f_status_t f_string_triples_adjust(const f_number_unsigned_t length, f_string_triples_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!triples) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    return private_f_string_triples_adjust(length, triples);
+    return private_f_string_triples_adjust(length, structure);
   }
 #endif // _di_f_string_triples_adjust_
 
@@ -96,45 +96,45 @@ extern "C" {
 #endif // _di_f_string_triples_append_all_
 
 #ifndef _di_f_string_triples_decimate_by_
-  f_status_t f_string_triples_decimate_by(const f_number_unsigned_t amount, f_string_triples_t * const triples) {
+  f_status_t f_string_triples_decimate_by(const f_number_unsigned_t amount, f_string_triples_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!triples) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
     if (!amount) return F_data_not;
 
-    return private_f_string_triples_adjust((triples->size > amount) ? triples->size - amount : 0, triples);
+    return private_f_string_triples_adjust((structure->size > amount) ? structure->size - amount : 0, structure);
   }
 #endif // _di_f_string_triples_decimate_by_
 
 #ifndef _di_f_string_triples_decrease_by_
-  f_status_t f_string_triples_decrease_by(const f_number_unsigned_t amount, f_string_triples_t * const triples) {
+  f_status_t f_string_triples_decrease_by(const f_number_unsigned_t amount, f_string_triples_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!triples) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
     if (!amount) return F_data_not;
 
-    return private_f_string_triples_resize((triples->size > amount) ? triples->size - amount : 0, triples);
+    return private_f_string_triples_resize((structure->size > amount) ? structure->size - amount : 0, structure);
   }
 #endif // _di_f_string_triples_decrease_by_
 
 #ifndef _di_f_string_triples_increase_
-  f_status_t f_string_triples_increase(const f_number_unsigned_t step, f_string_triples_t * const triples) {
+  f_status_t f_string_triples_increase(const f_number_unsigned_t step, f_string_triples_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!triples) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    if (step && triples->used + 1 > triples->size) {
-      f_number_unsigned_t length = triples->used + F_memory_default_allocation_small_d;
+    if (step && structure->used + 1 > structure->size) {
+      f_number_unsigned_t length = structure->used + F_memory_default_allocation_small_d;
 
       if (length > F_number_t_size_unsigned_d) {
-        if (triples->used + 1 > F_number_t_size_unsigned_d) return F_status_set_error(F_array_too_large);
+        if (structure->used + 1 > F_number_t_size_unsigned_d) return F_status_set_error(F_array_too_large);
 
         length = F_number_t_size_unsigned_d;
       }
 
-      return private_f_string_triples_resize(length, triples);
+      return private_f_string_triples_resize(length, structure);
     }
 
     return F_data_not;
@@ -142,20 +142,20 @@ extern "C" {
 #endif // _di_f_string_triples_increase_
 
 #ifndef _di_f_string_triples_increase_by_
-  f_status_t f_string_triples_increase_by(const f_number_unsigned_t amount, f_string_triples_t * const triples) {
+  f_status_t f_string_triples_increase_by(const f_number_unsigned_t amount, f_string_triples_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!triples) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
     if (amount) {
-      if (triples->used >= F_number_t_size_unsigned_d) return F_status_set_error(F_array_too_large);
+      if (structure->used >= F_number_t_size_unsigned_d) return F_status_set_error(F_array_too_large);
 
-      const f_number_unsigned_t length = triples->used + amount;
+      const f_number_unsigned_t length = structure->used + amount;
 
-      if (length > triples->size) {
+      if (length > structure->size) {
         if (length > F_number_t_size_unsigned_d) return F_status_set_error(F_array_too_large);
 
-        return private_f_string_triples_resize(length, triples);
+        return private_f_string_triples_resize(length, structure);
       }
     }
 
@@ -164,12 +164,12 @@ extern "C" {
 #endif // _di_f_string_triples_increase_by_
 
 #ifndef _di_f_string_triples_resize_
-  f_status_t f_string_triples_resize(const f_number_unsigned_t length, f_string_triples_t * const triples) {
+  f_status_t f_string_triples_resize(const f_number_unsigned_t length, f_string_triples_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!triples) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    return private_f_string_triples_resize(length, triples);
+    return private_f_string_triples_resize(length, structure);
   }
 #endif // _di_f_string_triples_resize_
 

diff --git a/level_0/f_string/c/string/triples.h b/level_0/f_string/c/string/triples.h
index c5a3a0cbffa119c9d911969fe36568e1aae70d39..04f512c21d7ec96984ee0b4d3de157b8fd19b385 100644 (file)
--- a/level_0/f_string/c/string/triples.h
+++ b/level_0/f_string/c/string/triples.h
@@ -54,7 +54,7 @@ extern "C" {
  *
  * @param length
  *   The new size to use.
- * @param triples
+ * @param structure
  *   The string triples array to resize.
  *
  * @return
@@ -64,7 +64,7 @@ extern "C" {
  *   F_parameter (with error bit) if a parameter is invalid.
  */
 #ifndef _di_f_string_triples_adjust_
-  extern f_status_t f_string_triples_adjust(const f_number_unsigned_t length, f_string_triples_t * const triples);
+  extern f_status_t f_string_triples_adjust(const f_number_unsigned_t length, f_string_triples_t * const structure);
 #endif // _di_f_string_triples_adjust_
 
 /**
@@ -118,7 +118,7 @@ extern "C" {
  *
  * @param amount
  *   A positive number representing how much to decimate the size by.
- * @param triples
+ * @param structure
  *   The string triples array to resize.
  *
  * @return
@@ -130,7 +130,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_string_triples_decimate_by_
-  extern f_status_t f_string_triples_decimate_by(const f_number_unsigned_t amount, f_string_triples_t * const triples);
+  extern f_status_t f_string_triples_decimate_by(const f_number_unsigned_t amount, f_string_triples_t * const structure);
 #endif // _di_f_string_triples_decimate_by_
 
 /**
@@ -142,7 +142,7 @@ extern "C" {
  *
  * @param amount
  *   A positive number representing how much to decrease the size by.
- * @param triples
+ * @param structure
  *   The string triples array to resize.
  *
  * @return
@@ -154,7 +154,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_string_triples_decrease_by_
-  extern f_status_t f_string_triples_decrease_by(const f_number_unsigned_t amount, f_string_triples_t * const triples);
+  extern f_status_t f_string_triples_decrease_by(const f_number_unsigned_t amount, f_string_triples_t * const structure);
 #endif // _di_f_string_triples_decrease_by_
 
 /**
@@ -166,7 +166,7 @@ extern "C" {
  * @param step
  *   The allocation step to use.
  *   Must be greater than 0.
- * @param triples
+ * @param structure
  *   The string triples array to resize.
  *
  * @return
@@ -179,7 +179,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_string_triples_increase_
-  extern f_status_t f_string_triples_increase(const f_number_unsigned_t step, f_string_triples_t * const triples);
+  extern f_status_t f_string_triples_increase(const f_number_unsigned_t step, f_string_triples_t * const structure);
 #endif // _di_f_string_triples_increase_
 
 /**
@@ -191,7 +191,7 @@ extern "C" {
  *
  * @param amount
  *   A positive number representing how much to increase the size by.
- * @param triples
+ * @param structure
  *   The string triples array to resize.
  *
  * @return
@@ -204,7 +204,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_string_triples_increase_by_
-  extern f_status_t f_string_triples_increase_by(const f_number_unsigned_t amount, f_string_triples_t * const triples);
+  extern f_status_t f_string_triples_increase_by(const f_number_unsigned_t amount, f_string_triples_t * const structure);
 #endif // _di_f_string_triples_increase_by_
 
 /**
@@ -212,7 +212,7 @@ extern "C" {
  *
  * @param length
  *   The new size to use.
- * @param triples
+ * @param structure
  *   The string triples array to adjust.
  *
  * @return
@@ -223,7 +223,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_string_triples_resize_
-  extern f_status_t f_string_triples_resize(const f_number_unsigned_t length, f_string_triples_t * const triples);
+  extern f_status_t f_string_triples_resize(const f_number_unsigned_t length, f_string_triples_t * const structure);
 #endif // _di_f_string_triples_resize_
 
 #ifdef __cplusplus

diff --git a/level_0/f_string/c/string/tripless.c b/level_0/f_string/c/string/tripless.c
index e61ebcc902a176da1b518a02cb3b2aefea2b71d1..c3a6b5434c68b1bd9dff24eea5b0352a38d8cf59 100644 (file)
--- a/level_0/f_string/c/string/tripless.c
+++ b/level_0/f_string/c/string/tripless.c
@@ -65,55 +65,55 @@ extern "C" {
 #endif // _di_f_string_tripless_append_all_
 
 #ifndef _di_f_string_tripless_adjust_
-  f_status_t f_string_tripless_adjust(const f_number_unsigned_t length, f_string_tripless_t * const tripless) {
+  f_status_t f_string_tripless_adjust(const f_number_unsigned_t length, f_string_tripless_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!tripless) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    return private_f_string_tripless_adjust(length, tripless);
+    return private_f_string_tripless_adjust(length, structure);
   }
 #endif // _di_f_string_tripless_adjust_
 
 #ifndef _di_f_string_tripless_decimate_by_
-  f_status_t f_string_tripless_decimate_by(const f_number_unsigned_t amount, f_string_tripless_t * const tripless) {
+  f_status_t f_string_tripless_decimate_by(const f_number_unsigned_t amount, f_string_tripless_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!tripless) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
     if (!amount) return F_data_not;
 
-    return private_f_string_tripless_adjust((tripless->size > amount) ? tripless->size - amount : 0, tripless);
+    return private_f_string_tripless_adjust((structure->size > amount) ? structure->size - amount : 0, structure);
   }
 #endif // _di_f_string_tripless_decimate_by_
 
 #ifndef _di_f_string_tripless_decrease_by_
-  f_status_t f_string_tripless_decrease_by(const f_number_unsigned_t amount, f_string_tripless_t * const tripless) {
+  f_status_t f_string_tripless_decrease_by(const f_number_unsigned_t amount, f_string_tripless_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!tripless) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
     if (!amount) return F_data_not;
 
-    return private_f_string_tripless_resize((tripless->size > amount) ? tripless->size - amount : 0, tripless);
+    return private_f_string_tripless_resize((structure->size > amount) ? structure->size - amount : 0, structure);
   }
 #endif // _di_f_string_tripless_decrease_by_
 
 #ifndef _di_f_string_tripless_increase_
-  f_status_t f_string_tripless_increase(const f_number_unsigned_t step, f_string_tripless_t * const tripless) {
+  f_status_t f_string_tripless_increase(const f_number_unsigned_t step, f_string_tripless_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!tripless) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    if (step && tripless->used + 1 > tripless->size) {
-      f_number_unsigned_t length = tripless->used + step;
+    if (step && structure->used + 1 > structure->size) {
+      f_number_unsigned_t length = structure->used + step;
 
       if (length > F_number_t_size_unsigned_d) {
-        if (tripless->used + 1 > F_number_t_size_unsigned_d) return F_status_set_error(F_array_too_large);
+        if (structure->used + 1 > F_number_t_size_unsigned_d) return F_status_set_error(F_array_too_large);
 
         length = F_number_t_size_unsigned_d;
       }
 
-      return private_f_string_tripless_resize(length, tripless);
+      return private_f_string_tripless_resize(length, structure);
     }
 
     return F_data_not;
@@ -121,20 +121,20 @@ extern "C" {
 #endif // _di_f_string_tripless_increase_
 
 #ifndef _di_f_string_tripless_increase_by_
-  f_status_t f_string_tripless_increase_by(const f_number_unsigned_t amount, f_string_tripless_t * const tripless) {
+  f_status_t f_string_tripless_increase_by(const f_number_unsigned_t amount, f_string_tripless_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!tripless) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
     if (amount) {
-      if (tripless->used >= F_number_t_size_unsigned_d) return F_status_set_error(F_array_too_large);
+      if (structure->used >= F_number_t_size_unsigned_d) return F_status_set_error(F_array_too_large);
 
-      const f_number_unsigned_t length = tripless->used + amount;
+      const f_number_unsigned_t length = structure->used + amount;
 
-      if (length > tripless->size) {
+      if (length > structure->size) {
         if (length > F_number_t_size_unsigned_d) return F_status_set_error(F_array_too_large);
 
-        return private_f_string_tripless_resize(length, tripless);
+        return private_f_string_tripless_resize(length, structure);
       }
     }
 
@@ -143,12 +143,12 @@ extern "C" {
 #endif // _di_f_string_tripless_increase_by_
 
 #ifndef _di_f_string_tripless_resize_
-  f_status_t f_string_tripless_resize(const f_number_unsigned_t length, f_string_tripless_t * const tripless) {
+  f_status_t f_string_tripless_resize(const f_number_unsigned_t length, f_string_tripless_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!tripless) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    return private_f_string_tripless_resize(length, tripless);
+    return private_f_string_tripless_resize(length, structure);
   }
 #endif // _di_f_string_tripless_resize_
 

diff --git a/level_0/f_string/c/string/tripless.h b/level_0/f_string/c/string/tripless.h
index c2f6a9d964f777d5a717b31f547b8c621334ef0b..deae16690c1c2a269d18b770e4d6c1859022fa6a 100644 (file)
--- a/level_0/f_string/c/string/tripless.h
+++ b/level_0/f_string/c/string/tripless.h
@@ -54,7 +54,7 @@ extern "C" {
  *
  * @param length
  *   The new size to use.
- * @param tripless
+ * @param structure
  *   The string tripless array to resize.
  *
  * @return
@@ -64,7 +64,7 @@ extern "C" {
  *   F_parameter (with error bit) if a parameter is invalid.
  */
 #ifndef _di_f_string_tripless_adjust_
-  extern f_status_t f_string_tripless_adjust(const f_number_unsigned_t length, f_string_tripless_t * const tripless);
+  extern f_status_t f_string_tripless_adjust(const f_number_unsigned_t length, f_string_tripless_t * const structure);
 #endif // _di_f_string_tripless_adjust_
 
 /**
@@ -118,7 +118,7 @@ extern "C" {
  *
  * @param amount
  *   A positive number representing how much to decimate the size by.
- * @param tripless
+ * @param structure
  *   The string tripless array to resize.
  *
  * @return
@@ -130,7 +130,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_string_tripless_decimate_by_
-  extern f_status_t f_string_tripless_decimate_by(const f_number_unsigned_t amount, f_string_tripless_t * const tripless);
+  extern f_status_t f_string_tripless_decimate_by(const f_number_unsigned_t amount, f_string_tripless_t * const structure);
 #endif // _di_f_string_tripless_decimate_by_
 
 /**
@@ -142,7 +142,7 @@ extern "C" {
  *
  * @param amount
  *   A positive number representing how much to decrease the size by.
- * @param tripless
+ * @param structure
  *   The string tripless array to resize.
  *
  * @return
@@ -154,7 +154,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_string_tripless_decrease_by_
-  extern f_status_t f_string_tripless_decrease_by(const f_number_unsigned_t amount, f_string_tripless_t * const tripless);
+  extern f_status_t f_string_tripless_decrease_by(const f_number_unsigned_t amount, f_string_tripless_t * const structure);
 #endif // _di_f_string_tripless_decrease_by_
 
 /**
@@ -166,7 +166,7 @@ extern "C" {
  * @param step
  *   The allocation step to use.
  *   Must be greater than 0.
- * @param tripless
+ * @param structure
  *   The string tripless array to resize.
  *
  * @return
@@ -179,7 +179,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_string_tripless_increase_
-  extern f_status_t f_string_tripless_increase(const f_number_unsigned_t step, f_string_tripless_t * const tripless);
+  extern f_status_t f_string_tripless_increase(const f_number_unsigned_t step, f_string_tripless_t * const structure);
 #endif // _di_f_string_tripless_increase_
 
 /**
@@ -191,7 +191,7 @@ extern "C" {
  *
  * @param amount
  *   A positive number representing how much to increase the size by.
- * @param tripless
+ * @param structure
  *   The string tripless array to resize.
  *
  * @return
@@ -204,7 +204,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_string_tripless_increase_by_
-  extern f_status_t f_string_tripless_increase_by(const f_number_unsigned_t amount, f_string_tripless_t * const tripless);
+  extern f_status_t f_string_tripless_increase_by(const f_number_unsigned_t amount, f_string_tripless_t * const structure);
 #endif // _di_f_string_tripless_increase_by_
 
 /**
@@ -212,7 +212,7 @@ extern "C" {
  *
  * @param length
  *   The new size to use.
- * @param tripless
+ * @param structure
  *   The string tripless array to adjust.
  *
  * @return
@@ -223,7 +223,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_string_tripless_resize_
-  extern f_status_t f_string_tripless_resize(const f_number_unsigned_t length, f_string_tripless_t * const tripless);
+  extern f_status_t f_string_tripless_resize(const f_number_unsigned_t length, f_string_tripless_t * const structure);
 #endif // _di_f_string_tripless_resize_
 
 #ifdef __cplusplus

diff --git a/level_0/f_utf/c/utf/dynamics.c b/level_0/f_utf/c/utf/dynamics.c
index aa7d900d8d7de62e3fdcb921b095002c102f40f5..71c489e6dbd0f6ff3a7910321f605965cb3b01b5 100644 (file)
--- a/level_0/f_utf/c/utf/dynamics.c
+++ b/level_0/f_utf/c/utf/dynamics.c
@@ -10,12 +10,12 @@ extern "C" {
 #endif
 
 #ifndef _di_f_utf_string_dynamics_adjust_
-  f_status_t f_utf_string_dynamics_adjust(const f_number_unsigned_t length, f_utf_string_dynamics_t * const dynamics) {
+  f_status_t f_utf_string_dynamics_adjust(const f_number_unsigned_t length, f_utf_string_dynamics_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!dynamics) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    return private_f_utf_string_dynamics_adjust(length, dynamics);
+    return private_f_utf_string_dynamics_adjust(length, structure);
   }
 #endif // _di_f_utf_string_dynamics_adjust_
 
@@ -44,57 +44,47 @@ extern "C" {
 #endif // _di_f_utf_string_dynamics_append_all_
 
 #ifndef _di_f_utf_string_dynamics_decimate_by_
-  f_status_t f_utf_string_dynamics_decimate_by(const f_number_unsigned_t amount, f_utf_string_dynamics_t * const dynamics) {
+  f_status_t f_utf_string_dynamics_decimate_by(const f_number_unsigned_t amount, f_utf_string_dynamics_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!dynamics) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
     if (!amount) return F_data_not;
 
-    if (dynamics->size > amount) {
-      return private_f_utf_string_dynamics_adjust(dynamics->size - amount, dynamics);
-    }
-
-    return private_f_utf_string_dynamics_adjust(0, dynamics);
+    return private_f_utf_string_dynamics_adjust((structure->size > amount) ? structure->size - amount : 0, structure);
   }
 #endif // _di_f_utf_string_dynamics_decimate_by_
 
 #ifndef _di_f_utf_string_dynamics_decrease_by_
-  f_status_t f_utf_string_dynamics_decrease_by(const f_number_unsigned_t amount, f_utf_string_dynamics_t * const dynamics) {
+  f_status_t f_utf_string_dynamics_decrease_by(const f_number_unsigned_t amount, f_utf_string_dynamics_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!dynamics) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
     if (!amount) return F_data_not;
 
-    if (dynamics->size > amount) {
-      return private_f_utf_string_dynamics_resize(dynamics->size - amount, dynamics);
-    }
-
-    return private_f_utf_string_dynamics_resize(0, dynamics);
+    return private_f_utf_string_dynamics_resize((structure->size > amount) ? structure->size - amount : 0, structure);
   }
 #endif // _di_f_utf_string_dynamics_decrease_by_
 
 #ifndef _di_f_utf_string_dynamics_increase_
-  f_status_t f_utf_string_dynamics_increase(const f_number_unsigned_t step, f_utf_string_dynamics_t * const dynamics) {
+  f_status_t f_utf_string_dynamics_increase(const f_number_unsigned_t step, f_utf_string_dynamics_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!dynamics) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
     if (!step) return F_data_not;
 
-    if (dynamics->used + 1 > dynamics->size) {
-      f_number_unsigned_t length = dynamics->used + step;
+    if (structure->used + 1 > structure->size) {
+      f_number_unsigned_t length = structure->used + step;
 
       if (length > F_number_t_size_unsigned_d) {
-        if (dynamics->used + 1 > F_number_t_size_unsigned_d) {
-          return F_status_set_error(F_array_too_large);
-        }
+        if (structure->used + 1 > F_number_t_size_unsigned_d) return F_status_set_error(F_array_too_large);
 
         length = F_number_t_size_unsigned_d;
       }
 
-      return private_f_utf_string_dynamics_resize(length, dynamics);
+      return private_f_utf_string_dynamics_resize(length, structure);
     }
 
     return F_data_not;
@@ -102,20 +92,20 @@ extern "C" {
 #endif // _di_f_utf_string_dynamics_increase_
 
 #ifndef _di_f_utf_string_dynamics_increase_by_
-  f_status_t f_utf_string_dynamics_increase_by(const f_number_unsigned_t amount, f_utf_string_dynamics_t * const dynamics) {
+  f_status_t f_utf_string_dynamics_increase_by(const f_number_unsigned_t amount, f_utf_string_dynamics_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!dynamics) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
     if (amount) {
-      if (dynamics->used >= F_number_t_size_unsigned_d) return F_status_set_error(F_array_too_large);
+      if (structure->used >= F_number_t_size_unsigned_d) return F_status_set_error(F_array_too_large);
 
-      const f_number_unsigned_t length = dynamics->used + amount;
+      const f_number_unsigned_t length = structure->used + amount;
 
-      if (length > dynamics->size) {
+      if (length > structure->size) {
         if (length > F_number_t_size_unsigned_d) return F_status_set_error(F_array_too_large);
 
-        return private_f_utf_string_dynamics_resize(length, dynamics);
+        return private_f_utf_string_dynamics_resize(structure->used + amount, structure);
       }
     }
 
@@ -124,12 +114,12 @@ extern "C" {
 #endif // _di_f_utf_string_dynamics_increase_by_
 
 #ifndef _di_f_utf_string_dynamics_resize_
-  f_status_t f_utf_string_dynamics_resize(const f_number_unsigned_t length, f_utf_string_dynamics_t * const dynamics) {
+  f_status_t f_utf_string_dynamics_resize(const f_number_unsigned_t length, f_utf_string_dynamics_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!dynamics) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    return private_f_utf_string_dynamics_resize(length, dynamics);
+    return private_f_utf_string_dynamics_resize(length, structure);
   }
 #endif // _di_f_utf_string_dynamics_resize_
 

diff --git a/level_0/f_utf/c/utf/dynamics.h b/level_0/f_utf/c/utf/dynamics.h
index 2c3ab392a9a5bb02a1424bd2b00abc52475a96b3..6c527babf9fadf94de513e423f2f8f1018537f64 100644 (file)
--- a/level_0/f_utf/c/utf/dynamics.h
+++ b/level_0/f_utf/c/utf/dynamics.h
@@ -5,9 +5,9 @@
  * API Version: 0.7
  * Licenses: lgpl-2.1-or-later
  *
- * Defines dynamic (and static) UTF-8 string data.
+ * Defines dynamic string data.
  *
- * This is auto-included by utf.h and should not need to be explicitly included.
+ * This is auto-included by string.h and should not need to be explicitly included.
  */
 #ifndef _F_utf_dynamics_h
 #define _F_utf_dynamics_h
@@ -50,7 +50,7 @@ extern "C" {
  *
  * @param length
  *   The new size to use.
- * @param dynamics
+ * @param structure
  *   The array to resize.
  *
  * @return
@@ -61,7 +61,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_adjust().
  */
 #ifndef _di_f_utf_string_dynamics_adjust_
-  extern f_status_t f_utf_string_dynamics_adjust(const f_number_unsigned_t length, f_utf_string_dynamics_t * const dynamics);
+  extern f_status_t f_utf_string_dynamics_adjust(const f_number_unsigned_t length, f_utf_string_dynamics_t * const structure);
 #endif // _di_f_utf_string_dynamics_adjust_
 
 /**
@@ -115,7 +115,7 @@ extern "C" {
  *
  * @param amount
  *   A positive number representing how much to decimate the size by.
- * @param dynamics
+ * @param structure
  *   The array to resize.
  *
  * @return
@@ -127,7 +127,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_utf_string_dynamics_decimate_by_
-  extern f_status_t f_utf_string_dynamics_decimate_by(const f_number_unsigned_t amount, f_utf_string_dynamics_t * const dynamics);
+  extern f_status_t f_utf_string_dynamics_decimate_by(const f_number_unsigned_t amount, f_utf_string_dynamics_t * const structure);
 #endif // _di_f_utf_string_dynamics_decimate_by_
 
 /**
@@ -139,7 +139,7 @@ extern "C" {
  *
  * @param amount
  *   A positive number representing how much to decrease the size by.
- * @param dynamics
+ * @param structure
  *   The array to resize.
  *
  * @return
@@ -151,7 +151,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_utf_string_dynamics_decrease_by_
-  extern f_status_t f_utf_string_dynamics_decrease_by(const f_number_unsigned_t amount, f_utf_string_dynamics_t * const dynamics);
+  extern f_status_t f_utf_string_dynamics_decrease_by(const f_number_unsigned_t amount, f_utf_string_dynamics_t * const structure);
 #endif // _di_f_utf_string_dynamics_decrease_by_
 
 /**
@@ -163,7 +163,7 @@ extern "C" {
  * @param step
  *   The allocation step to use.
  *   Must be greater than 0.
- * @param dynamics
+ * @param structure
  *   The array to resize.
  *
  * @return
@@ -176,7 +176,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_utf_string_dynamics_increase_
-  extern f_status_t f_utf_string_dynamics_increase(const f_number_unsigned_t step, f_utf_string_dynamics_t * const dynamics);
+  extern f_status_t f_utf_string_dynamics_increase(const f_number_unsigned_t step, f_utf_string_dynamics_t * const structure);
 #endif // _di_f_utf_string_dynamics_increase_
 
 /**
@@ -188,7 +188,7 @@ extern "C" {
  *
  * @param amount
  *   A positive number representing how much to increase the size by.
- * @param dynamics
+ * @param structure
  *   The array to resize.
  *
  * @return
@@ -201,7 +201,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_utf_string_dynamics_increase_by_
-  extern f_status_t f_utf_string_dynamics_increase_by(const f_number_unsigned_t amount, f_utf_string_dynamics_t * const dynamics);
+  extern f_status_t f_utf_string_dynamics_increase_by(const f_number_unsigned_t amount, f_utf_string_dynamics_t * const structure);
 #endif // _di_f_utf_string_dynamics_increase_by_
 
 /**
@@ -209,7 +209,7 @@ extern "C" {
  *
  * @param length
  *   The new size to use.
- * @param dynamics
+ * @param structure
  *   The array to resize.
  *
  * @return
@@ -220,7 +220,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_utf_string_dynamics_resize_
-  extern f_status_t f_utf_string_dynamics_resize(const f_number_unsigned_t length, f_utf_string_dynamics_t * const dynamics);
+  extern f_status_t f_utf_string_dynamics_resize(const f_number_unsigned_t length, f_utf_string_dynamics_t * const structure);
 #endif // _di_f_utf_string_dynamics_resize_
 
 #ifdef __cplusplus

diff --git a/level_0/f_utf/c/utf/dynamicss.c b/level_0/f_utf/c/utf/dynamicss.c
index ff53e4683138d5438f5134287a4bb8d96792fa7f..f5dc5edb211fc686fcb14d872f163daaa5c2f22c 100644 (file)
--- a/level_0/f_utf/c/utf/dynamicss.c
+++ b/level_0/f_utf/c/utf/dynamicss.c
@@ -11,12 +11,12 @@ extern "C" {
 #endif
 
 #ifndef _di_f_utf_string_dynamicss_adjust_
-  f_status_t f_utf_string_dynamicss_adjust(const f_number_unsigned_t length, f_utf_string_dynamicss_t * const dynamicss) {
+  f_status_t f_utf_string_dynamicss_adjust(const f_number_unsigned_t length, f_utf_string_dynamicss_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!dynamicss) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    return private_f_utf_string_dynamicss_adjust(length, dynamicss);
+    return private_f_utf_string_dynamicss_adjust(length, structure);
   }
 #endif // _di_f_utf_string_dynamicss_adjust_
 
@@ -78,57 +78,47 @@ extern "C" {
 #endif // _di_f_utf_string_dynamicss_append_all_
 
 #ifndef _di_f_utf_string_dynamicss_decimate_by_
-  f_status_t f_utf_string_dynamicss_decimate_by(const f_number_unsigned_t amount, f_utf_string_dynamicss_t * const dynamicss) {
+  f_status_t f_utf_string_dynamicss_decimate_by(const f_number_unsigned_t amount, f_utf_string_dynamicss_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!dynamicss) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
     if (!amount) return F_data_not;
 
-    if (dynamicss->size > amount) {
-      return private_f_utf_string_dynamicss_adjust(dynamicss->size - amount, dynamicss);
-    }
-
-    return private_f_utf_string_dynamicss_adjust(0, dynamicss);
+    return private_f_utf_string_dynamicss_adjust((structure->size > amount) ? structure->size - amount : 0, structure);
   }
 #endif // _di_f_utf_string_dynamicss_decimate_by_
 
 #ifndef _di_f_utf_string_dynamicss_decrease_by_
-  f_status_t f_utf_string_dynamicss_decrease_by(const f_number_unsigned_t amount, f_utf_string_dynamicss_t * const dynamicss) {
+  f_status_t f_utf_string_dynamicss_decrease_by(const f_number_unsigned_t amount, f_utf_string_dynamicss_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!dynamicss) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
     if (!amount) return F_data_not;
 
-    if (dynamicss->size > amount) {
-      return private_f_utf_string_dynamicss_resize(dynamicss->size - amount, dynamicss);
-    }
-
-    return private_f_utf_string_dynamicss_resize(0, dynamicss);
+    return private_f_utf_string_dynamicss_resize((structure->size > amount) ? structure->size - amount : 0, structure);
   }
 #endif // _di_f_utf_string_dynamicss_decrease_by_
 
 #ifndef _di_f_utf_string_dynamicss_increase_
-  f_status_t f_utf_string_dynamicss_increase(const f_number_unsigned_t step, f_utf_string_dynamicss_t * const dynamicss) {
+  f_status_t f_utf_string_dynamicss_increase(const f_number_unsigned_t step, f_utf_string_dynamicss_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!dynamicss) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
     if (!step) return F_data_not;
 
-    if (dynamicss->used + 1 > dynamicss->size) {
-      f_number_unsigned_t length = dynamicss->used + step;
+    if (structure->used + 1 > structure->size) {
+      f_number_unsigned_t length = structure->used + step;
 
       if (length > F_number_t_size_unsigned_d) {
-        if (dynamicss->used + 1 > F_number_t_size_unsigned_d) {
-          return F_status_set_error(F_array_too_large);
-        }
+        if (structure->used + 1 > F_number_t_size_unsigned_d) return F_status_set_error(F_array_too_large);
 
         length = F_number_t_size_unsigned_d;
       }
 
-      return private_f_utf_string_dynamicss_resize(length, dynamicss);
+      return private_f_utf_string_dynamicss_resize(length, structure);
     }
 
     return F_data_not;
@@ -136,20 +126,20 @@ extern "C" {
 #endif // _di_f_utf_string_dynamicss_increase_
 
 #ifndef _di_f_utf_string_dynamicss_increase_by_
-  f_status_t f_utf_string_dynamicss_increase_by(const f_number_unsigned_t amount, f_utf_string_dynamicss_t * const dynamicss) {
+  f_status_t f_utf_string_dynamicss_increase_by(const f_number_unsigned_t amount, f_utf_string_dynamicss_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!dynamicss) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
     if (amount) {
-      if (dynamicss->used >= F_number_t_size_unsigned_d) return F_status_set_error(F_array_too_large);
+      if (structure->used >= F_number_t_size_unsigned_d) return F_status_set_error(F_array_too_large);
 
-      const f_number_unsigned_t length = dynamicss->used + amount;
+      const f_number_unsigned_t length = structure->used + amount;
 
-      if (length > dynamicss->size) {
+      if (length > structure->size) {
         if (length > F_number_t_size_unsigned_d) return F_status_set_error(F_array_too_large);
 
-        return private_f_utf_string_dynamicss_resize(length, dynamicss);
+        return private_f_utf_string_dynamicss_resize(structure->used + amount, structure);
       }
     }
 
@@ -158,12 +148,12 @@ extern "C" {
 #endif // _di_f_utf_string_dynamicss_increase_by_
 
 #ifndef _di_f_utf_string_dynamicss_resize_
-  f_status_t f_utf_string_dynamicss_resize(const f_number_unsigned_t length, f_utf_string_dynamicss_t * const dynamicss) {
+  f_status_t f_utf_string_dynamicss_resize(const f_number_unsigned_t length, f_utf_string_dynamicss_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!dynamicss) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    return private_f_utf_string_dynamicss_resize(length, dynamicss);
+    return private_f_utf_string_dynamicss_resize(length, structure);
   }
 #endif // _di_f_utf_string_dynamicss_resize_
 

diff --git a/level_0/f_utf/c/utf/dynamicss.h b/level_0/f_utf/c/utf/dynamicss.h
index 603745f4a91339cf8f89923d0d69e1ff7a9699d5..cb732c90cdcbcc227b0fa4c62db0a9cd0f6880e0 100644 (file)
--- a/level_0/f_utf/c/utf/dynamicss.h
+++ b/level_0/f_utf/c/utf/dynamicss.h
@@ -5,9 +5,9 @@
  * API Version: 0.7
  * Licenses: lgpl-2.1-or-later
  *
- * Defines dynamic (and static) UTF-8 string data.
+ * Defines dynamic string data.
  *
- * This is auto-included by utf.h and should not need to be explicitly included.
+ * This is auto-included by string.h and should not need to be explicitly included.
  */
 #ifndef _F_utf_dynamicss_h
 #define _F_utf_dynamicss_h
@@ -50,7 +50,7 @@ extern "C" {
  *
  * @param length
  *   The new size to use.
- * @param dynamicss
+ * @param structure
  *   The array to resize.
  *
  * @return
@@ -61,7 +61,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_adjust().
  */
 #ifndef _di_f_utf_string_dynamicss_adjust_
-  extern f_status_t f_utf_string_dynamicss_adjust(const f_number_unsigned_t length, f_utf_string_dynamicss_t * const dynamicss);
+  extern f_status_t f_utf_string_dynamicss_adjust(const f_number_unsigned_t length, f_utf_string_dynamicss_t * const structure);
 #endif // _di_f_utf_string_dynamicss_adjust_
 
 /**
@@ -115,7 +115,7 @@ extern "C" {
  *
  * @param amount
  *   A positive number representing how much to decimate the size by.
- * @param dynamicss
+ * @param structure
  *   The array to resize.
  *
  * @return
@@ -127,7 +127,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_utf_string_dynamicss_decimate_by_
-  extern f_status_t f_utf_string_dynamicss_decimate_by(const f_number_unsigned_t amount, f_utf_string_dynamicss_t * const dynamicss);
+  extern f_status_t f_utf_string_dynamicss_decimate_by(const f_number_unsigned_t amount, f_utf_string_dynamicss_t * const structure);
 #endif // _di_f_utf_string_dynamicss_decimate_by_
 
 /**
@@ -139,7 +139,7 @@ extern "C" {
  *
  * @param amount
  *   A positive number representing how much to decrease the size by.
- * @param dynamicss
+ * @param structure
  *   The array to resize.
  *
  * @return
@@ -151,7 +151,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_utf_string_dynamicss_decrease_by_
-  extern f_status_t f_utf_string_dynamicss_decrease_by(const f_number_unsigned_t amount, f_utf_string_dynamicss_t * const dynamicss);
+  extern f_status_t f_utf_string_dynamicss_decrease_by(const f_number_unsigned_t amount, f_utf_string_dynamicss_t * const structure);
 #endif // _di_f_utf_string_dynamicss_decrease_by_
 
 /**
@@ -163,7 +163,7 @@ extern "C" {
  * @param step
  *   The allocation step to use.
  *   Must be greater than 0.
- * @param dynamicss
+ * @param structure
  *   The array to resize.
  *
  * @return
@@ -176,7 +176,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_utf_string_dynamicss_increase_
-  extern f_status_t f_utf_string_dynamicss_increase(const f_number_unsigned_t step, f_utf_string_dynamicss_t * const dynamicss);
+  extern f_status_t f_utf_string_dynamicss_increase(const f_number_unsigned_t step, f_utf_string_dynamicss_t * const structure);
 #endif // _di_f_utf_string_dynamicss_increase_
 
 /**
@@ -188,7 +188,7 @@ extern "C" {
  *
  * @param amount
  *   A positive number representing how much to increase the size by.
- * @param dynamicss
+ * @param structure
  *   The array to resize.
  *
  * @return
@@ -201,7 +201,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_utf_string_dynamicss_increase_by_
-  extern f_status_t f_utf_string_dynamicss_increase_by(const f_number_unsigned_t amount, f_utf_string_dynamicss_t * const dynamicss);
+  extern f_status_t f_utf_string_dynamicss_increase_by(const f_number_unsigned_t amount, f_utf_string_dynamicss_t * const structure);
 #endif // _di_f_utf_string_dynamicss_increase_by_
 
 /**
@@ -209,7 +209,7 @@ extern "C" {
  *
  * @param length
  *   The new size to use.
- * @param dynamicss
+ * @param structure
  *   The array to resize.
  *
  * @return
@@ -220,7 +220,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_utf_string_dynamicss_resize_
-  extern f_status_t f_utf_string_dynamicss_resize(const f_number_unsigned_t length, f_utf_string_dynamicss_t * const dynamicss);
+  extern f_status_t f_utf_string_dynamicss_resize(const f_number_unsigned_t length, f_utf_string_dynamicss_t * const structure);
 #endif // _di_f_utf_string_dynamicss_resize_
 
 #ifdef __cplusplus

diff --git a/level_0/f_utf/c/utf/is.c b/level_0/f_utf/c/utf/is.c
index 15bc24d4344e5d2dfb2704d91a55c7b75876025f..d9a8e071092caf5ed420c696ae2516742175f35b 100644 (file)
--- a/level_0/f_utf/c/utf/is.c
+++ b/level_0/f_utf/c/utf/is.c
@@ -315,18 +315,11 @@ extern "C" {
         if (F_status_is_error(status)) return status;
       }
 
-      if (private_f_utf_character_is_control(utf)) {
-        return F_false;
-      }
-
-      if (private_f_utf_character_is_whitespace(utf, F_true)) {
-        return F_false;
-      }
+      if (private_f_utf_character_is_control(utf)) return F_false;
+      if (private_f_utf_character_is_whitespace(utf, F_true)) return F_false;
 
       // Zero-width characters are be treated as a non-graph.
-      if (private_f_utf_character_is_zero_width(utf)) {
-        return F_false;
-      }
+      if (private_f_utf_character_is_zero_width(utf)) return F_false;
 
       return F_true;
     }
@@ -430,34 +423,22 @@ extern "C" {
     }
 
     // ASCII: U+0021 '!' to U+0023 '#'.
-    if (sequence[0] > 0x20 && sequence[0] < 0x24) {
-      return F_true;
-    }
+    if (sequence[0] > 0x20 && sequence[0] < 0x24) return F_true;
 
     // ASCII: U+0025 '%' to U+002A '*'.
-    if (sequence[0] > 0x24 && sequence[0] < 0x2b) {
-      return F_true;
-    }
+    if (sequence[0] > 0x24 && sequence[0] < 0x2b) return F_true;
 
     // ASCII: U+002C ',' to U+002F '/'.
-    if (sequence[0] > 0x2b && sequence[0] < 0x30) {
-      return F_true;
-    }
+    if (sequence[0] > 0x2b && sequence[0] < 0x30) return F_true;
 
     // ASCII: U+003A ':', U+003B ';', U+003F '?', or U+0040 '@'.
-    if (sequence[0] == 0x3a || sequence[0] == 0x3b || sequence[0] == 0x3f || sequence[0] == 0x40) {
-      return F_true;
-    }
+    if (sequence[0] == 0x3a || sequence[0] == 0x3b || sequence[0] == 0x3f || sequence[0] == 0x40) return F_true;
 
     // ASCII: U+005B '[' to U+005D ']'.
-    if (sequence[0] > 0x5a && sequence[0] < 0x5e) {
-      return F_true;
-    }
+    if (sequence[0] > 0x5a && sequence[0] < 0x5e) return F_true;
 
     // ASCII: U+005F '_', U+007B '{', or U+007D '}'.
-    if (sequence[0] == 0x5f || sequence[0] == 0x7b || sequence[0] == 0x7d) {
-      return F_true;
-    }
+    if (sequence[0] == 0x5f || sequence[0] == 0x7b || sequence[0] == 0x7d) return F_true;
 
     return F_false;
   }
@@ -529,19 +510,13 @@ extern "C" {
     }
 
     // ASCII: U+0024 ('$') or U+002B ('+').
-    if (sequence[0] == 0x24 || sequence[0] == 0x2b) {
-      return F_true;
-    }
+    if (sequence[0] == 0x24 || sequence[0] == 0x2b) return F_true;
 
     // ASCII: U+003C ('<') to U+003E ('>').
-    if (sequence[0] >= 0x3c && sequence[0] <= 0x3e) {
-      return F_true;
-    }
+    if (sequence[0] >= 0x3c && sequence[0] <= 0x3e) return F_true;
 
     // ASCII: U+005E ('^'), U+0060 ('`'), U+007C ('|'), or U+007E ('~').
-    if (sequence[0] == 0x5e || sequence[0] == 0x60 || sequence[0] == 0x7c || sequence[0] == 0x7e) {
-      return F_true;
-    }
+    if (sequence[0] == 0x5e || sequence[0] == 0x60 || sequence[0] == 0x7c || sequence[0] == 0x7e) return F_true;
 
     return F_false;
   }
@@ -733,9 +708,7 @@ extern "C" {
       return private_f_utf_character_is_word(utf, strict);
     }
 
-    if (isalnum(*sequence) || *sequence == f_string_ascii_underscore_s.string[0]) {
-      return F_true;
-    }
+    if (isalnum(*sequence) || *sequence == f_string_ascii_underscore_s.string[0]) return F_true;
 
     return F_false;
   }
@@ -760,9 +733,7 @@ extern "C" {
       return private_f_utf_character_is_word_dash(utf, strict);
     }
 
-    if (isalnum(*sequence) || *sequence == f_string_ascii_underscore_s.string[0] || *sequence == f_string_ascii_minus_s.string[0]) {
-      return F_true;
-    }
+    if (isalnum(*sequence) || *sequence == f_string_ascii_underscore_s.string[0] || *sequence == f_string_ascii_minus_s.string[0]) return F_true;
 
     return F_false;
   }
@@ -787,9 +758,7 @@ extern "C" {
       return private_f_utf_character_is_word_dash_plus(utf, strict);
     }
 
-    if (isalnum(*sequence) || *sequence == f_string_ascii_underscore_s.string[0] || *sequence == f_string_ascii_minus_s.string[0] || *sequence == f_string_ascii_plus_s.string[0]) {
-      return F_true;
-    }
+    if (isalnum(*sequence) || *sequence == f_string_ascii_underscore_s.string[0] || *sequence == f_string_ascii_minus_s.string[0] || *sequence == f_string_ascii_plus_s.string[0]) return F_true;
 
     return F_false;
   }

diff --git a/level_0/f_utf/c/utf/is_character.c b/level_0/f_utf/c/utf/is_character.c
index 4050abc38efed1bc86c60d178de47dbba3d2e782..d8abd13b3a20636bca65bc3bf1109eb7c50907ec 100644 (file)
--- a/level_0/f_utf/c/utf/is_character.c
+++ b/level_0/f_utf/c/utf/is_character.c
@@ -27,9 +27,7 @@ extern "C" {
   f_status_t f_utf_character_is(const f_utf_char_t sequence) {
 
     if (macro_f_utf_char_t_width_is(sequence)) {
-      if (macro_f_utf_char_t_width_is(sequence) == 1) {
-        return F_utf_fragment;
-      }
+      if (macro_f_utf_char_t_width_is(sequence) == 1) return F_utf_fragment;
 
       return F_true;
     }
@@ -42,16 +40,12 @@ extern "C" {
   f_status_t f_utf_character_is_alphabetic(const f_utf_char_t sequence) {
 
     if (macro_f_utf_char_t_width_is(sequence)) {
-      if (macro_f_utf_char_t_width_is(sequence) == 1) {
-        return F_status_set_error(F_utf_fragment);
-      }
+      if (macro_f_utf_char_t_width_is(sequence) == 1) return F_status_set_error(F_utf_fragment);
 
       return private_f_utf_character_is_alphabetic(sequence);
     }
 
-    if (isalpha(macro_f_utf_char_t_to_char_1(sequence))) {
-      return F_true;
-    }
+    if (isalpha(macro_f_utf_char_t_to_char_1(sequence))) return F_true;
 
     return F_false;
   }
@@ -61,9 +55,7 @@ extern "C" {
   f_status_t f_utf_character_is_alphabetic_digit(const f_utf_char_t sequence, uint64_t * const value) {
 
     if (macro_f_utf_char_t_width_is(sequence)) {
-      if (macro_f_utf_char_t_width_is(sequence) == 1) {
-        return F_status_set_error(F_utf_fragment);
-      }
+      if (macro_f_utf_char_t_width_is(sequence) == 1) return F_status_set_error(F_utf_fragment);
 
       return private_f_utf_character_is_alphabetic_digit(sequence, value);
     }
@@ -78,16 +70,12 @@ extern "C" {
   f_status_t f_utf_character_is_alphabetic_numeric(const f_utf_char_t sequence) {
 
     if (macro_f_utf_char_t_width_is(sequence)) {
-      if (macro_f_utf_char_t_width_is(sequence) == 1) {
-        return F_status_set_error(F_utf_fragment);
-      }
+      if (macro_f_utf_char_t_width_is(sequence) == 1) return F_status_set_error(F_utf_fragment);
 
       return private_f_utf_character_is_alphabetic_numeric(sequence);
     }
 
-    if (isalnum(macro_f_utf_char_t_to_char_1(sequence))) {
-      return F_true;
-    }
+    if (isalnum(macro_f_utf_char_t_to_char_1(sequence))) return F_true;
 
     return F_false;
   }
@@ -96,9 +84,7 @@ extern "C" {
 #ifndef _di_f_utf_character_is_ascii_
   f_status_t f_utf_character_is_ascii(const f_utf_char_t sequence) {
 
-    if (macro_f_utf_char_t_width_is(sequence)) {
-      return F_false;
-    }
+    if (macro_f_utf_char_t_width_is(sequence)) return F_false;
 
     return F_true;
   }
@@ -108,9 +94,7 @@ extern "C" {
   f_status_t f_utf_character_is_combining(const f_utf_char_t sequence) {
 
     if (macro_f_utf_char_t_width_is(sequence)) {
-      if (macro_f_utf_char_t_width_is(sequence) == 1) {
-        return F_status_set_error(F_utf_fragment);
-      }
+      if (macro_f_utf_char_t_width_is(sequence) == 1) return F_status_set_error(F_utf_fragment);
 
       return private_f_utf_character_is_combining(sequence);
     }
@@ -124,16 +108,12 @@ extern "C" {
   f_status_t f_utf_character_is_control(const f_utf_char_t sequence) {
 
     if (macro_f_utf_char_t_width_is(sequence)) {
-      if (macro_f_utf_char_t_width_is(sequence) == 1) {
-        return F_status_set_error(F_utf_fragment);
-      }
+      if (macro_f_utf_char_t_width_is(sequence) == 1) return F_status_set_error(F_utf_fragment);
 
       return private_f_utf_character_is_control(sequence);
     }
 
-    if (iscntrl(macro_f_utf_char_t_to_char_1(sequence))) {
-      return F_true;
-    }
+    if (iscntrl(macro_f_utf_char_t_to_char_1(sequence))) return F_true;
 
     return F_false;
   }
@@ -143,16 +123,12 @@ extern "C" {
   f_status_t f_utf_character_is_control_code(const f_utf_char_t sequence) {
 
     if (macro_f_utf_char_t_width_is(sequence)) {
-      if (macro_f_utf_char_t_width_is(sequence) == 1) {
-        return F_status_set_error(F_utf_fragment);
-      }
+      if (macro_f_utf_char_t_width_is(sequence) == 1) return F_status_set_error(F_utf_fragment);
 
       return private_f_utf_character_is_control_code(sequence);
     }
 
-    if (iscntrl(macro_f_utf_char_t_to_char_1(sequence))) {
-      return F_true;
-    }
+    if (iscntrl(macro_f_utf_char_t_to_char_1(sequence))) return F_true;
 
     return F_false;
   }
@@ -162,9 +138,7 @@ extern "C" {
   f_status_t f_utf_character_is_control_format(const f_utf_char_t sequence) {
 
     if (macro_f_utf_char_t_width_is(sequence)) {
-      if (macro_f_utf_char_t_width_is(sequence) == 1) {
-        return F_status_set_error(F_utf_fragment);
-      }
+      if (macro_f_utf_char_t_width_is(sequence) == 1) return F_status_set_error(F_utf_fragment);
 
       return private_f_utf_character_is_control_format(sequence);
     }
@@ -178,9 +152,7 @@ extern "C" {
   f_status_t f_utf_character_is_control_picture(const f_utf_char_t sequence) {
 
     if (macro_f_utf_char_t_width_is(sequence)) {
-      if (macro_f_utf_char_t_width_is(sequence) == 1) {
-        return F_status_set_error(F_utf_fragment);
-      }
+      if (macro_f_utf_char_t_width_is(sequence) == 1) return F_status_set_error(F_utf_fragment);
 
       return private_f_utf_character_is_control_picture(sequence);
     }
@@ -194,9 +166,7 @@ extern "C" {
   f_status_t f_utf_character_is_digit(const f_utf_char_t sequence, uint64_t * const value) {
 
     if (macro_f_utf_char_t_width_is(sequence)) {
-      if (macro_f_utf_char_t_width_is(sequence) == 1) {
-        return F_status_set_error(F_utf_fragment);
-      }
+      if (macro_f_utf_char_t_width_is(sequence) == 1) return F_status_set_error(F_utf_fragment);
 
       return private_f_utf_character_is_digit(sequence, value);
     }
@@ -209,9 +179,7 @@ extern "C" {
   f_status_t f_utf_character_is_emoji(const f_utf_char_t sequence) {
 
     if (macro_f_utf_char_t_width_is(sequence)) {
-      if (macro_f_utf_char_t_width_is(sequence) == 1) {
-        return F_status_set_error(F_utf_fragment);
-      }
+      if (macro_f_utf_char_t_width_is(sequence) == 1) return F_status_set_error(F_utf_fragment);
 
       return private_f_utf_character_is_emoji(sequence);
     }
@@ -231,28 +199,15 @@ extern "C" {
   f_status_t f_utf_character_is_graph(const f_utf_char_t sequence) {
 
     if (macro_f_utf_char_t_width_is(sequence)) {
-      if (macro_f_utf_char_t_width_is(sequence) == 1) {
-        return F_status_set_error(F_utf_fragment);
-      }
-
-      if (private_f_utf_character_is_control(sequence)) {
-        return F_false;
-      }
-
-      if (private_f_utf_character_is_whitespace(sequence, F_true)) {
-        return F_false;
-      }
-
-      if (private_f_utf_character_is_zero_width(sequence)) {
-        return F_false;
-      }
+      if (macro_f_utf_char_t_width_is(sequence) == 1) return F_status_set_error(F_utf_fragment);
+      if (private_f_utf_character_is_control(sequence)) return F_false;
+      if (private_f_utf_character_is_whitespace(sequence, F_true)) return F_false;
+      if (private_f_utf_character_is_zero_width(sequence)) return F_false;
 
       return F_true;
     }
 
-    if (isgraph(macro_f_utf_char_t_to_char_1(sequence))) {
-      return F_true;
-    }
+    if (isgraph(macro_f_utf_char_t_to_char_1(sequence))) return F_true;
 
     return F_false;
   }
@@ -262,16 +217,12 @@ extern "C" {
   f_status_t f_utf_character_is_numeric(const f_utf_char_t sequence) {
 
     if (macro_f_utf_char_t_width_is(sequence)) {
-      if (macro_f_utf_char_t_width_is(sequence) == 1) {
-        return F_status_set_error(F_utf_fragment);
-      }
+      if (macro_f_utf_char_t_width_is(sequence) == 1) return F_status_set_error(F_utf_fragment);
 
       return private_f_utf_character_is_numeric(sequence);
     }
 
-    if (isdigit(macro_f_utf_char_t_to_char_1(sequence))) {
-      return F_true;
-    }
+    if (isdigit(macro_f_utf_char_t_to_char_1(sequence))) return F_true;
 
     return F_false;
   }
@@ -281,9 +232,7 @@ extern "C" {
   f_status_t f_utf_character_is_phonetic(const f_utf_char_t sequence) {
 
     if (macro_f_utf_char_t_width_is(sequence)) {
-      if (macro_f_utf_char_t_width_is(sequence) == 1) {
-        return F_status_set_error(F_utf_fragment);
-      }
+      if (macro_f_utf_char_t_width_is(sequence) == 1) return F_status_set_error(F_utf_fragment);
 
       return private_f_utf_character_is_phonetic(sequence);
     }
@@ -297,9 +246,7 @@ extern "C" {
   f_status_t f_utf_character_is_private(const f_utf_char_t sequence) {
 
     if (macro_f_utf_char_t_width_is(sequence)) {
-      if (macro_f_utf_char_t_width_is(sequence) == 1) {
-        return F_status_set_error(F_utf_fragment);
-      }
+      if (macro_f_utf_char_t_width_is(sequence) == 1) return F_status_set_error(F_utf_fragment);
 
       return private_f_utf_character_is_private(sequence);
     }
@@ -313,42 +260,28 @@ extern "C" {
   f_status_t f_utf_character_is_punctuation(const f_utf_char_t sequence) {
 
     if (macro_f_utf_char_t_width_is(sequence)) {
-      if (macro_f_utf_char_t_width_is(sequence) == 1) {
-        return F_status_set_error(F_utf_fragment);
-      }
+      if (macro_f_utf_char_t_width_is(sequence) == 1) return F_status_set_error(F_utf_fragment);
 
       return private_f_utf_character_is_punctuation(sequence);
     }
 
     // ASCII: U+0021 '!' to U+0023 '#'.
-    if (sequence > 0x20000000 && sequence < 0x24000000) {
-      return F_true;
-    }
+    if (sequence > 0x20000000 && sequence < 0x24000000) return F_true;
 
     // ASCII: U+0025 '%' to U+002A '*'.
-    if (sequence > 0x24000000 && sequence < 0x2b000000) {
-      return F_true;
-    }
+    if (sequence > 0x24000000 && sequence < 0x2b000000) return F_true;
 
     // ASCII: U+002C ',' to U+002F '/'.
-    if (sequence > 0x2b000000 && sequence < 0x30000000) {
-      return F_true;
-    }
+    if (sequence > 0x2b000000 && sequence < 0x30000000) return F_true;
 
     // ASCII: U+003A ':', U+003B ';', U+003F '?', or U+0040 '@'.
-    if (sequence == 0x3a000000 || sequence == 0x3b000000 || sequence == 0x3f000000 || sequence == 0x40000000) {
-      return F_true;
-    }
+    if (sequence == 0x3a000000 || sequence == 0x3b000000 || sequence == 0x3f000000 || sequence == 0x40000000) return F_true;
 
     // ASCII: U+005B '[' to U+005D ']'.
-    if (sequence > 0x5a000000 && sequence < 0x5e000000) {
-      return F_true;
-    }
+    if (sequence > 0x5a000000 && sequence < 0x5e000000) return F_true;
 
     // ASCII: U+005F '_', U+007B '{', or U+007D '}'.
-    if (sequence == 0x5f000000 || sequence == 0x7b000000 || sequence == 0x7d000000) {
-      return F_true;
-    }
+    if (sequence == 0x5f000000 || sequence == 0x7b000000 || sequence == 0x7d000000) return F_true;
 
     return F_false;
   }
@@ -358,9 +291,7 @@ extern "C" {
   f_status_t f_utf_character_is_subscript(const f_utf_char_t sequence) {
 
     if (macro_f_utf_char_t_width_is(sequence)) {
-      if (macro_f_utf_char_t_width_is(sequence) == 1) {
-        return F_status_set_error(F_utf_fragment);
-      }
+      if (macro_f_utf_char_t_width_is(sequence) == 1) return F_status_set_error(F_utf_fragment);
 
       return private_f_utf_character_is_subscript(sequence);
     }
@@ -373,9 +304,7 @@ extern "C" {
   f_status_t f_utf_character_is_superscript(const f_utf_char_t sequence) {
 
     if (macro_f_utf_char_t_width_is(sequence)) {
-      if (macro_f_utf_char_t_width_is(sequence) == 1) {
-        return F_status_set_error(F_utf_fragment);
-      }
+      if (macro_f_utf_char_t_width_is(sequence) == 1) return F_status_set_error(F_utf_fragment);
 
       return private_f_utf_character_is_superscript(sequence);
     }
@@ -388,27 +317,19 @@ extern "C" {
   f_status_t f_utf_character_is_symbol(const f_utf_char_t sequence) {
 
     if (macro_f_utf_char_t_width_is(sequence)) {
-      if (macro_f_utf_char_t_width_is(sequence) == 1) {
-        return F_status_set_error(F_utf_fragment);
-      }
+      if (macro_f_utf_char_t_width_is(sequence) == 1) return F_status_set_error(F_utf_fragment);
 
       return private_f_utf_character_is_symbol(sequence);
     }
 
     // ASCII: U+0024 ('$') or U+002B ('+').
-    if (sequence == 0x24000000 || sequence == 0x2b000000) {
-      return F_true;
-    }
+    if (sequence == 0x24000000 || sequence == 0x2b000000) return F_true;
 
     // ASCII: U+003C ('<') to U+003E ('>').
-    if (sequence >= 0x3c000000 && sequence <= 0x3e000000) {
-      return F_true;
-    }
+    if (sequence >= 0x3c000000 && sequence <= 0x3e000000) return F_true;
 
     // ASCII: U+005E ('^'), U+0060 ('`'), U+007C ('|'), or U+007E ('~').
-    if (sequence == 0x5e000000 || sequence == 0x60000000 || sequence == 0x7c000000 || sequence == 0x7e000000) {
-      return F_true;
-    }
+    if (sequence == 0x5e000000 || sequence == 0x60000000 || sequence == 0x7c000000 || sequence == 0x7e000000) return F_true;
 
     return F_false;
   }
@@ -418,9 +339,7 @@ extern "C" {
   f_status_t f_utf_character_is_unassigned(const f_utf_char_t sequence) {
 
     if (macro_f_utf_char_t_width_is(sequence)) {
-      if (macro_f_utf_char_t_width_is(sequence) == 1) {
-        return F_status_set_error(F_utf_fragment);
-      }
+      if (macro_f_utf_char_t_width_is(sequence) == 1) return F_status_set_error(F_utf_fragment);
 
       return private_f_utf_character_is_unassigned(sequence);
     }
@@ -441,16 +360,12 @@ extern "C" {
   f_status_t f_utf_character_is_whitespace(const f_utf_char_t sequence, const bool strict) {
 
     if (macro_f_utf_char_t_width_is(sequence)) {
-      if (macro_f_utf_char_t_width_is(sequence) == 1) {
-        return F_status_set_error(F_utf_fragment);
-      }
+      if (macro_f_utf_char_t_width_is(sequence) == 1) return F_status_set_error(F_utf_fragment);
 
       return private_f_utf_character_is_whitespace(sequence, strict);
     }
 
-    if (isspace(macro_f_utf_char_t_to_char_1(sequence))) {
-      return F_true;
-    }
+    if (isspace(macro_f_utf_char_t_to_char_1(sequence))) return F_true;
 
     return F_false;
   }
@@ -460,9 +375,7 @@ extern "C" {
   f_status_t f_utf_character_is_whitespace_modifier(const f_utf_char_t sequence) {
 
     if (macro_f_utf_char_t_width_is(sequence)) {
-      if (macro_f_utf_char_t_width_is(sequence) == 1) {
-        return F_status_set_error(F_utf_fragment);
-      }
+      if (macro_f_utf_char_t_width_is(sequence) == 1) return F_status_set_error(F_utf_fragment);
 
       return private_f_utf_character_is_whitespace_modifier(sequence);
     }
@@ -476,9 +389,7 @@ extern "C" {
   f_status_t f_utf_character_is_whitespace_other(const f_utf_char_t sequence) {
 
     if (macro_f_utf_char_t_width_is(sequence)) {
-      if (macro_f_utf_char_t_width_is(sequence) == 1) {
-        return F_status_set_error(F_utf_fragment);
-      }
+      if (macro_f_utf_char_t_width_is(sequence) == 1) return F_status_set_error(F_utf_fragment);
 
       return private_f_utf_character_is_whitespace_other(sequence);
     }
@@ -492,9 +403,7 @@ extern "C" {
   f_status_t f_utf_character_is_whitespace_zero_width(const f_utf_char_t sequence) {
 
     if (macro_f_utf_char_t_width_is(sequence)) {
-      if (macro_f_utf_char_t_width_is(sequence) == 1) {
-        return F_status_set_error(F_utf_fragment);
-      }
+      if (macro_f_utf_char_t_width_is(sequence) == 1) return F_status_set_error(F_utf_fragment);
 
       return private_f_utf_character_is_whitespace_zero_width(sequence);
     }
@@ -508,9 +417,7 @@ extern "C" {
   f_status_t f_utf_character_is_wide(const f_utf_char_t sequence) {
 
     if (macro_f_utf_char_t_width_is(sequence)) {
-      if (macro_f_utf_char_t_width_is(sequence) == 1) {
-        return F_status_set_error(F_utf_fragment);
-      }
+      if (macro_f_utf_char_t_width_is(sequence) == 1) return F_status_set_error(F_utf_fragment);
 
       return private_f_utf_character_is_wide(sequence);
     }
@@ -524,16 +431,12 @@ extern "C" {
   f_status_t f_utf_character_is_word(const f_utf_char_t sequence, const bool strict) {
 
     if (macro_f_utf_char_t_width_is(sequence)) {
-      if (macro_f_utf_char_t_width_is(sequence) == 1) {
-        return F_status_set_error(F_utf_fragment);
-      }
+      if (macro_f_utf_char_t_width_is(sequence) == 1) return F_status_set_error(F_utf_fragment);
 
       return private_f_utf_character_is_word(sequence, strict);
     }
 
-    if (isalnum(macro_f_utf_char_t_to_char_1(sequence)) || macro_f_utf_char_t_to_char_1(sequence) == f_string_ascii_underscore_s.string[0]) {
-      return F_true;
-    }
+    if (isalnum(macro_f_utf_char_t_to_char_1(sequence)) || macro_f_utf_char_t_to_char_1(sequence) == f_string_ascii_underscore_s.string[0]) return F_true;
 
     return F_false;
   }
@@ -543,16 +446,12 @@ extern "C" {
   f_status_t f_utf_character_is_word_dash(const f_utf_char_t sequence, const bool strict) {
 
     if (macro_f_utf_char_t_width_is(sequence)) {
-      if (macro_f_utf_char_t_width_is(sequence) == 1) {
-        return F_status_set_error(F_utf_fragment);
-      }
+      if (macro_f_utf_char_t_width_is(sequence) == 1) return F_status_set_error(F_utf_fragment);
 
       return private_f_utf_character_is_word_dash(sequence, strict);
     }
 
-    if (isalnum(macro_f_utf_char_t_to_char_1(sequence)) || macro_f_utf_char_t_to_char_1(sequence) == f_string_ascii_underscore_s.string[0] || macro_f_utf_char_t_to_char_1(sequence) == f_string_ascii_minus_s.string[0]) {
-      return F_true;
-    }
+    if (isalnum(macro_f_utf_char_t_to_char_1(sequence)) || macro_f_utf_char_t_to_char_1(sequence) == f_string_ascii_underscore_s.string[0] || macro_f_utf_char_t_to_char_1(sequence) == f_string_ascii_minus_s.string[0]) return F_true;
 
     return F_false;
   }
@@ -562,16 +461,12 @@ extern "C" {
   f_status_t f_utf_character_is_word_dash_plus(const f_utf_char_t sequence, const bool strict) {
 
     if (macro_f_utf_char_t_width_is(sequence)) {
-      if (macro_f_utf_char_t_width_is(sequence) == 1) {
-        return F_status_set_error(F_utf_fragment);
-      }
+      if (macro_f_utf_char_t_width_is(sequence) == 1) return F_status_set_error(F_utf_fragment);
 
       return private_f_utf_character_is_word_dash_plus(sequence, strict);
     }
 
-    if (isalnum(macro_f_utf_char_t_to_char_1(sequence)) || macro_f_utf_char_t_to_char_1(sequence) == f_string_ascii_underscore_s.string[0] || macro_f_utf_char_t_to_char_1(sequence) == f_string_ascii_minus_s.string[0] || macro_f_utf_char_t_to_char_1(sequence) == f_string_ascii_plus_s.string[0]) {
-      return F_true;
-    }
+    if (isalnum(macro_f_utf_char_t_to_char_1(sequence)) || macro_f_utf_char_t_to_char_1(sequence) == f_string_ascii_underscore_s.string[0] || macro_f_utf_char_t_to_char_1(sequence) == f_string_ascii_minus_s.string[0] || macro_f_utf_char_t_to_char_1(sequence) == f_string_ascii_plus_s.string[0]) return F_true;
 
     return F_false;
   }
@@ -581,9 +476,7 @@ extern "C" {
   f_status_t f_utf_character_is_zero_width(const f_utf_char_t sequence) {
 
     if (macro_f_utf_char_t_width_is(sequence)) {
-      if (macro_f_utf_char_t_width_is(sequence) == 1) {
-        return F_status_set_error(F_utf_fragment);
-      }
+      if (macro_f_utf_char_t_width_is(sequence) == 1) return F_status_set_error(F_utf_fragment);
 
       // Control and combining characters are zero-width.
       if (private_f_utf_character_is_control(sequence)) return F_true;
@@ -593,15 +486,9 @@ extern "C" {
     }
 
     // These control characters are considered zero-width spaces.
-    if (macro_f_utf_char_t_to_char_1(sequence) >= 0x00 && macro_f_utf_char_t_to_char_1(sequence) < 0x09) {
-      return F_true;
-    }
-    else if (macro_f_utf_char_t_to_char_1(sequence) > 0x0b && macro_f_utf_char_t_to_char_1(sequence) < 0x20) {
-      return F_true;
-    }
-    else if (macro_f_utf_char_t_to_char_1(sequence) == 0x7f) {
-      return F_true;
-    }
+    if (macro_f_utf_char_t_to_char_1(sequence) >= 0x00 && macro_f_utf_char_t_to_char_1(sequence) < 0x09) return F_true;
+    if (macro_f_utf_char_t_to_char_1(sequence) > 0x0b && macro_f_utf_char_t_to_char_1(sequence) < 0x20) return F_true;
+    if (macro_f_utf_char_t_to_char_1(sequence) == 0x7f) return F_true;
 
     return F_false;
   }

diff --git a/level_0/f_utf/c/utf/map.c b/level_0/f_utf/c/utf/map.c
index 707d9106d06b776b26b77f430f3c55da8fb87cd1..170d4a4b7992a3019291ee438f430fa47eeb2c7b 100644 (file)
--- a/level_0/f_utf/c/utf/map.c
+++ b/level_0/f_utf/c/utf/map.c
@@ -1,6 +1,5 @@
 #include "../utf.h"
 #include "../private-utf.h"
-#include "private-string.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_utf/c/utf/map.h b/level_0/f_utf/c/utf/map.h
index e7fd4b2c3f503f5b55c2a413f9b8960aecd4f361..5f37749b7e4be7a0dcdb0982aed4fa89a0f1ce16 100644 (file)
--- a/level_0/f_utf/c/utf/map.h
+++ b/level_0/f_utf/c/utf/map.h
@@ -5,9 +5,9 @@
  * API Version: 0.7
  * Licenses: lgpl-2.1-or-later
  *
- * Defines map UTF-8 string data.
+ * Defines map string data.
  *
- * This is auto-included by utf.h and should not need to be explicitly included.
+ * This is auto-included by string.h and should not need to be explicitly included.
  */
 #ifndef _F_utf_map_h
 #define _F_utf_map_h

diff --git a/level_0/f_utf/c/utf/map_multi.c b/level_0/f_utf/c/utf/map_multi.c
index 707d9106d06b776b26b77f430f3c55da8fb87cd1..170d4a4b7992a3019291ee438f430fa47eeb2c7b 100644 (file)
--- a/level_0/f_utf/c/utf/map_multi.c
+++ b/level_0/f_utf/c/utf/map_multi.c
@@ -1,6 +1,5 @@
 #include "../utf.h"
 #include "../private-utf.h"
-#include "private-string.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_utf/c/utf/map_multi.h b/level_0/f_utf/c/utf/map_multi.h
index 68e6ad4676afa1476ec3c49e1f28c9b44feedd9c..d29e403f6d0dfc82419cf3d895c3ebe5f341d9cf 100644 (file)
--- a/level_0/f_utf/c/utf/map_multi.h
+++ b/level_0/f_utf/c/utf/map_multi.h
@@ -1,7 +1,7 @@
 /**
  * FLL - Level 0
  *
- * Project: String
+ * Project: UTF
  * API Version: 0.7
  * Licenses: lgpl-2.1-or-later
  *

diff --git a/level_0/f_utf/c/utf/map_multis.c b/level_0/f_utf/c/utf/map_multis.c
index ba568536649f5688db4130fbecb24512df777556..285ac9d828d14f4eef5c0156905451ef1090ff35 100644 (file)
--- a/level_0/f_utf/c/utf/map_multis.c
+++ b/level_0/f_utf/c/utf/map_multis.c
@@ -10,12 +10,12 @@ extern "C" {
 #endif
 
 #ifndef _di_f_utf_string_map_multis_adjust_
-  f_status_t f_utf_string_map_multis_adjust(const f_number_unsigned_t length, f_utf_string_map_multis_t * const map_multis) {
+  f_status_t f_utf_string_map_multis_adjust(const f_number_unsigned_t length, f_utf_string_map_multis_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!map_multis) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    return private_f_utf_string_map_multis_adjust(length, map_multis);
+    return private_f_utf_string_map_multis_adjust(length, structure);
   }
 #endif // _di_f_utf_string_map_multis_adjust_
 
@@ -64,55 +64,45 @@ extern "C" {
 #endif // _di_f_utf_string_map_multis_append_all_
 
 #ifndef _di_f_utf_string_map_multis_decimate_by_
-  f_status_t f_utf_string_map_multis_decimate_by(const f_number_unsigned_t amount, f_utf_string_map_multis_t * const map_multis) {
+  f_status_t f_utf_string_map_multis_decimate_by(const f_number_unsigned_t amount, f_utf_string_map_multis_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!map_multis) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
     if (!amount) return F_data_not;
 
-    if (map_multis->size > amount) {
-      return private_f_utf_string_map_multis_adjust(map_multis->size - amount, map_multis);
-    }
-
-    return private_f_utf_string_map_multis_adjust(0, map_multis);
+    return private_f_utf_string_map_multis_adjust((structure->size > amount) ? structure->size - amount : 0, structure);
   }
 #endif // _di_f_utf_string_map_multis_decimate_by_
 
 #ifndef _di_f_utf_string_map_multis_decrease_by_
-  f_status_t f_utf_string_map_multis_decrease_by(const f_number_unsigned_t amount, f_utf_string_map_multis_t * const map_multis) {
+  f_status_t f_utf_string_map_multis_decrease_by(const f_number_unsigned_t amount, f_utf_string_map_multis_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!map_multis) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
     if (!amount) return F_data_not;
 
-    if (map_multis->size > amount) {
-      return private_f_utf_string_map_multis_resize(map_multis->size - amount, map_multis);
-    }
-
-    return private_f_utf_string_map_multis_resize(0, map_multis);
+    return private_f_utf_string_map_multis_resize((structure->size > amount) ? structure->size - amount : 0, structure);
   }
 #endif // _di_f_utf_string_map_multis_decrease_by_
 
 #ifndef _di_f_utf_string_map_multis_increase_
-  f_status_t f_utf_string_map_multis_increase(const f_number_unsigned_t step, f_utf_string_map_multis_t * const map_multis) {
+  f_status_t f_utf_string_map_multis_increase(const f_number_unsigned_t step, f_utf_string_map_multis_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!map_multis) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    if (step && map_multis->used + 1 > map_multis->size) {
-      f_number_unsigned_t length = map_multis->used + step;
+    if (step && structure->used + 1 > structure->size) {
+      f_number_unsigned_t length = structure->used + step;
 
       if (length > F_number_t_size_unsigned_d) {
-        if (map_multis->used + 1 > F_number_t_size_unsigned_d) {
-          return F_status_set_error(F_array_too_large);
-        }
+        if (structure->used + 1 > F_number_t_size_unsigned_d) return F_status_set_error(F_array_too_large);
 
         length = F_number_t_size_unsigned_d;
       }
 
-      return private_f_utf_string_map_multis_resize(length, map_multis);
+      return private_f_utf_string_map_multis_resize(length, structure);
     }
 
     return F_data_not;
@@ -120,20 +110,20 @@ extern "C" {
 #endif // _di_f_utf_string_map_multis_increase_
 
 #ifndef _di_f_utf_string_map_multis_increase_by_
-  f_status_t f_utf_string_map_multis_increase_by(const f_number_unsigned_t amount, f_utf_string_map_multis_t * const map_multis) {
+  f_status_t f_utf_string_map_multis_increase_by(const f_number_unsigned_t amount, f_utf_string_map_multis_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!map_multis) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
     if (amount) {
-      if (map_multis->used >= F_number_t_size_unsigned_d) return F_status_set_error(F_array_too_large);
+      if (structure->used >= F_number_t_size_unsigned_d) return F_status_set_error(F_array_too_large);
 
-      const f_number_unsigned_t length = map_multis->used + amount;
+      const f_number_unsigned_t length = structure->used + amount;
 
-      if (length > map_multis->size) {
+      if (length > structure->size) {
         if (length > F_number_t_size_unsigned_d) return F_status_set_error(F_array_too_large);
 
-        return private_f_utf_string_map_multis_resize(length, map_multis);
+        return private_f_utf_string_map_multis_resize(length, structure);
       }
     }
 
@@ -142,12 +132,12 @@ extern "C" {
 #endif // _di_f_utf_string_map_multis_increase_by_
 
 #ifndef _di_f_utf_string_map_multis_resize_
-  f_status_t f_utf_string_map_multis_resize(const f_number_unsigned_t length, f_utf_string_map_multis_t * const map_multis) {
+  f_status_t f_utf_string_map_multis_resize(const f_number_unsigned_t length, f_utf_string_map_multis_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!map_multis) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    return private_f_utf_string_map_multis_resize(length, map_multis);
+    return private_f_utf_string_map_multis_resize(length, structure);
   }
 #endif // _di_f_utf_string_map_multis_resize_
 

diff --git a/level_0/f_utf/c/utf/map_multis.h b/level_0/f_utf/c/utf/map_multis.h
index 743b0075562d2aae13076378b9718c03546a9ee0..3a2df6a0ba7d718997c96cbe331a39bd26d14486 100644 (file)
--- a/level_0/f_utf/c/utf/map_multis.h
+++ b/level_0/f_utf/c/utf/map_multis.h
@@ -1,7 +1,7 @@
 /**
  * FLL - Level 0
  *
- * Project: String
+ * Project: UTF
  * API Version: 0.7
  * Licenses: lgpl-2.1-or-later
  *
@@ -54,7 +54,7 @@ extern "C" {
  *
  * @param length
  *   The new size to use.
- * @param map_multis
+ * @param structure
  *   The map_multis array to resize.
  *
  * @return
@@ -65,7 +65,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_utf_string_map_multis_adjust_
-  extern f_status_t f_utf_string_map_multis_adjust(const f_number_unsigned_t length, f_utf_string_map_multis_t * const map_multis);
+  extern f_status_t f_utf_string_map_multis_adjust(const f_number_unsigned_t length, f_utf_string_map_multis_t * const structure);
 #endif // _di_f_utf_string_map_multis_adjust_
 
 /**
@@ -118,7 +118,7 @@ extern "C" {
  *
  * @param amount
  *   A positive number representing how much to decimate the size by.
- * @param map_multis
+ * @param structure
  *   The map_multis array to resize.
  *
  * @return
@@ -130,7 +130,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_utf_string_map_multis_decimate_by_
-  extern f_status_t f_utf_string_map_multis_decimate_by(const f_number_unsigned_t amount, f_utf_string_map_multis_t * const map_multis);
+  extern f_status_t f_utf_string_map_multis_decimate_by(const f_number_unsigned_t amount, f_utf_string_map_multis_t * const structure);
 #endif // _di_f_utf_string_map_multis_decimate_by_
 
 /**
@@ -142,7 +142,7 @@ extern "C" {
  *
  * @param amount
  *   A positive number representing how much to decrease the size by.
- * @param map_multis
+ * @param structure
  *   The map_multis array to resize.
  *
  * @return
@@ -153,7 +153,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_utf_string_map_multis_decrease_by_
-  extern f_status_t f_utf_string_map_multis_decrease_by(const f_number_unsigned_t amount, f_utf_string_map_multis_t * const map_multis);
+  extern f_status_t f_utf_string_map_multis_decrease_by(const f_number_unsigned_t amount, f_utf_string_map_multis_t * const structure);
 #endif // _di_f_utf_string_map_multis_decrease_by_
 
 /**
@@ -165,7 +165,7 @@ extern "C" {
  * @param step
  *   The allocation step to use.
  *   Must be greater than 0.
- * @param map_multis
+ * @param structure
  *   The map_multis array to resize.
  *
  * @return
@@ -178,7 +178,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_utf_string_map_multis_increase_
-  extern f_status_t f_utf_string_map_multis_increase(const f_number_unsigned_t step, f_utf_string_map_multis_t * const map_multis);
+  extern f_status_t f_utf_string_map_multis_increase(const f_number_unsigned_t step, f_utf_string_map_multis_t * const structure);
 #endif // _di_f_utf_string_map_multis_increase_
 
 /**
@@ -190,7 +190,7 @@ extern "C" {
  *
  * @param amount
  *   A positive number representing how much to increase the size by.
- * @param map_multis
+ * @param structure
  *   The map_multis array to resize.
  *
  * @return
@@ -203,7 +203,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_utf_string_map_multis_increase_by_
-  extern f_status_t f_utf_string_map_multis_increase_by(const f_number_unsigned_t amount, f_utf_string_map_multis_t * const map_multis);
+  extern f_status_t f_utf_string_map_multis_increase_by(const f_number_unsigned_t amount, f_utf_string_map_multis_t * const structure);
 #endif // _di_f_utf_string_map_multis_increase_by_
 
 /**
@@ -211,7 +211,7 @@ extern "C" {
  *
  * @param length
  *   The new size to use.
- * @param map_multis
+ * @param structure
  *   The map_multis array to adjust.
  *
  * @return
@@ -222,7 +222,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_utf_string_map_multis_resize_
-  extern f_status_t f_utf_string_map_multis_resize(const f_number_unsigned_t length, f_utf_string_map_multis_t * const map_multis);
+  extern f_status_t f_utf_string_map_multis_resize(const f_number_unsigned_t length, f_utf_string_map_multis_t * const structure);
 #endif // _di_f_utf_string_map_multis_resize_
 
 #ifdef __cplusplus

diff --git a/level_0/f_utf/c/utf/map_multiss.c b/level_0/f_utf/c/utf/map_multiss.c
index 59eda3ce6c20daec23fce6441724aae25232e52c..257fcf24d297ae6dd516e8cb339eee0b5d4bb46a 100644 (file)
--- a/level_0/f_utf/c/utf/map_multiss.c
+++ b/level_0/f_utf/c/utf/map_multiss.c
@@ -2,7 +2,6 @@
 #include "../private-utf.h"
 #include "private-dynamic.h"
 #include "private-dynamics.h"
-#include "private-dynamicss.h"
 #include "private-map_multis.h"
 #include "private-map_multiss.h"
 #include "private-string.h"
@@ -12,12 +11,12 @@ extern "C" {
 #endif
 
 #ifndef _di_f_utf_string_map_multiss_adjust_
-  f_status_t f_utf_string_map_multiss_adjust(const f_number_unsigned_t length, f_utf_string_map_multiss_t * const map_multiss) {
+  f_status_t f_utf_string_map_multiss_adjust(const f_number_unsigned_t length, f_utf_string_map_multiss_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!map_multiss) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    return private_f_utf_string_map_multiss_adjust(length, map_multiss);
+    return private_f_utf_string_map_multiss_adjust(length, structure);
   }
 #endif // _di_f_utf_string_map_multiss_adjust_
 
@@ -79,55 +78,45 @@ extern "C" {
 #endif // _di_f_utf_string_map_multiss_append_all_
 
 #ifndef _di_f_utf_string_map_multiss_decimate_by_
-  f_status_t f_utf_string_map_multiss_decimate_by(const f_number_unsigned_t amount, f_utf_string_map_multiss_t * const map_multiss) {
+  f_status_t f_utf_string_map_multiss_decimate_by(const f_number_unsigned_t amount, f_utf_string_map_multiss_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!map_multiss) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
     if (!amount) return F_data_not;
 
-    if (map_multiss->size > amount) {
-      return private_f_utf_string_map_multiss_adjust(map_multiss->size - amount, map_multiss);
-    }
-
-    return private_f_utf_string_map_multiss_adjust(0, map_multiss);
+    return private_f_utf_string_map_multiss_adjust((structure->size > amount) ? structure->size - amount : 0, structure);
   }
 #endif // _di_f_utf_string_map_multiss_decimate_by_
 
 #ifndef _di_f_utf_string_map_multiss_decrease_by_
-  f_status_t f_utf_string_map_multiss_decrease_by(const f_number_unsigned_t amount, f_utf_string_map_multiss_t * const map_multiss) {
+  f_status_t f_utf_string_map_multiss_decrease_by(const f_number_unsigned_t amount, f_utf_string_map_multiss_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!map_multiss) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
     if (!amount) return F_data_not;
 
-    if (map_multiss->size > amount) {
-      return private_f_utf_string_map_multiss_resize(map_multiss->size - amount, map_multiss);
-    }
-
-    return private_f_utf_string_map_multiss_resize(0, map_multiss);
+    return private_f_utf_string_map_multiss_resize((structure->size > amount) ? structure->size - amount : 0, structure);
   }
 #endif // _di_f_utf_string_map_multiss_decrease_by_
 
 #ifndef _di_f_utf_string_map_multiss_increase_
-  f_status_t f_utf_string_map_multiss_increase(const f_number_unsigned_t step, f_utf_string_map_multiss_t * const map_multiss) {
+  f_status_t f_utf_string_map_multiss_increase(const f_number_unsigned_t step, f_utf_string_map_multiss_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!map_multiss) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    if (step && map_multiss->used + 1 > map_multiss->size) {
-      f_number_unsigned_t length = map_multiss->used + step;
+    if (step && structure->used + 1 > structure->size) {
+      f_number_unsigned_t length = structure->used + step;
 
       if (length > F_number_t_size_unsigned_d) {
-        if (map_multiss->used + 1 > F_number_t_size_unsigned_d) {
-          return F_status_set_error(F_array_too_large);
-        }
+        if (structure->used + 1 > F_number_t_size_unsigned_d) return F_status_set_error(F_array_too_large);
 
         length = F_number_t_size_unsigned_d;
       }
 
-      return private_f_utf_string_map_multiss_resize(length, map_multiss);
+      return private_f_utf_string_map_multiss_resize(length, structure);
     }
 
     return F_data_not;
@@ -135,20 +124,20 @@ extern "C" {
 #endif // _di_f_utf_string_map_multiss_increase_
 
 #ifndef _di_f_utf_string_map_multiss_increase_by_
-  f_status_t f_utf_string_map_multiss_increase_by(const f_number_unsigned_t amount, f_utf_string_map_multiss_t * const map_multiss) {
+  f_status_t f_utf_string_map_multiss_increase_by(const f_number_unsigned_t amount, f_utf_string_map_multiss_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!map_multiss) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
     if (amount) {
-      if (map_multiss->used >= F_number_t_size_unsigned_d) return F_status_set_error(F_array_too_large);
+      if (structure->used >= F_number_t_size_unsigned_d) return F_status_set_error(F_array_too_large);
 
-      const f_number_unsigned_t length = map_multiss->used + amount;
+      const f_number_unsigned_t length = structure->used + amount;
 
-      if (length > map_multiss->size) {
+      if (length > structure->size) {
         if (length > F_number_t_size_unsigned_d) return F_status_set_error(F_array_too_large);
 
-        return private_f_utf_string_map_multiss_resize(length, map_multiss);
+        return private_f_utf_string_map_multiss_resize(length, structure);
       }
     }
 
@@ -157,12 +146,12 @@ extern "C" {
 #endif // _di_f_utf_string_map_multiss_increase_by_
 
 #ifndef _di_f_utf_string_map_multiss_resize_
-  f_status_t f_utf_string_map_multiss_resize(const f_number_unsigned_t length, f_utf_string_map_multiss_t * const map_multiss) {
+  f_status_t f_utf_string_map_multiss_resize(const f_number_unsigned_t length, f_utf_string_map_multiss_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!map_multiss) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    return private_f_utf_string_map_multiss_resize(length, map_multiss);
+    return private_f_utf_string_map_multiss_resize(length, structure);
   }
 #endif // _di_f_utf_string_map_multiss_resize_
 

diff --git a/level_0/f_utf/c/utf/map_multiss.h b/level_0/f_utf/c/utf/map_multiss.h
index 4427dd3a623a04b0777f1f7837fb43cbde5ea63c..547afa3fc243627c95aa146a126d41fe9b64fd33 100644 (file)
--- a/level_0/f_utf/c/utf/map_multiss.h
+++ b/level_0/f_utf/c/utf/map_multiss.h
@@ -1,7 +1,7 @@
 /**
  * FLL - Level 0
  *
- * Project: String
+ * Project: UTF
  * API Version: 0.7
  * Licenses: lgpl-2.1-or-later
  *
@@ -17,7 +17,7 @@ extern "C" {
 #endif
 
 /**
- * An array of string maps.
+ * An array of string maps arrays.
  *
  * Properties:
  *   - array: The array of an array of string maps.
@@ -54,7 +54,7 @@ extern "C" {
  *
  * @param length
  *   The new size to use.
- * @param map_multiss
+ * @param structure
  *   The map_multiss array to resize.
  *
  * @return
@@ -65,7 +65,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_utf_string_map_multiss_adjust_
-  extern f_status_t f_utf_string_map_multiss_adjust(const f_number_unsigned_t length, f_utf_string_map_multiss_t * const map_multiss);
+  extern f_status_t f_utf_string_map_multiss_adjust(const f_number_unsigned_t length, f_utf_string_map_multiss_t * const structure);
 #endif // _di_f_utf_string_map_multiss_adjust_
 
 /**
@@ -118,7 +118,7 @@ extern "C" {
  *
  * @param amount
  *   A positive number representing how much to decimate the size by.
- * @param map_multiss
+ * @param structure
  *   The map_multiss array to resize.
  *
  * @return
@@ -130,7 +130,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_utf_string_map_multiss_decimate_by_
-  extern f_status_t f_utf_string_map_multiss_decimate_by(const f_number_unsigned_t amount, f_utf_string_map_multiss_t * const map_multiss);
+  extern f_status_t f_utf_string_map_multiss_decimate_by(const f_number_unsigned_t amount, f_utf_string_map_multiss_t * const structure);
 #endif // _di_f_utf_string_map_multiss_decimate_by_
 
 /**
@@ -142,7 +142,7 @@ extern "C" {
  *
  * @param amount
  *   A positive number representing how much to decrease the size by.
- * @param map_multiss
+ * @param structure
  *   The map_multiss array to resize.
  *
  * @return
@@ -153,7 +153,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_utf_string_map_multiss_decrease_by_
-  extern f_status_t f_utf_string_map_multiss_decrease_by(const f_number_unsigned_t amount, f_utf_string_map_multiss_t * const map_multiss);
+  extern f_status_t f_utf_string_map_multiss_decrease_by(const f_number_unsigned_t amount, f_utf_string_map_multiss_t * const structure);
 #endif // _di_f_utf_string_map_multiss_decrease_by_
 
 /**
@@ -165,7 +165,7 @@ extern "C" {
  * @param step
  *   The allocation step to use.
  *   Must be greater than 0.
- * @param map_multiss
+ * @param structure
  *   The map_multiss array to resize.
  *
  * @return
@@ -178,7 +178,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_utf_string_map_multiss_increase_
-  extern f_status_t f_utf_string_map_multiss_increase(const f_number_unsigned_t step, f_utf_string_map_multiss_t * const map_multiss);
+  extern f_status_t f_utf_string_map_multiss_increase(const f_number_unsigned_t step, f_utf_string_map_multiss_t * const structure);
 #endif // _di_f_utf_string_map_multiss_increase_
 
 /**
@@ -190,7 +190,7 @@ extern "C" {
  *
  * @param amount
  *   A positive number representing how much to increase the size by.
- * @param map_multiss
+ * @param structure
  *   The map_multiss array to resize.
  *
  * @return
@@ -203,7 +203,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_utf_string_map_multiss_increase_by_
-  extern f_status_t f_utf_string_map_multiss_increase_by(const f_number_unsigned_t amount, f_utf_string_map_multiss_t * const map_multiss);
+  extern f_status_t f_utf_string_map_multiss_increase_by(const f_number_unsigned_t amount, f_utf_string_map_multiss_t * const structure);
 #endif // _di_f_utf_string_map_multiss_increase_by_
 
 /**
@@ -211,7 +211,7 @@ extern "C" {
  *
  * @param length
  *   The new size to use.
- * @param map_multiss
+ * @param structure
  *   The map_multiss array to adjust.
  *
  * @return
@@ -222,7 +222,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_utf_string_map_multiss_resize_
-  extern f_status_t f_utf_string_map_multiss_resize(const f_number_unsigned_t length, f_utf_string_map_multiss_t * const map_multiss);
+  extern f_status_t f_utf_string_map_multiss_resize(const f_number_unsigned_t length, f_utf_string_map_multiss_t * const structure);
 #endif // _di_f_utf_string_map_multiss_resize_
 
 #ifdef __cplusplus

diff --git a/level_0/f_utf/c/utf/maps.c b/level_0/f_utf/c/utf/maps.c
index 6b493c88a7ef6cb8e55b096e84cf189a246d1ae8..52b71f22820f8836304516d8333573aad033db24 100644 (file)
--- a/level_0/f_utf/c/utf/maps.c
+++ b/level_0/f_utf/c/utf/maps.c
@@ -1,19 +1,19 @@
 #include "../utf.h"
 #include "../private-utf.h"
-#include "private-string.h"
 #include "private-maps.h"
+#include "private-string.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 #ifndef _di_f_utf_string_maps_adjust_
-  f_status_t f_utf_string_maps_adjust(const f_number_unsigned_t length, f_utf_string_maps_t * const maps) {
+  f_status_t f_utf_string_maps_adjust(const f_number_unsigned_t length, f_utf_string_maps_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!maps) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    return private_f_utf_string_maps_adjust(length, maps);
+    return private_f_utf_string_maps_adjust(length, structure);
   }
 #endif // _di_f_utf_string_maps_adjust_
 
@@ -62,55 +62,45 @@ extern "C" {
 #endif // _di_f_utf_string_maps_append_all_
 
 #ifndef _di_f_utf_string_maps_decimate_by_
-  f_status_t f_utf_string_maps_decimate_by(const f_number_unsigned_t amount, f_utf_string_maps_t * const maps) {
+  f_status_t f_utf_string_maps_decimate_by(const f_number_unsigned_t amount, f_utf_string_maps_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!maps) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
     if (!amount) return F_data_not;
 
-    if (maps->size > amount) {
-      return private_f_utf_string_maps_adjust(maps->size - amount, maps);
-    }
-
-    return private_f_utf_string_maps_adjust(0, maps);
+    return private_f_utf_string_maps_adjust((structure->size > amount) ? structure->size - amount : 0, structure);
   }
 #endif // _di_f_utf_string_maps_decimate_by_
 
 #ifndef _di_f_utf_string_maps_decrease_by_
-  f_status_t f_utf_string_maps_decrease_by(const f_number_unsigned_t amount, f_utf_string_maps_t * const maps) {
+  f_status_t f_utf_string_maps_decrease_by(const f_number_unsigned_t amount, f_utf_string_maps_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!maps) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
     if (!amount) return F_data_not;
 
-    if (maps->size > amount) {
-      return private_f_utf_string_maps_resize(maps->size - amount, maps);
-    }
-
-    return private_f_utf_string_maps_resize(0, maps);
+    return private_f_utf_string_maps_resize((structure->size > amount) ? structure->size - amount : 0, structure);
   }
 #endif // _di_f_utf_string_maps_decrease_by_
 
 #ifndef _di_f_utf_string_maps_increase_
-  f_status_t f_utf_string_maps_increase(const f_number_unsigned_t step, f_utf_string_maps_t * const maps) {
+  f_status_t f_utf_string_maps_increase(const f_number_unsigned_t step, f_utf_string_maps_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!maps) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    if (step && maps->used + 1 > maps->size) {
-      f_number_unsigned_t length = maps->used + step;
+    if (step && structure->used + 1 > structure->size) {
+      f_number_unsigned_t length = structure->used + step;
 
       if (length > F_number_t_size_unsigned_d) {
-        if (maps->used + 1 > F_number_t_size_unsigned_d) {
-          return F_status_set_error(F_array_too_large);
-        }
+        if (structure->used + 1 > F_number_t_size_unsigned_d) return F_status_set_error(F_array_too_large);
 
         length = F_number_t_size_unsigned_d;
       }
 
-      return private_f_utf_string_maps_resize(length, maps);
+      return private_f_utf_string_maps_resize(length, structure);
     }
 
     return F_data_not;
@@ -118,20 +108,20 @@ extern "C" {
 #endif // _di_f_utf_string_maps_increase_
 
 #ifndef _di_f_utf_string_maps_increase_by_
-  f_status_t f_utf_string_maps_increase_by(const f_number_unsigned_t amount, f_utf_string_maps_t * const maps) {
+  f_status_t f_utf_string_maps_increase_by(const f_number_unsigned_t amount, f_utf_string_maps_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!maps) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
     if (amount) {
-      if (maps->used >= F_number_t_size_unsigned_d) return F_status_set_error(F_array_too_large);
+      if (structure->used >= F_number_t_size_unsigned_d) return F_status_set_error(F_array_too_large);
 
-      const f_number_unsigned_t length = maps->used + amount;
+      const f_number_unsigned_t length = structure->used + amount;
 
-      if (length > maps->size) {
+      if (length > structure->size) {
         if (length > F_number_t_size_unsigned_d) return F_status_set_error(F_array_too_large);
 
-        return private_f_utf_string_maps_resize(length, maps);
+        return private_f_utf_string_maps_resize(length, structure);
       }
     }
 
@@ -140,12 +130,12 @@ extern "C" {
 #endif // _di_f_utf_string_maps_increase_by_
 
 #ifndef _di_f_utf_string_maps_resize_
-  f_status_t f_utf_string_maps_resize(const f_number_unsigned_t length, f_utf_string_maps_t * const maps) {
+  f_status_t f_utf_string_maps_resize(const f_number_unsigned_t length, f_utf_string_maps_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!maps) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    return private_f_utf_string_maps_resize(length, maps);
+    return private_f_utf_string_maps_resize(length, structure);
   }
 #endif // _di_f_utf_string_maps_resize_
 

diff --git a/level_0/f_utf/c/utf/maps.h b/level_0/f_utf/c/utf/maps.h
index ad92b14842b2d6a6272e5bd8b42421651ab59854..85b02a0ea291457f70ba9a0f066e3795c92572e8 100644 (file)
--- a/level_0/f_utf/c/utf/maps.h
+++ b/level_0/f_utf/c/utf/maps.h
@@ -5,9 +5,9 @@
  * API Version: 0.7
  * Licenses: lgpl-2.1-or-later
  *
- * Defines map UTF-8 string data.
+ * Defines map string data.
  *
- * This is auto-included by utf.h and should not need to be explicitly included.
+ * This is auto-included by string.h and should not need to be explicitly included.
  */
 #ifndef _F_utf_maps_h
 #define _F_utf_maps_h
@@ -54,7 +54,7 @@ extern "C" {
  *
  * @param length
  *   The new size to use.
- * @param maps
+ * @param structure
  *   The string maps array to resize.
  *
  * @return
@@ -65,7 +65,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_utf_string_maps_adjust_
-  extern f_status_t f_utf_string_maps_adjust(const f_number_unsigned_t length, f_utf_string_maps_t * const maps);
+  extern f_status_t f_utf_string_maps_adjust(const f_number_unsigned_t length, f_utf_string_maps_t * const structure);
 #endif // _di_f_utf_string_maps_adjust_
 
 /**
@@ -118,7 +118,7 @@ extern "C" {
  *
  * @param amount
  *   A positive number representing how much to decimate the size by.
- * @param maps
+ * @param structure
  *   The string maps array to resize.
  *
  * @return
@@ -130,7 +130,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_utf_string_maps_decimate_by_
-  extern f_status_t f_utf_string_maps_decimate_by(const f_number_unsigned_t amount, f_utf_string_maps_t * const maps);
+  extern f_status_t f_utf_string_maps_decimate_by(const f_number_unsigned_t amount, f_utf_string_maps_t * const structure);
 #endif // _di_f_utf_string_maps_decimate_by_
 
 /**
@@ -142,7 +142,7 @@ extern "C" {
  *
  * @param amount
  *   A positive number representing how much to decrease the size by.
- * @param maps
+ * @param structure
  *   The string maps array to resize.
  *
  * @return
@@ -153,7 +153,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_utf_string_maps_decrease_by_
-  extern f_status_t f_utf_string_maps_decrease_by(const f_number_unsigned_t amount, f_utf_string_maps_t * const maps);
+  extern f_status_t f_utf_string_maps_decrease_by(const f_number_unsigned_t amount, f_utf_string_maps_t * const structure);
 #endif // _di_f_utf_string_maps_decrease_by_
 
 /**
@@ -165,7 +165,7 @@ extern "C" {
  * @param step
  *   The allocation step to use.
  *   Must be greater than 0.
- * @param maps
+ * @param structure
  *   The string maps array to resize.
  *
  * @return
@@ -178,7 +178,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_utf_string_maps_increase_
-  extern f_status_t f_utf_string_maps_increase(const f_number_unsigned_t step, f_utf_string_maps_t * const maps);
+  extern f_status_t f_utf_string_maps_increase(const f_number_unsigned_t step, f_utf_string_maps_t * const structure);
 #endif // _di_f_utf_string_maps_increase_
 
 /**
@@ -190,7 +190,7 @@ extern "C" {
  *
  * @param amount
  *   A positive number representing how much to increase the size by.
- * @param maps
+ * @param structure
  *   The string maps array to resize.
  *
  * @return
@@ -203,7 +203,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_utf_string_maps_increase_by_
-  extern f_status_t f_utf_string_maps_increase_by(const f_number_unsigned_t amount, f_utf_string_maps_t * const maps);
+  extern f_status_t f_utf_string_maps_increase_by(const f_number_unsigned_t amount, f_utf_string_maps_t * const structure);
 #endif // _di_f_utf_string_maps_increase_by_
 
 /**
@@ -211,7 +211,7 @@ extern "C" {
  *
  * @param length
  *   The new size to use.
- * @param maps
+ * @param structure
  *   The string maps array to adjust.
  *
  * @return
@@ -222,7 +222,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_utf_string_maps_resize_
-  extern f_status_t f_utf_string_maps_resize(const f_number_unsigned_t length, f_utf_string_maps_t * const maps);
+  extern f_status_t f_utf_string_maps_resize(const f_number_unsigned_t length, f_utf_string_maps_t * const structure);
 #endif // _di_f_utf_string_maps_resize_
 
 #ifdef __cplusplus

diff --git a/level_0/f_utf/c/utf/mapss.c b/level_0/f_utf/c/utf/mapss.c
index c911950bd1823a0b8fd241ce9966c4dd06ceeb3b..b93c9c3fcb8efcb5ed1659348e0de38e5af48d1a 100644 (file)
--- a/level_0/f_utf/c/utf/mapss.c
+++ b/level_0/f_utf/c/utf/mapss.c
@@ -1,20 +1,20 @@
 #include "../utf.h"
 #include "../private-utf.h"
-#include "private-string.h"
 #include "private-maps.h"
 #include "private-mapss.h"
+#include "private-string.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 #ifndef _di_f_utf_string_mapss_adjust_
-  f_status_t f_utf_string_mapss_adjust(const f_number_unsigned_t length, f_utf_string_mapss_t * const mapss) {
+  f_status_t f_utf_string_mapss_adjust(const f_number_unsigned_t length, f_utf_string_mapss_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!mapss) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    return private_f_utf_string_mapss_adjust(length, mapss);
+    return private_f_utf_string_mapss_adjust(length, structure);
   }
 #endif // _di_f_utf_string_mapss_adjust_
 
@@ -76,55 +76,45 @@ extern "C" {
 #endif // _di_f_utf_string_mapss_append_all_
 
 #ifndef _di_f_utf_string_mapss_decimate_by_
-  f_status_t f_utf_string_mapss_decimate_by(const f_number_unsigned_t amount, f_utf_string_mapss_t * const mapss) {
+  f_status_t f_utf_string_mapss_decimate_by(const f_number_unsigned_t amount, f_utf_string_mapss_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!mapss) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
     if (!amount) return F_data_not;
 
-    if (mapss->size > amount) {
-      return private_f_utf_string_mapss_adjust(mapss->size - amount, mapss);
-    }
-
-    return private_f_utf_string_mapss_adjust(0, mapss);
+    return private_f_utf_string_mapss_adjust((structure->size > amount) ? structure->size - amount : 0, structure);
   }
 #endif // _di_f_utf_string_mapss_decimate_by_
 
 #ifndef _di_f_utf_string_mapss_decrease_by_
-  f_status_t f_utf_string_mapss_decrease_by(const f_number_unsigned_t amount, f_utf_string_mapss_t * const mapss) {
+  f_status_t f_utf_string_mapss_decrease_by(const f_number_unsigned_t amount, f_utf_string_mapss_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!mapss) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
     if (!amount) return F_data_not;
 
-    if (mapss->size > amount) {
-      return private_f_utf_string_mapss_resize(mapss->size - amount, mapss);
-    }
-
-    return private_f_utf_string_mapss_resize(0, mapss);
+    return private_f_utf_string_mapss_resize((structure->size > amount) ? structure->size - amount : 0, structure);
   }
 #endif // _di_f_utf_string_mapss_decrease_by_
 
 #ifndef _di_f_utf_string_mapss_increase_
-  f_status_t f_utf_string_mapss_increase(const f_number_unsigned_t step, f_utf_string_mapss_t * const mapss) {
+  f_status_t f_utf_string_mapss_increase(const f_number_unsigned_t step, f_utf_string_mapss_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!mapss) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    if (step && mapss->used + 1 > mapss->size) {
-      f_number_unsigned_t length = mapss->used + step;
+    if (step && structure->used + 1 > structure->size) {
+      f_number_unsigned_t length = structure->used + step;
 
       if (length > F_number_t_size_unsigned_d) {
-        if (mapss->used + 1 > F_number_t_size_unsigned_d) {
-          return F_status_set_error(F_array_too_large);
-        }
+        if (structure->used + 1 > F_number_t_size_unsigned_d) return F_status_set_error(F_array_too_large);
 
         length = F_number_t_size_unsigned_d;
       }
 
-      return private_f_utf_string_mapss_resize(length, mapss);
+      return private_f_utf_string_mapss_resize(length, structure);
     }
 
     return F_data_not;
@@ -132,20 +122,20 @@ extern "C" {
 #endif // _di_f_utf_string_mapss_increase_
 
 #ifndef _di_f_utf_string_mapss_increase_by_
-  f_status_t f_utf_string_mapss_increase_by(const f_number_unsigned_t amount, f_utf_string_mapss_t * const mapss) {
+  f_status_t f_utf_string_mapss_increase_by(const f_number_unsigned_t amount, f_utf_string_mapss_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!mapss) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
     if (amount) {
-      if (mapss->used >= F_number_t_size_unsigned_d) return F_status_set_error(F_array_too_large);
+      if (structure->used >= F_number_t_size_unsigned_d) return F_status_set_error(F_array_too_large);
 
-      const f_number_unsigned_t length = mapss->used + amount;
+      const f_number_unsigned_t length = structure->used + amount;
 
-      if (length > mapss->size) {
+      if (length > structure->size) {
         if (length > F_number_t_size_unsigned_d) return F_status_set_error(F_array_too_large);
 
-        return private_f_utf_string_mapss_resize(length, mapss);
+        return private_f_utf_string_mapss_resize(length, structure);
       }
     }
 
@@ -154,12 +144,12 @@ extern "C" {
 #endif // _di_f_utf_string_mapss_increase_by_
 
 #ifndef _di_f_utf_string_mapss_resize_
-  f_status_t f_utf_string_mapss_resize(const f_number_unsigned_t length, f_utf_string_mapss_t * const mapss) {
+  f_status_t f_utf_string_mapss_resize(const f_number_unsigned_t length, f_utf_string_mapss_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!mapss) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    return private_f_utf_string_mapss_resize(length, mapss);
+    return private_f_utf_string_mapss_resize(length, structure);
   }
 #endif // _di_f_utf_string_mapss_resize_
 

diff --git a/level_0/f_utf/c/utf/mapss.h b/level_0/f_utf/c/utf/mapss.h
index b7d83c19a88e836e4cb0f5d36393b3b8ed04d38c..0bc0eebc8b2294b22cd4a600ed155b74fa46e0f3 100644 (file)
--- a/level_0/f_utf/c/utf/mapss.h
+++ b/level_0/f_utf/c/utf/mapss.h
@@ -5,9 +5,9 @@
  * API Version: 0.7
  * Licenses: lgpl-2.1-or-later
  *
- * Defines map UTF-8 string data.
+ * Defines map string data.
  *
- * This is auto-included by utf.h and should not need to be explicitly included.
+ * This is auto-included by string.h and should not need to be explicitly included.
  */
 #ifndef _F_utf_mapss_h
 #define _F_utf_mapss_h
@@ -54,7 +54,7 @@ extern "C" {
  *
  * @param length
  *   The new size to use.
- * @param mapss
+ * @param structure
  *   The string mapss array to resize.
  *
  * @return
@@ -65,7 +65,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_utf_string_mapss_adjust_
-  extern f_status_t f_utf_string_mapss_adjust(const f_number_unsigned_t length, f_utf_string_mapss_t * const mapss);
+  extern f_status_t f_utf_string_mapss_adjust(const f_number_unsigned_t length, f_utf_string_mapss_t * const structure);
 #endif // _di_f_utf_string_mapss_adjust_
 
 /**
@@ -118,7 +118,7 @@ extern "C" {
  *
  * @param amount
  *   A positive number representing how much to decimate the size by.
- * @param mapss
+ * @param structure
  *   The string mapss array to resize.
  *
  * @return
@@ -130,7 +130,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_utf_string_mapss_decimate_by_
-  extern f_status_t f_utf_string_mapss_decimate_by(const f_number_unsigned_t amount, f_utf_string_mapss_t * const mapss);
+  extern f_status_t f_utf_string_mapss_decimate_by(const f_number_unsigned_t amount, f_utf_string_mapss_t * const structure);
 #endif // _di_f_utf_string_mapss_decimate_by_
 
 /**
@@ -142,7 +142,7 @@ extern "C" {
  *
  * @param amount
  *   A positive number representing how much to decrease the size by.
- * @param mapss
+ * @param structure
  *   The string mapss array to resize.
  *
  * @return
@@ -154,7 +154,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_utf_string_mapss_decrease_by_
-  extern f_status_t f_utf_string_mapss_decrease_by(const f_number_unsigned_t amount, f_utf_string_mapss_t * const mapss);
+  extern f_status_t f_utf_string_mapss_decrease_by(const f_number_unsigned_t amount, f_utf_string_mapss_t * const structure);
 #endif // _di_f_utf_string_mapss_decrease_by_
 
 /**
@@ -166,7 +166,7 @@ extern "C" {
  * @param step
  *   The allocation step to use.
  *   Must be greater than 0.
- * @param mapss
+ * @param structure
  *   The string mapss array to resize.
  *
  * @return
@@ -179,7 +179,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_utf_string_mapss_increase_
-  extern f_status_t f_utf_string_mapss_increase(const f_number_unsigned_t step, f_utf_string_mapss_t * const mapss);
+  extern f_status_t f_utf_string_mapss_increase(const f_number_unsigned_t step, f_utf_string_mapss_t * const structure);
 #endif // _di_f_utf_string_mapss_increase_
 
 /**
@@ -191,7 +191,7 @@ extern "C" {
  *
  * @param amount
  *   A positive number representing how much to increase the size by.
- * @param mapss
+ * @param structure
  *   The string mapss array to resize.
  *
  * @return
@@ -204,7 +204,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_utf_string_mapss_increase_by_
-  extern f_status_t f_utf_string_mapss_increase_by(const f_number_unsigned_t amount, f_utf_string_mapss_t * const mapss);
+  extern f_status_t f_utf_string_mapss_increase_by(const f_number_unsigned_t amount, f_utf_string_mapss_t * const structure);
 #endif // _di_f_utf_string_mapss_increase_by_
 
 /**
@@ -212,7 +212,7 @@ extern "C" {
  *
  * @param length
  *   The new size to use.
- * @param mapss
+ * @param structure
  *   The string mapss array to adjust.
  *
  * @return
@@ -223,7 +223,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_utf_string_mapss_resize_
-  extern f_status_t f_utf_string_mapss_resize(const f_number_unsigned_t length, f_utf_string_mapss_t * const mapss);
+  extern f_status_t f_utf_string_mapss_resize(const f_number_unsigned_t length, f_utf_string_mapss_t * const structure);
 #endif // _di_f_utf_string_mapss_resize_
 
 #ifdef __cplusplus

diff --git a/level_0/f_utf/c/utf/private-dynamic.h b/level_0/f_utf/c/utf/private-dynamic.h
index 9ea3a38734020b2f377a52022f02ab4b6c59fb27..ef151619a2dc755c5b99a0f7eef3f129ead4d80a 100644 (file)
--- a/level_0/f_utf/c/utf/private-dynamic.h
+++ b/level_0/f_utf/c/utf/private-dynamic.h
@@ -1,7 +1,7 @@
 /**
  * FLL - Level 0
  *
- * Project: String
+ * Project: UTF
  * API Version: 0.7
  * Licenses: lgpl-2.1-or-later
  *

diff --git a/level_0/f_utf/c/utf/private-dynamics.c b/level_0/f_utf/c/utf/private-dynamics.c
index fa1f69cdefc1f9d533e086bab1f46bcfb9567a9d..b8de780a26f8cac70afc7bcd4b3db877537eedaa 100644 (file)
--- a/level_0/f_utf/c/utf/private-dynamics.c
+++ b/level_0/f_utf/c/utf/private-dynamics.c
@@ -9,30 +9,17 @@ extern "C" {
 #endif
 
 #if !defined(_di_f_utf_string_dynamics_adjust_) || !defined(_di_f_utf_string_dynamics_append_) || !defined(_di_f_utf_string_dynamics_decimate_by_) || !defined(_di_f_utf_string_map_multis_adjust_) || !defined(_di_f_utf_string_map_multis_append_)
-  f_status_t private_f_utf_string_dynamics_adjust(const f_number_unsigned_t length, f_utf_string_dynamics_t * const dynamics) {
-
-    if (dynamics->used + length > F_number_t_size_unsigned_d) {
-      return F_status_set_error(F_array_too_large);
-    }
+  f_status_t private_f_utf_string_dynamics_adjust(const f_number_unsigned_t length, f_utf_string_dynamics_t * const structure) {
 
     f_status_t status = F_none;
 
-    for (f_number_unsigned_t i = length; i < dynamics->size; ++i) {
+    for (f_number_unsigned_t i = length; i < structure->size; ++i) {
 
-      status = private_f_utf_string_dynamic_adjust(0, &dynamics->array[i]);
+      status = f_memory_array_adjust(0, sizeof(f_utf_string_t), (void **) &structure->array[i].string, &structure->array[i].used, &structure->array[i].size);
       if (F_status_is_error(status)) return status;
     } // for
 
-    status = f_memory_adjust(dynamics->size, length, sizeof(f_utf_string_dynamic_t), (void **) & dynamics->array);
-    if (F_status_is_error(status)) return status;
-
-    dynamics->size = length;
-
-    if (dynamics->used > dynamics->size) {
-      dynamics->used = length;
-    }
-
-    return F_none;
+    return f_memory_array_adjust(length, sizeof(f_utf_string_dynamic_t), (void **) &structure->array, &structure->used, &structure->size);
   }
 #endif // !defined(_di_f_utf_string_dynamics_adjust_) || !defined(_di_f_utf_string_dynamics_append_) || !defined(_di_f_utf_string_dynamics_decimate_by_) || !defined(_di_f_utf_string_map_multis_adjust_) || !defined(_di_f_utf_string_map_multis_append_)
 
@@ -59,7 +46,6 @@ extern "C" {
   }
 #endif // !defined(_di_f_utf_string_dynamics_append_) || !defined(_di_f_utf_string_map_multis_append_) || !defined(_di_f_utf_string_map_multis_append_all_)
 
-
 #if !defined(_di_f_utf_string_dynamics_append_all_) || !defined(_di_f_utf_string_map_multis_append_) || !defined(_di_f_utf_string_map_multis_append_all_)
   f_status_t private_f_utf_string_dynamics_append_all(const f_utf_string_dynamics_t source, f_utf_string_dynamics_t * const destination) {
 
@@ -84,33 +70,20 @@ extern "C" {
   }
 #endif // !defined(_di_f_utf_string_dynamics_append_all_) || !defined(_di_f_utf_string_map_multis_append_) || !defined(_di_f_utf_string_map_multis_append_all_)
 
-#if !defined(_di_f_utf_string_dynamics_decrease_by_) || !defined(_di_f_utf_string_dynamics_increase_) || !defined(_di_f_utf_string_dynamics_increase_by_) || !defined(_di_f_utf_string_map_multis_append_) || !defined(_di_f_utf_string_map_multis_decrease_by_) || !defined(_di_f_utf_string_map_multis_increase_) || !defined(_di_f_utf_string_map_multis_increase_by_) || !defined(_di_f_utf_string_map_multis_terminate_) || !defined(_di_f_utf_string_map_multis_terminate_after_)
-  f_status_t private_f_utf_string_dynamics_resize(const f_number_unsigned_t length, f_utf_string_dynamics_t * const dynamics) {
-
-    if (dynamics->used + length > F_number_t_size_unsigned_d) {
-      return F_status_set_error(F_array_too_large);
-    }
+#if !defined(_di_f_utf_string_dynamics_decrease_by_) || !defined(_di_f_utf_string_dynamics_increase_) || !defined(_di_f_utf_string_dynamics_increase_by_) || !defined(f_utf_string_dynamics_resize) || !defined(_di_f_utf_string_map_multis_append_) || !defined(_di_f_utf_string_map_multis_append_all_) || !defined(_di_f_utf_string_map_multis_decrease_by_) || !defined(_di_f_utf_string_map_multis_increase_) || !defined(_di_f_utf_string_map_multis_increase_by_) || !defined(_di_f_utf_string_map_multis_resize_) || !defined(_di_f_utf_string_map_multiss_append_) || !defined(_di_f_utf_string_map_multiss_append_all_) || !defined(_di_f_utf_string_map_multiss_decrease_by_) || !defined(_di_f_utf_string_map_multiss_increase_) || !defined(_di_f_utf_string_map_multiss_increase_by_)
+  f_status_t private_f_utf_string_dynamics_resize(const f_number_unsigned_t length, f_utf_string_dynamics_t * const structure) {
 
     f_status_t status = F_none;
 
-    for (f_number_unsigned_t i = length; i < dynamics->size; ++i) {
+    for (f_number_unsigned_t i = length; i < structure->size; ++i) {
 
-      status = private_f_utf_string_dynamic_resize(0, &dynamics->array[i]);
+      status = f_memory_array_resize(0, sizeof(f_utf_string_t), (void **) &structure->array[i].string, &structure->array[i].used, &structure->array[i].size);
       if (F_status_is_error(status)) return status;
     } // for
 
-    status = f_memory_resize(dynamics->size, length, sizeof(f_utf_string_dynamic_t), (void **) & dynamics->array);
-    if (F_status_is_error(status)) return status;
-
-    dynamics->size = length;
-
-    if (dynamics->used > dynamics->size) {
-      dynamics->used = length;
-    }
-
-    return F_none;
+    return f_memory_array_resize(length, sizeof(f_utf_string_dynamic_t), (void **) &structure->array, &structure->used, &structure->size);
   }
-#endif // !defined(_di_f_utf_string_dynamics_decrease_by_) || !defined(_di_f_utf_string_dynamics_increase_) || !defined(_di_f_utf_string_dynamics_increase_by_) || !defined(_di_f_utf_string_map_multis_append_) || !defined(_di_f_utf_string_map_multis_decrease_by_) || !defined(_di_f_utf_string_map_multis_increase_) || !defined(_di_f_utf_string_map_multis_increase_by_) || !defined(_di_f_utf_string_map_multis_terminate_) || !defined(_di_f_utf_string_map_multis_terminate_after_)
+#endif // !defined(_di_f_utf_string_dynamics_decrease_by_) || !defined(_di_f_utf_string_dynamics_increase_) || !defined(_di_f_utf_string_dynamics_increase_by_) || !defined(f_utf_string_dynamics_resize) || !defined(_di_f_utf_string_map_multis_append_) || !defined(_di_f_utf_string_map_multis_append_all_) || !defined(_di_f_utf_string_map_multis_decrease_by_) || !defined(_di_f_utf_string_map_multis_increase_) || !defined(_di_f_utf_string_map_multis_increase_by_) || !defined(_di_f_utf_string_map_multis_resize_) || !defined(_di_f_utf_string_map_multiss_append_) || !defined(_di_f_utf_string_map_multiss_append_all_) || !defined(_di_f_utf_string_map_multiss_decrease_by_) || !defined(_di_f_utf_string_map_multiss_increase_) || !defined(_di_f_utf_string_map_multiss_increase_by_)
 
 #ifdef __cplusplus
 } // extern "C"

diff --git a/level_0/f_utf/c/utf/private-dynamics.h b/level_0/f_utf/c/utf/private-dynamics.h
index 44f8a964c268ce33ef35bbe9a8a73fd6d763b842..983e65616786fbf403728436b6d4b7ad5d83a501 100644 (file)
--- a/level_0/f_utf/c/utf/private-dynamics.h
+++ b/level_0/f_utf/c/utf/private-dynamics.h
@@ -1,7 +1,7 @@
 /**
  * FLL - Level 0
  *
- * Project: String
+ * Project: UTF
  * API Version: 0.7
  * Licenses: lgpl-2.1-or-later
  *
@@ -22,8 +22,8 @@ extern "C" {
  *
  * @param length
  *   The new size to use.
- * @param dynamics
- *   The strings to adjust.
+ * @param structure
+ *   The dynamics to adjust.
  *
  * @return
  *   F_none on success.
@@ -41,7 +41,7 @@ extern "C" {
  * @see f_utf_string_map_multis_append()
  */
 #if !defined(_di_f_utf_string_dynamics_adjust_) || !defined(_di_f_utf_string_dynamics_append_) || !defined(_di_f_utf_string_dynamics_decimate_by_) || !defined(_di_f_utf_string_map_multis_adjust_) || !defined(_di_f_utf_string_map_multis_append_)
-  extern f_status_t private_f_utf_string_dynamics_adjust(const f_number_unsigned_t length, f_utf_string_dynamics_t * const dynamics) F_attribute_visibility_internal_d;
+  extern f_status_t private_f_utf_string_dynamics_adjust(const f_number_unsigned_t length, f_utf_string_dynamics_t * const structure) F_attribute_visibility_internal_d;
 #endif // !defined(_di_f_utf_string_dynamics_adjust_) || !defined(_di_f_utf_string_dynamics_append_) || !defined(_di_f_utf_string_dynamics_decimate_by_) || !defined(_di_f_utf_string_map_multis_adjust_) || !defined(_di_f_utf_string_map_multis_append_)
 
 /**
@@ -52,7 +52,7 @@ extern "C" {
  * @param source
  *   The source string to append.
  * @param destination
- *   The destination strings the source is appended onto.
+ *   The destination dynamics the source is appended onto.
  *
  * @return
  *   F_none on success.
@@ -79,7 +79,7 @@ extern "C" {
  * @param source
  *   The source strings to append.
  * @param destination
- *   The destination strings the source is appended onto.
+ *   The destination dynamics the source is appended onto.
  *
  * @return
  *   F_none on success.
@@ -105,8 +105,8 @@ extern "C" {
  *
  * @param length
  *   The new size to use.
- * @param dynamics
- *   The strings to resize.
+ * @param structure
+ *   The dynamics to resize.
  *
  * @return
  *   F_none on success.
@@ -120,6 +120,7 @@ extern "C" {
  * @see f_utf_string_dynamics_decrease_by()
  * @see f_utf_string_dynamics_increase()
  * @see f_utf_string_dynamics_increase_by()
+ * @see f_utf_string_dynamics_resize()
  * @see f_utf_string_map_multis_append()
  * @see f_utf_string_map_multis_append_all()
  * @see f_utf_string_map_multis_decrease_by()
@@ -132,9 +133,9 @@ extern "C" {
  * @see f_utf_string_map_multiss_increase()
  * @see f_utf_string_map_multiss_increase_by()
  */
-#if !defined(_di_f_utf_string_dynamics_decrease_by_) || !defined(_di_f_utf_string_dynamics_increase_) || !defined(_di_f_utf_string_dynamics_increase_by_) || !defined(_di_f_utf_string_map_multis_append_) || !defined(_di_f_utf_string_map_multis_append_all_) || !defined(_di_f_utf_string_map_multis_decrease_by_) || !defined(_di_f_utf_string_map_multis_increase_) || !defined(_di_f_utf_string_map_multis_increase_by_) || !defined(_di_f_utf_string_map_multis_resize_) || !defined(_di_f_utf_string_map_multiss_append_) || !defined(_di_f_utf_string_map_multiss_append_all_) || !defined(_di_f_utf_string_map_multiss_decrease_by_) || !defined(_di_f_utf_string_map_multiss_increase_) || !defined(_di_f_utf_string_map_multiss_increase_by_)
-  extern f_status_t private_f_utf_string_dynamics_resize(const f_number_unsigned_t length, f_utf_string_dynamics_t * const dynamics) F_attribute_visibility_internal_d;
-#endif // !defined(_di_f_utf_string_dynamics_decrease_by_) || !defined(_di_f_utf_string_dynamics_increase_) || !defined(_di_f_utf_string_dynamics_increase_by_) || !defined(_di_f_utf_string_map_multis_append_) || !defined(_di_f_utf_string_map_multis_append_all_) || !defined(_di_f_utf_string_map_multis_decrease_by_) || !defined(_di_f_utf_string_map_multis_increase_) || !defined(_di_f_utf_string_map_multis_increase_by_) || !defined(_di_f_utf_string_map_multis_resize_) || !defined(_di_f_utf_string_map_multiss_append_) || !defined(_di_f_utf_string_map_multiss_append_all_) || !defined(_di_f_utf_string_map_multiss_decrease_by_) || !defined(_di_f_utf_string_map_multiss_increase_) || !defined(_di_f_utf_string_map_multiss_increase_by_)
+#if !defined(_di_f_utf_string_dynamics_decrease_by_) || !defined(_di_f_utf_string_dynamics_increase_) || !defined(_di_f_utf_string_dynamics_increase_by_) || !defined(f_utf_string_dynamics_resize) || !defined(_di_f_utf_string_map_multis_append_) || !defined(_di_f_utf_string_map_multis_append_all_) || !defined(_di_f_utf_string_map_multis_decrease_by_) || !defined(_di_f_utf_string_map_multis_increase_) || !defined(_di_f_utf_string_map_multis_increase_by_) || !defined(_di_f_utf_string_map_multis_resize_) || !defined(_di_f_utf_string_map_multiss_append_) || !defined(_di_f_utf_string_map_multiss_append_all_) || !defined(_di_f_utf_string_map_multiss_decrease_by_) || !defined(_di_f_utf_string_map_multiss_increase_) || !defined(_di_f_utf_string_map_multiss_increase_by_)
+  extern f_status_t private_f_utf_string_dynamics_resize(const f_number_unsigned_t length, f_utf_string_dynamics_t * const structure) F_attribute_visibility_internal_d;
+#endif // !defined(_di_f_utf_string_dynamics_decrease_by_) || !defined(_di_f_utf_string_dynamics_increase_) || !defined(_di_f_utf_string_dynamics_increase_by_) || !defined(f_utf_string_dynamics_resize) || !defined(_di_f_utf_string_map_multis_append_) || !defined(_di_f_utf_string_map_multis_append_all_) || !defined(_di_f_utf_string_map_multis_decrease_by_) || !defined(_di_f_utf_string_map_multis_increase_) || !defined(_di_f_utf_string_map_multis_increase_by_) || !defined(_di_f_utf_string_map_multis_resize_) || !defined(_di_f_utf_string_map_multiss_append_) || !defined(_di_f_utf_string_map_multiss_append_all_) || !defined(_di_f_utf_string_map_multiss_decrease_by_) || !defined(_di_f_utf_string_map_multiss_increase_) || !defined(_di_f_utf_string_map_multiss_increase_by_)
 
 #ifdef __cplusplus
 } // extern "C"

diff --git a/level_0/f_utf/c/utf/private-dynamicss.c b/level_0/f_utf/c/utf/private-dynamicss.c
index fefdf409f31672ff4f7a61c2c8a245282632a876..69b518583dc60d146f14161dbb1034658d4f33af 100644 (file)
--- a/level_0/f_utf/c/utf/private-dynamicss.c
+++ b/level_0/f_utf/c/utf/private-dynamicss.c
@@ -10,58 +10,32 @@ extern "C" {
 #endif
 
 #if !defined(_di_f_utf_string_dynamicss_adjust_) || !defined(_di_f_utf_string_dynamicss_append_) || !defined(_di_f_utf_string_dynamicss_decimate_by_) || !defined(_di_f_utf_string_map_multis_adjust_) || !defined(_di_f_utf_string_map_multis_append_)
-  f_status_t private_f_utf_string_dynamicss_adjust(const f_number_unsigned_t length, f_utf_string_dynamicss_t * const dynamicss) {
-
-    if (dynamicss->used + length > F_number_t_size_unsigned_d) {
-      return F_status_set_error(F_array_too_large);
-    }
+  f_status_t private_f_utf_string_dynamicss_adjust(const f_number_unsigned_t length, f_utf_string_dynamicss_t * const structure) {
 
     f_status_t status = F_none;
 
-    for (f_number_unsigned_t i = length; i < dynamicss->size; ++i) {
+    for (f_number_unsigned_t i = length; i < structure->size; ++i) {
 
-      status = private_f_utf_string_dynamics_adjust(0, &dynamicss->array[i]);
+      status = private_f_utf_string_dynamics_adjust(0, &structure->array[i]);
       if (F_status_is_error(status)) return status;
     } // for
 
-    status = f_memory_adjust(dynamicss->size, length, sizeof(f_utf_string_dynamics_t), (void **) & dynamicss->array);
-    if (F_status_is_error(status)) return status;
-
-    dynamicss->size = length;
-
-    if (dynamicss->used > dynamicss->size) {
-      dynamicss->used = length;
-    }
-
-    return F_none;
+    return f_memory_array_adjust(length, sizeof(f_utf_string_dynamics_t), (void **) &structure->array, &structure->used, &structure->size);
   }
 #endif // !defined(_di_f_utf_string_dynamicss_adjust_) || !defined(_di_f_utf_string_dynamicss_append_) || !defined(_di_f_utf_string_dynamicss_decimate_by_) || !defined(_di_f_utf_string_map_multis_adjust_) || !defined(_di_f_utf_string_map_multis_append_)
 
 #if !defined(_di_f_utf_string_dynamicss_decrease_by_) || !defined(_di_f_utf_string_dynamicss_increase_) || !defined(_di_f_utf_string_dynamicss_increase_by_) || !defined(_di_f_utf_string_dynamicss_append_all_) || !defined(_di_f_utf_string_map_multis_append_all_)
-  f_status_t private_f_utf_string_dynamicss_resize(const f_number_unsigned_t length, f_utf_string_dynamicss_t * const dynamicss) {
-
-    if (dynamicss->used + length > F_number_t_size_unsigned_d) {
-      return F_status_set_error(F_array_too_large);
-    }
+  f_status_t private_f_utf_string_dynamicss_resize(const f_number_unsigned_t length, f_utf_string_dynamicss_t * const structure) {
 
     f_status_t status = F_none;
 
-    for (f_number_unsigned_t i = length; i < dynamicss->size; ++i) {
+    for (f_number_unsigned_t i = length; i < structure->size; ++i) {
 
-      status = private_f_utf_string_dynamics_resize(0, &dynamicss->array[i]);
+      status = private_f_utf_string_dynamics_resize(0, &structure->array[i]);
       if (F_status_is_error(status)) return status;
     } // for
 
-    status = f_memory_resize(dynamicss->size, length, sizeof(f_utf_string_dynamics_t), (void **) & dynamicss->array);
-    if (F_status_is_error(status)) return status;
-
-    dynamicss->size = length;
-
-    if (dynamicss->used > dynamicss->size) {
-      dynamicss->used = length;
-    }
-
-    return F_none;
+    return f_memory_array_resize(length, sizeof(f_utf_string_dynamics_t), (void **) &structure->array, &structure->used, &structure->size);
   }
 #endif // !defined(_di_f_utf_string_dynamicss_decrease_by_) || !defined(_di_f_utf_string_dynamicss_increase_) || !defined(_di_f_utf_string_dynamicss_increase_by_) || !defined(_di_f_utf_string_dynamicss_append_all_) || !defined(_di_f_utf_string_map_multis_append_all_)
 

diff --git a/level_0/f_utf/c/utf/private-dynamicss.h b/level_0/f_utf/c/utf/private-dynamicss.h
index c30fdd39218589ab2dbb6ca4534cda55a78363cd..58d36bc053f49c27d8f86c366264d960eebb3a9b 100644 (file)
--- a/level_0/f_utf/c/utf/private-dynamicss.h
+++ b/level_0/f_utf/c/utf/private-dynamicss.h
@@ -1,7 +1,7 @@
 /**
  * FLL - Level 0
  *
- * Project: String
+ * Project: UTF
  * API Version: 0.7
  * Licenses: lgpl-2.1-or-later
  *
@@ -22,8 +22,8 @@ extern "C" {
  *
  * @param length
  *   The new size to use.
- * @param dynamicss
- *   The strings to adjust.
+ * @param structure
+ *   The dynamicss to adjust.
  *
  * @return
  *   F_none on success.
@@ -33,6 +33,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_adjust().
  *
  * @see f_memory_adjust()
+ *
  * @see f_utf_string_dynamicss_adjust()
  * @see f_utf_string_dynamicss_append()
  * @see f_utf_string_dynamicss_decimate_by()
@@ -40,7 +41,7 @@ extern "C" {
  * @see f_utf_string_map_multis_append()
  */
 #if !defined(_di_f_utf_string_dynamicss_adjust_) || !defined(_di_f_utf_string_dynamicss_append_) || !defined(_di_f_utf_string_dynamicss_decimate_by_) || !defined(_di_f_utf_string_map_multis_adjust_) || !defined(_di_f_utf_string_map_multis_append_)
-  extern f_status_t private_f_utf_string_dynamicss_adjust(const f_number_unsigned_t length, f_utf_string_dynamicss_t * const dynamicss) F_attribute_visibility_internal_d;
+  extern f_status_t private_f_utf_string_dynamicss_adjust(const f_number_unsigned_t length, f_utf_string_dynamicss_t * const structure) F_attribute_visibility_internal_d;
 #endif // !defined(_di_f_utf_string_dynamicss_adjust_) || !defined(_di_f_utf_string_dynamicss_append_) || !defined(_di_f_utf_string_dynamicss_decimate_by_) || !defined(_di_f_utf_string_map_multis_adjust_) || !defined(_di_f_utf_string_map_multis_append_)
 
 /**
@@ -50,8 +51,8 @@ extern "C" {
  *
  * @param length
  *   The new size to use.
- * @param dynamicss
- *   The strings to resize.
+ * @param structure
+ *   The dynamicss to resize.
  *
  * @return
  *   F_none on success.
@@ -61,6 +62,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  *
  * @see f_memory_resize()
+ *
  * @see f_utf_string_dynamicss_append_all()
  * @see f_utf_string_dynamicss_decrease_by()
  * @see f_utf_string_dynamicss_increase()
@@ -68,7 +70,7 @@ extern "C" {
  * @see f_utf_string_map_multis_append_all()
  */
 #if !defined(_di_f_utf_string_dynamicss_decrease_by_) || !defined(_di_f_utf_string_dynamicss_increase_) || !defined(_di_f_utf_string_dynamicss_increase_by_) || !defined(_di_f_utf_string_dynamicss_append_all_) || !defined(_di_f_utf_string_map_multis_append_all_)
-  extern f_status_t private_f_utf_string_dynamicss_resize(const f_number_unsigned_t length, f_utf_string_dynamicss_t * const dynamicss) F_attribute_visibility_internal_d;
+  extern f_status_t private_f_utf_string_dynamicss_resize(const f_number_unsigned_t length, f_utf_string_dynamicss_t * const structure) F_attribute_visibility_internal_d;
 #endif // !defined(_di_f_utf_string_dynamicss_decrease_by_) || !defined(_di_f_utf_string_dynamicss_increase_) || !defined(_di_f_utf_string_dynamicss_increase_by_) || !defined(_di_f_utf_string_dynamicss_append_all_) || !defined(_di_f_utf_string_map_multis_append_all_)
 
 #ifdef __cplusplus

diff --git a/level_0/f_utf/c/utf/private-map_multis.c b/level_0/f_utf/c/utf/private-map_multis.c
index a20eb1fa1d129caac14302310f56d3a185a51451..fcfc31766416abbf66dff1e57d9a29c8f4466640 100644 (file)
--- a/level_0/f_utf/c/utf/private-map_multis.c
+++ b/level_0/f_utf/c/utf/private-map_multis.c
@@ -10,33 +10,20 @@ extern "C" {
 #endif
 
 #if !defined(_di_f_utf_string_map_multis_adjust_) || !defined(_di_f_utf_string_map_multis_decimate_by_)
-  f_status_t private_f_utf_string_map_multis_adjust(const f_number_unsigned_t length, f_utf_string_map_multis_t * const map_multis) {
-
-    if (map_multis->used + length > F_number_t_size_unsigned_d) {
-      return F_status_set_error(F_array_too_large);
-    }
+  f_status_t private_f_utf_string_map_multis_adjust(const f_number_unsigned_t length, f_utf_string_map_multis_t * const structure) {
 
     f_status_t status = F_none;
 
-    for (f_number_unsigned_t i = length; i < map_multis->size; ++i) {
+    for (f_number_unsigned_t i = length; i < structure->size; ++i) {
 
-      status = private_f_utf_string_dynamic_adjust(0, &map_multis->array[i].name);
+      status = f_memory_array_adjust(0, sizeof(f_utf_string_t), (void **) &structure->array[i].name.string, &structure->array[i].name.used, &structure->array[i].name.size);
       if (F_status_is_error(status)) return status;
 
-      status = private_f_utf_string_dynamics_adjust(0, &map_multis->array[i].value);
+      status = private_f_utf_string_dynamics_adjust(0, &structure->array[i].value);
       if (F_status_is_error(status)) return status;
     } // for
 
-    status = f_memory_adjust(map_multis->size, length, sizeof(f_utf_string_map_multi_t), (void **) & map_multis->array);
-    if (F_status_is_error(status)) return status;
-
-    map_multis->size = length;
-
-    if (map_multis->used > map_multis->size) {
-      map_multis->used = length;
-    }
-
-    return F_none;
+    return f_memory_array_adjust(length, sizeof(f_utf_string_map_multi_t), (void **) &structure->array, &structure->used, &structure->size);
   }
 #endif // !defined(_di_f_utf_string_map_multis_adjust_) || !defined(_di_f_utf_string_map_multis_decimate_by_)
 
@@ -71,33 +58,20 @@ extern "C" {
 #endif // !defined(_di_f_utf_string_map_multis_append_all_) || !defined(_di_f_utf_string_map_multiss_append_) || !defined(_di_f_utf_string_map_multiss_append_all_)
 
 #if !defined(_di_f_utf_string_map_multis_append_) || !defined(_di_f_utf_string_map_multis_append_all_) || !defined(_di_f_utf_string_map_multis_decrease_by_) || !defined(_di_f_utf_string_map_multis_increase_) || !defined(_di_f_utf_string_map_multis_increase_by_) || !defined(_di_f_utf_string_map_multis_resize_) || !defined(_di_f_utf_string_map_multiss_append_) || !defined(_di_f_utf_string_map_multiss_append_all_) || !defined(_di_f_utf_string_map_multiss_decrease_by_) || !defined(_di_f_utf_string_map_multiss_increase_) || !defined(_di_f_utf_string_map_multiss_increase_by_)
-  f_status_t private_f_utf_string_map_multis_resize(const f_number_unsigned_t length, f_utf_string_map_multis_t * const map_multis) {
-
-    if (map_multis->used + length > F_number_t_size_unsigned_d) {
-      return F_status_set_error(F_array_too_large);
-    }
+  f_status_t private_f_utf_string_map_multis_resize(const f_number_unsigned_t length, f_utf_string_map_multis_t * const structure) {
 
     f_status_t status = F_none;
 
-    for (f_number_unsigned_t i = length; i < map_multis->size; ++i) {
+    for (f_number_unsigned_t i = length; i < structure->size; ++i) {
 
-      status = private_f_utf_string_dynamic_resize(0, &map_multis->array[i].name);
+      status = f_memory_array_resize(0, sizeof(f_utf_string_t), (void **) &structure->array[i].name.string, &structure->array[i].name.used, &structure->array[i].name.size);
       if (F_status_is_error(status)) return status;
 
-      status = private_f_utf_string_dynamics_resize(0, &map_multis->array[i].value);
+      status = private_f_utf_string_dynamics_resize(0, &structure->array[i].value);
       if (F_status_is_error(status)) return status;
     } // for
 
-    status = f_memory_resize(map_multis->size, length, sizeof(f_utf_string_map_multi_t), (void **) & map_multis->array);
-    if (F_status_is_error(status)) return status;
-
-    map_multis->size = length;
-
-    if (map_multis->used > map_multis->size) {
-      map_multis->used = length;
-    }
-
-    return F_none;
+    return f_memory_array_resize(length, sizeof(f_utf_string_map_multi_t), (void **) &structure->array, &structure->used, &structure->size);
   }
 #endif // !defined(_di_f_utf_string_map_multis_append_) || !defined(_di_f_utf_string_map_multis_append_all_) || !defined(_di_f_utf_string_map_multis_decrease_by_) || !defined(_di_f_utf_string_map_multis_increase_) || !defined(_di_f_utf_string_map_multis_increase_by_) || !defined(_di_f_utf_string_map_multis_resize_) || !defined(_di_f_utf_string_map_multiss_append_) || !defined(_di_f_utf_string_map_multiss_append_all_) || !defined(_di_f_utf_string_map_multiss_decrease_by_) || !defined(_di_f_utf_string_map_multiss_increase_) || !defined(_di_f_utf_string_map_multiss_increase_by_)
 

diff --git a/level_0/f_utf/c/utf/private-map_multis.h b/level_0/f_utf/c/utf/private-map_multis.h
index 12b612e7bde28bac7132be42b4e34bbabcb83d74..aa6c4ed123a7f21e93f3c6d0efbab34886252b71 100644 (file)
--- a/level_0/f_utf/c/utf/private-map_multis.h
+++ b/level_0/f_utf/c/utf/private-map_multis.h
@@ -1,15 +1,15 @@
 /**
  * FLL - Level 0
  *
- * Project: String
+ * Project: UTF
  * API Version: 0.7
  * Licenses: lgpl-2.1-or-later
  *
  * These are provided for internal reduction in redundant code.
  * These should not be exposed/used outside of this project.
  */
-#ifndef _PRIVATE_F_map_multis_h
-#define _PRIVATE_F_map_multis_h
+#ifndef _PRIVATE_F_utf_map_multis_h
+#define _PRIVATE_F_utf_map_multis_h
 
 #ifdef __cplusplus
 extern "C" {
@@ -46,7 +46,7 @@ extern "C" {
  * Intended to be shared to each of the different implementation variations.
  *
  * @param source
- *   The source map_multis to append.
+ *   The source destination to append.
  * @param destination
  *   The destination map_multis the source is appended onto.
  *
@@ -106,4 +106,4 @@ extern "C" {
 } // extern "C"
 #endif
 
-#endif // _PRIVATE_F_map_multis_h
+#endif // _PRIVATE_F_utf_map_multis_h

diff --git a/level_0/f_utf/c/utf/private-map_multiss.c b/level_0/f_utf/c/utf/private-map_multiss.c
index 3eb961bfcca34055896cfdad7c5e2344969a40e9..125a66828bbef8bb2cf0fa928230f5ce8b851f13 100644 (file)
--- a/level_0/f_utf/c/utf/private-map_multiss.c
+++ b/level_0/f_utf/c/utf/private-map_multiss.c
@@ -1,6 +1,7 @@
 #include "../utf.h"
 #include "../private-utf.h"
 #include "private-dynamic.h"
+#include "private-dynamics.h"
 #include "private-map_multis.h"
 #include "private-map_multiss.h"
 #include "private-string.h"
@@ -10,58 +11,32 @@ extern "C" {
 #endif
 
 #if !defined(_di_f_utf_string_map_multiss_adjust_) || !defined(_di_f_utf_string_map_multiss_decimate_by_)
-  f_status_t private_f_utf_string_map_multiss_adjust(const f_number_unsigned_t length, f_utf_string_map_multiss_t * const map_multiss) {
-
-    if (map_multiss->used + length > F_number_t_size_unsigned_d) {
-      return F_status_set_error(F_array_too_large);
-    }
+  f_status_t private_f_utf_string_map_multiss_adjust(const f_number_unsigned_t length, f_utf_string_map_multiss_t * const structure) {
 
     f_status_t status = F_none;
 
-    for (f_number_unsigned_t i = length; i < map_multiss->size; ++i) {
+    for (f_number_unsigned_t i = length; i < structure->size; ++i) {
 
-      status = private_f_utf_string_map_multis_adjust(0, &map_multiss->array[i]);
+      status = private_f_utf_string_map_multis_adjust(0, &structure->array[i]);
       if (F_status_is_error(status)) return status;
     } // for
 
-    status = f_memory_adjust(map_multiss->size, length, sizeof(f_utf_string_map_multis_t), (void **) & map_multiss->array);
-    if (F_status_is_error(status)) return status;
-
-    map_multiss->size = length;
-
-    if (map_multiss->used > map_multiss->size) {
-      map_multiss->used = length;
-    }
-
-    return F_none;
+    return f_memory_array_adjust(length, sizeof(f_utf_string_map_multis_t), (void **) &structure->array, &structure->used, &structure->size);
   }
 #endif // !defined(_di_f_utf_string_map_multiss_adjust_) || !defined(_di_f_utf_string_map_multiss_decimate_by_)
 
 #if !defined(_di_f_utf_string_map_multiss_decrease_by_) || !defined(_di_f_utf_string_map_multiss_increase_) || !defined(_di_f_utf_string_map_multiss_increase_by_)
-  f_status_t private_f_utf_string_map_multiss_resize(const f_number_unsigned_t length, f_utf_string_map_multiss_t * const map_multiss) {
-
-    if (map_multiss->used + length > F_number_t_size_unsigned_d) {
-      return F_status_set_error(F_array_too_large);
-    }
+  f_status_t private_f_utf_string_map_multiss_resize(const f_number_unsigned_t length, f_utf_string_map_multiss_t * const structure) {
 
     f_status_t status = F_none;
 
-    for (f_number_unsigned_t i = length; i < map_multiss->size; ++i) {
+    for (f_number_unsigned_t i = length; i < structure->size; ++i) {
 
-      status = private_f_utf_string_map_multis_resize(0, &map_multiss->array[i]);
+      status = private_f_utf_string_map_multis_resize(0, &structure->array[i]);
       if (F_status_is_error(status)) return status;
     } // for
 
-    status = f_memory_resize(map_multiss->size, length, sizeof(f_utf_string_map_multis_t), (void **) & map_multiss->array);
-    if (F_status_is_error(status)) return status;
-
-    map_multiss->size = length;
-
-    if (map_multiss->used > map_multiss->size) {
-      map_multiss->used = length;
-    }
-
-    return F_none;
+    return f_memory_array_resize(length, sizeof(f_utf_string_map_multis_t), (void **) &structure->array, &structure->used, &structure->size);
   }
 #endif // !defined(_di_f_utf_string_map_multiss_decrease_by_) || !defined(_di_f_utf_string_map_multiss_increase_) || !defined(_di_f_utf_string_map_multiss_increase_by_)
 

diff --git a/level_0/f_utf/c/utf/private-map_multiss.h b/level_0/f_utf/c/utf/private-map_multiss.h
index fd264956d5e0dbfc9b38ee8b47930da5e8f19774..d044bcbe779ed70d9cf4179aff6a518399139720 100644 (file)
--- a/level_0/f_utf/c/utf/private-map_multiss.h
+++ b/level_0/f_utf/c/utf/private-map_multiss.h
@@ -1,15 +1,15 @@
 /**
  * FLL - Level 0
  *
- * Project: String
+ * Project: UTF
  * API Version: 0.7
  * Licenses: lgpl-2.1-or-later
  *
  * These are provided for internal reduction in redundant code.
  * These should not be exposed/used outside of this project.
  */
-#ifndef _PRIVATE_F_map_multiss_h
-#define _PRIVATE_F_map_multiss_h
+#ifndef _PRIVATE_F_utf_map_multiss_h
+#define _PRIVATE_F_utf_map_multiss_h
 
 #ifdef __cplusplus
 extern "C" {
@@ -22,7 +22,7 @@ extern "C" {
  *
  * @param length
  *   The new size to use.
- * @param map_multiss
+ * @param structure
  *   The map_multiss to adjust.
  *
  * @return
@@ -37,7 +37,7 @@ extern "C" {
  * @see f_utf_string_map_multiss_adjust()
  */
 #if !defined(_di_f_utf_string_map_multiss_adjust_) || !defined(_di_f_utf_string_map_multiss_decimate_by_)
-  extern f_status_t private_f_utf_string_map_multiss_adjust(const f_number_unsigned_t length, f_utf_string_map_multiss_t * const map_multiss) F_attribute_visibility_internal_d;
+  extern f_status_t private_f_utf_string_map_multiss_adjust(const f_number_unsigned_t length, f_utf_string_map_multiss_t * const structure) F_attribute_visibility_internal_d;
 #endif // !defined(_di_f_utf_string_map_multiss_adjust_) || !defined(_di_f_utf_string_map_multiss_decimate_by_)
 
 /**
@@ -47,7 +47,7 @@ extern "C" {
  *
  * @param length
  *   The new size to use.
- * @param map_multiss
+ * @param structure
  *   The map_multiss to resize.
  *
  * @return
@@ -64,11 +64,11 @@ extern "C" {
  * @see f_utf_string_map_multiss_increase_by()
  */
 #if !defined(_di_f_utf_string_map_multiss_decrease_by_) || !defined(_di_f_utf_string_map_multiss_increase_) || !defined(_di_f_utf_string_map_multiss_increase_by_)
-  extern f_status_t private_f_utf_string_map_multiss_resize(const f_number_unsigned_t length, f_utf_string_map_multiss_t * const map_multiss) F_attribute_visibility_internal_d;
+  extern f_status_t private_f_utf_string_map_multiss_resize(const f_number_unsigned_t length, f_utf_string_map_multiss_t * const structure) F_attribute_visibility_internal_d;
 #endif // !defined(_di_f_utf_string_map_multiss_decrease_by_) || !defined(_di_f_utf_string_map_multiss_increase_) || !defined(_di_f_utf_string_map_multiss_increase_by_)
 
 #ifdef __cplusplus
 } // extern "C"
 #endif
 
-#endif // _PRIVATE_F_map_multiss_h
+#endif // _PRIVATE_F_utf_map_multiss_h

diff --git a/level_0/f_utf/c/utf/private-maps.c b/level_0/f_utf/c/utf/private-maps.c
index 8886dabda50d4a691e1c86c4b3c8681d761cb22d..70a4e3eb63312908f5672b9b8790e74984a254fd 100644 (file)
--- a/level_0/f_utf/c/utf/private-maps.c
+++ b/level_0/f_utf/c/utf/private-maps.c
@@ -9,33 +9,20 @@ extern "C" {
 #endif
 
 #if !defined(_di_f_utf_string_maps_adjust_) || !defined(_di_f_utf_string_maps_decimate_by_)
-  f_status_t private_f_utf_string_maps_adjust(const f_number_unsigned_t length, f_utf_string_maps_t * const maps) {
-
-    if (maps->used + length > F_number_t_size_unsigned_d) {
-      return F_status_set_error(F_array_too_large);
-    }
+  f_status_t private_f_utf_string_maps_adjust(const f_number_unsigned_t length, f_utf_string_maps_t * const structure) {
 
     f_status_t status = F_none;
 
-    for (f_number_unsigned_t i = length; i < maps->size; ++i) {
+    for (f_number_unsigned_t i = length; i < structure->size; ++i) {
 
-      status = private_f_utf_string_dynamic_adjust(0, &maps->array[i].name);
+      status = f_memory_array_adjust(0, sizeof(f_utf_string_t), (void **) &structure->array[i].name.string, &structure->array[i].name.used, &structure->array[i].name.size);
       if (F_status_is_error(status)) return status;
 
-      status = private_f_utf_string_dynamic_adjust(0, &maps->array[i].value);
+      status = f_memory_array_adjust(0, sizeof(f_utf_string_t), (void **) &structure->array[i].value.string, &structure->array[i].value.used, &structure->array[i].value.size);
       if (F_status_is_error(status)) return status;
     } // for
 
-    status = f_memory_adjust(maps->size, length, sizeof(f_utf_string_map_t), (void **) & maps->array);
-    if (F_status_is_error(status)) return status;
-
-    maps->size = length;
-
-    if (maps->used > maps->size) {
-      maps->used = length;
-    }
-
-    return F_none;
+    return f_memory_array_adjust(length, sizeof(f_utf_string_map_t), (void **) &structure->array, &structure->used, &structure->size);
   }
 #endif // !defined(_di_f_utf_string_maps_adjust_) || !defined(_di_f_utf_string_maps_decimate_by_)
 
@@ -70,33 +57,20 @@ extern "C" {
 #endif // !defined(_di_f_utf_string_maps_append_all_) || !defined(_di_f_utf_string_mapss_append_) || !defined(_di_f_utf_string_mapss_append_all_)
 
 #if !defined(_di_f_utf_string_maps_append_) || !defined(_di_f_utf_string_maps_append_all_) || !defined(_di_f_utf_string_maps_decrease_by_) || !defined(_di_f_utf_string_maps_increase_) || !defined(_di_f_utf_string_maps_increase_by_) || !defined(_di_f_utf_string_maps_resize_) || !defined(_di_f_utf_string_mapss_append_) || !defined(_di_f_utf_string_mapss_append_all_) || !defined(_di_f_utf_string_mapss_decrease_by_) || !defined(_di_f_utf_string_mapss_increase_) || !defined(_di_f_utf_string_mapss_increase_by_)
-  f_status_t private_f_utf_string_maps_resize(const f_number_unsigned_t length, f_utf_string_maps_t * const maps) {
-
-    if (maps->used + length > F_number_t_size_unsigned_d) {
-      return F_status_set_error(F_array_too_large);
-    }
+  f_status_t private_f_utf_string_maps_resize(const f_number_unsigned_t length, f_utf_string_maps_t * const structure) {
 
     f_status_t status = F_none;
 
-    for (f_number_unsigned_t i = length; i < maps->size; ++i) {
+    for (f_number_unsigned_t i = length; i < structure->size; ++i) {
 
-      status = private_f_utf_string_dynamic_resize(0, &maps->array[i].name);
+      status = f_memory_array_resize(0, sizeof(f_utf_string_t), (void **) &structure->array[i].name.string, &structure->array[i].name.used, &structure->array[i].name.size);
       if (F_status_is_error(status)) return status;
 
-      status = private_f_utf_string_dynamic_resize(0, &maps->array[i].value);
+      status = f_memory_array_resize(0, sizeof(f_utf_string_t), (void **) &structure->array[i].value.string, &structure->array[i].value.used, &structure->array[i].value.size);
       if (F_status_is_error(status)) return status;
     } // for
 
-    status = f_memory_resize(maps->size, length, sizeof(f_utf_string_map_t), (void **) & maps->array);
-    if (F_status_is_error(status)) return status;
-
-    maps->size = length;
-
-    if (maps->used > maps->size) {
-      maps->used = length;
-    }
-
-    return F_none;
+    return f_memory_array_resize(length, sizeof(f_utf_string_map_t), (void **) &structure->array, &structure->used, &structure->size);
   }
 #endif // !defined(_di_f_utf_string_maps_append_) || !defined(_di_f_utf_string_maps_append_all_) || !defined(_di_f_utf_string_maps_decrease_by_) || !defined(_di_f_utf_string_maps_increase_) || !defined(_di_f_utf_string_maps_increase_by_) || !defined(_di_f_utf_string_maps_resize_) || !defined(_di_f_utf_string_mapss_append_) || !defined(_di_f_utf_string_mapss_append_all_) || !defined(_di_f_utf_string_mapss_decrease_by_) || !defined(_di_f_utf_string_mapss_increase_) || !defined(_di_f_utf_string_mapss_increase_by_)
 

diff --git a/level_0/f_utf/c/utf/private-maps.h b/level_0/f_utf/c/utf/private-maps.h
index a342a9cd5cfbb94ac3440b096abb094c0f1b4de2..52b159cf449421dd66aea3d13774f949100104ea 100644 (file)
--- a/level_0/f_utf/c/utf/private-maps.h
+++ b/level_0/f_utf/c/utf/private-maps.h
@@ -1,7 +1,7 @@
 /**
  * FLL - Level 0
  *
- * Project: String
+ * Project: UTF
  * API Version: 0.7
  * Licenses: lgpl-2.1-or-later
  *
@@ -22,7 +22,7 @@ extern "C" {
  *
  * @param length
  *   The new size to use.
- * @param maps
+ * @param structure
  *   The maps to adjust.
  *
  * @return
@@ -37,7 +37,7 @@ extern "C" {
  * @see f_utf_string_maps_adjust()
  */
 #if !defined(_di_f_utf_string_maps_adjust_) || !defined(_di_f_utf_string_maps_decimate_by_)
-  extern f_status_t private_f_utf_string_maps_adjust(const f_number_unsigned_t length, f_utf_string_maps_t * const maps) F_attribute_visibility_internal_d;
+  extern f_status_t private_f_utf_string_maps_adjust(const f_number_unsigned_t length, f_utf_string_maps_t * const structure) F_attribute_visibility_internal_d;
 #endif // !defined(_di_f_utf_string_maps_adjust_) || !defined(_di_f_utf_string_maps_decimate_by_)
 
 /**
@@ -46,7 +46,7 @@ extern "C" {
  * Intended to be shared to each of the different implementation variations.
  *
  * @param source
- *   The source maps to append.
+ *   The source destination to append.
  * @param destination
  *   The destination maps the source is appended onto.
  *
@@ -74,7 +74,7 @@ extern "C" {
  *
  * @param length
  *   The new size to use.
- * @param maps
+ * @param structure
  *   The maps to resize.
  *
  * @return
@@ -85,7 +85,6 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  *
  * @see f_memory_resize()
- *
  * @see f_utf_string_maps_append()
  * @see f_utf_string_maps_append_all()
  * @see f_utf_string_maps_decrease_by()
@@ -99,7 +98,7 @@ extern "C" {
  * @see f_utf_string_mapss_increase_by()
  */
 #if !defined(_di_f_utf_string_maps_append_) || !defined(_di_f_utf_string_maps_append_all_) || !defined(_di_f_utf_string_maps_decrease_by_) || !defined(_di_f_utf_string_maps_increase_) || !defined(_di_f_utf_string_maps_increase_by_) || !defined(_di_f_utf_string_maps_resize_) || !defined(_di_f_utf_string_mapss_append_) || !defined(_di_f_utf_string_mapss_append_all_) || !defined(_di_f_utf_string_mapss_decrease_by_) || !defined(_di_f_utf_string_mapss_increase_) || !defined(_di_f_utf_string_mapss_increase_by_)
-  extern f_status_t private_f_utf_string_maps_resize(const f_number_unsigned_t length, f_utf_string_maps_t * const maps) F_attribute_visibility_internal_d;
+  extern f_status_t private_f_utf_string_maps_resize(const f_number_unsigned_t length, f_utf_string_maps_t * const structure) F_attribute_visibility_internal_d;
 #endif // !defined(_di_f_utf_string_maps_append_) || !defined(_di_f_utf_string_maps_append_all_) || !defined(_di_f_utf_string_maps_decrease_by_) || !defined(_di_f_utf_string_maps_increase_) || !defined(_di_f_utf_string_maps_increase_by_) || !defined(_di_f_utf_string_maps_resize_) || !defined(_di_f_utf_string_mapss_append_) || !defined(_di_f_utf_string_mapss_append_all_) || !defined(_di_f_utf_string_mapss_decrease_by_) || !defined(_di_f_utf_string_mapss_increase_) || !defined(_di_f_utf_string_mapss_increase_by_)
 
 #ifdef __cplusplus

diff --git a/level_0/f_utf/c/utf/private-mapss.c b/level_0/f_utf/c/utf/private-mapss.c
index bf28ef3bbb6eb0b9792bba02e1ecc74b1168fc4c..b7a77c6dba2f2672f482c2954acabb6fb9ebdc95 100644 (file)
--- a/level_0/f_utf/c/utf/private-mapss.c
+++ b/level_0/f_utf/c/utf/private-mapss.c
@@ -10,58 +10,32 @@ extern "C" {
 #endif
 
 #if !defined(_di_f_utf_string_mapss_adjust_) || !defined(_di_f_utf_string_mapss_decimate_by_)
-  f_status_t private_f_utf_string_mapss_adjust(const f_number_unsigned_t length, f_utf_string_mapss_t * const mapss) {
-
-    if (mapss->used + length > F_number_t_size_unsigned_d) {
-      return F_status_set_error(F_array_too_large);
-    }
+  f_status_t private_f_utf_string_mapss_adjust(const f_number_unsigned_t length, f_utf_string_mapss_t * const structure) {
 
     f_status_t status = F_none;
 
-    for (f_number_unsigned_t i = length; i < mapss->size; ++i) {
+    for (f_number_unsigned_t i = length; i < structure->size; ++i) {
 
-      status = private_f_utf_string_maps_adjust(0, &mapss->array[i]);
+      status = private_f_utf_string_maps_adjust(0, &structure->array[i]);
       if (F_status_is_error(status)) return status;
     } // for
 
-    status = f_memory_adjust(mapss->size, length, sizeof(f_utf_string_maps_t), (void **) & mapss->array);
-    if (F_status_is_error(status)) return status;
-
-    mapss->size = length;
-
-    if (mapss->used > mapss->size) {
-      mapss->used = length;
-    }
-
-    return F_none;
+    return f_memory_array_adjust(length, sizeof(f_utf_string_maps_t), (void **) &structure->array, &structure->used, &structure->size);
   }
 #endif // !defined(_di_f_utf_string_mapss_adjust_) || !defined(_di_f_utf_string_mapss_decimate_by_)
 
 #if !defined(_di_f_utf_string_mapss_decrease_by_) || !defined(_di_f_utf_string_mapss_increase_) || !defined(_di_f_utf_string_mapss_increase_by_)
-  f_status_t private_f_utf_string_mapss_resize(const f_number_unsigned_t length, f_utf_string_mapss_t * const mapss) {
-
-    if (mapss->used + length > F_number_t_size_unsigned_d) {
-      return F_status_set_error(F_array_too_large);
-    }
+  f_status_t private_f_utf_string_mapss_resize(const f_number_unsigned_t length, f_utf_string_mapss_t * const structure) {
 
     f_status_t status = F_none;
 
-    for (f_number_unsigned_t i = length; i < mapss->size; ++i) {
+    for (f_number_unsigned_t i = length; i < structure->size; ++i) {
 
-      status = private_f_utf_string_maps_resize(0, &mapss->array[i]);
+      status = private_f_utf_string_maps_resize(0, &structure->array[i]);
       if (F_status_is_error(status)) return status;
     } // for
 
-    status = f_memory_resize(mapss->size, length, sizeof(f_utf_string_maps_t), (void **) & mapss->array);
-    if (F_status_is_error(status)) return status;
-
-    mapss->size = length;
-
-    if (mapss->used > mapss->size) {
-      mapss->used = length;
-    }
-
-    return F_none;
+    return f_memory_array_resize(length, sizeof(f_utf_string_maps_t), (void **) &structure->array, &structure->used, &structure->size);
   }
 #endif // !defined(_di_f_utf_string_mapss_decrease_by_) || !defined(_di_f_utf_string_mapss_increase_) || !defined(_di_f_utf_string_mapss_increase_by_)
 

diff --git a/level_0/f_utf/c/utf/private-mapss.h b/level_0/f_utf/c/utf/private-mapss.h
index aaf2d668da300ba2dbfed37deea2ce2c17b0c90a..c6eea33b59e5ba48a71d5a8671ccc9b362c55818 100644 (file)
--- a/level_0/f_utf/c/utf/private-mapss.h
+++ b/level_0/f_utf/c/utf/private-mapss.h
@@ -1,7 +1,7 @@
 /**
  * FLL - Level 0
  *
- * Project: String
+ * Project: UTF
  * API Version: 0.7
  * Licenses: lgpl-2.1-or-later
  *
@@ -22,8 +22,8 @@ extern "C" {
  *
  * @param length
  *   The new size to use.
- * @param mapss
- *   The mapss to adjust.
+ * @param structure
+ *   The structure to adjust.
  *
  * @return
  *   F_none on success.
@@ -37,7 +37,7 @@ extern "C" {
  * @see f_utf_string_mapss_adjust()
  */
 #if !defined(_di_f_utf_string_mapss_adjust_) || !defined(_di_f_utf_string_mapss_decimate_by_)
-  extern f_status_t private_f_utf_string_mapss_adjust(const f_number_unsigned_t length, f_utf_string_mapss_t * const mapss) F_attribute_visibility_internal_d;
+  extern f_status_t private_f_utf_string_mapss_adjust(const f_number_unsigned_t length, f_utf_string_mapss_t * const structure) F_attribute_visibility_internal_d;
 #endif // !defined(_di_f_utf_string_mapss_adjust_) || !defined(_di_f_utf_string_mapss_decimate_by_)
 
 /**
@@ -47,8 +47,8 @@ extern "C" {
  *
  * @param length
  *   The new size to use.
- * @param mapss
- *   The mapss to resize.
+ * @param structure
+ *   The structure to resize.
  *
  * @return
  *   F_none on success.
@@ -64,7 +64,7 @@ extern "C" {
  * @see f_utf_string_mapss_increase_by()
  */
 #if !defined(_di_f_utf_string_mapss_decrease_by_) || !defined(_di_f_utf_string_mapss_increase_) || !defined(_di_f_utf_string_mapss_increase_by_)
-  extern f_status_t private_f_utf_string_mapss_resize(const f_number_unsigned_t length, f_utf_string_mapss_t * const mapss) F_attribute_visibility_internal_d;
+  extern f_status_t private_f_utf_string_mapss_resize(const f_number_unsigned_t length, f_utf_string_mapss_t * const structure) F_attribute_visibility_internal_d;
 #endif // !defined(_di_f_utf_string_mapss_decrease_by_) || !defined(_di_f_utf_string_mapss_increase_) || !defined(_di_f_utf_string_mapss_increase_by_)
 
 #ifdef __cplusplus

diff --git a/level_0/f_utf/c/utf/private-triples.c b/level_0/f_utf/c/utf/private-triples.c
index 0cbed9642c47b84e83cd626f35c9a2b0102c540e..c764a8e0238c5d1d6276397476a75ea467027636 100644 (file)
--- a/level_0/f_utf/c/utf/private-triples.c
+++ b/level_0/f_utf/c/utf/private-triples.c
@@ -9,36 +9,23 @@ extern "C" {
 #endif
 
 #if !defined(_di_f_utf_string_triples_adjust_) || !defined(_di_f_utf_string_triples_decimate_by_)
-  f_status_t private_f_utf_string_triples_adjust(const f_number_unsigned_t length, f_utf_string_triples_t * const triples) {
-
-    if (triples->used + length > F_number_t_size_unsigned_d) {
-      return F_status_set_error(F_array_too_large);
-    }
+  f_status_t private_f_utf_string_triples_adjust(const f_number_unsigned_t length, f_utf_string_triples_t * const structure) {
 
     f_status_t status = F_none;
 
-    for (f_number_unsigned_t i = length; i < triples->size; ++i) {
+    for (f_number_unsigned_t i = length; i < structure->size; ++i) {
 
-      status = private_f_utf_string_dynamic_adjust(0, &triples->array[i].a);
+      status = f_memory_array_adjust(0, sizeof(f_utf_string_triple_t), (void **) &structure->array[i].a.string, &structure->array[i].a.used, &structure->array[i].a.size);
       if (F_status_is_error(status)) return status;
 
-      status = private_f_utf_string_dynamic_adjust(0, &triples->array[i].b);
+      status = f_memory_array_adjust(0, sizeof(f_utf_string_triple_t), (void **) &structure->array[i].b.string, &structure->array[i].b.used, &structure->array[i].b.size);
       if (F_status_is_error(status)) return status;
 
-      status = private_f_utf_string_dynamic_adjust(0, &triples->array[i].c);
+      status = f_memory_array_adjust(0, sizeof(f_utf_string_triple_t), (void **) &structure->array[i].c.string, &structure->array[i].c.used, &structure->array[i].c.size);
       if (F_status_is_error(status)) return status;
     } // for
 
-    status = f_memory_adjust(triples->size, length, sizeof(f_utf_string_triple_t), (void **) & triples->array);
-    if (F_status_is_error(status)) return status;
-
-    triples->size = length;
-
-    if (triples->used > triples->size) {
-      triples->used = length;
-    }
-
-    return F_none;
+    return f_memory_array_adjust(length, sizeof(f_utf_string_triple_t), (void **) &structure->array, &structure->used, &structure->size);
   }
 #endif // !defined(_di_f_utf_string_triples_adjust_) || !defined(_di_f_utf_string_triples_decimate_by_)
 
@@ -79,36 +66,23 @@ extern "C" {
 #endif // !defined(_di_f_utf_string_triples_append_all_) || !defined(_di_f_utf_string_tripless_append_) || !defined(_di_f_utf_string_tripless_append_all_)
 
 #if !defined(_di_f_utf_string_triples_decrease_by_) || !defined(_di_f_utf_string_triples_increase_) || !defined(_di_f_utf_string_triples_increase_by_)
-  f_status_t private_f_utf_string_triples_resize(const f_number_unsigned_t length, f_utf_string_triples_t * const triples) {
-
-    if (triples->used + length > F_number_t_size_unsigned_d) {
-      return F_status_set_error(F_array_too_large);
-    }
+  f_status_t private_f_utf_string_triples_resize(const f_number_unsigned_t length, f_utf_string_triples_t * const structure) {
 
     f_status_t status = F_none;
 
-    for (f_number_unsigned_t i = length; i < triples->size; ++i) {
+    for (f_number_unsigned_t i = length; i < structure->size; ++i) {
 
-      status = private_f_utf_string_dynamic_resize(0, &triples->array[i].a);
+      status = f_memory_array_resize(0, sizeof(f_utf_string_triple_t), (void **) &structure->array[i].a.string, &structure->array[i].a.used, &structure->array[i].a.size);
       if (F_status_is_error(status)) return status;
 
-      status = private_f_utf_string_dynamic_resize(0, &triples->array[i].b);
+      status = f_memory_array_resize(0, sizeof(f_utf_string_triple_t), (void **) &structure->array[i].b.string, &structure->array[i].b.used, &structure->array[i].b.size);
       if (F_status_is_error(status)) return status;
 
-      status = private_f_utf_string_dynamic_resize(0, &triples->array[i].c);
+      status = f_memory_array_resize(0, sizeof(f_utf_string_triple_t), (void **) &structure->array[i].c.string, &structure->array[i].c.used, &structure->array[i].c.size);
       if (F_status_is_error(status)) return status;
     } // for
 
-    status = f_memory_resize(triples->size, length, sizeof(f_utf_string_triple_t), (void **) & triples->array);
-    if (F_status_is_error(status)) return status;
-
-    triples->size = length;
-
-    if (triples->used > triples->size) {
-      triples->used = length;
-    }
-
-    return F_none;
+    return f_memory_array_resize(length, sizeof(f_utf_string_triple_t), (void **) &structure->array, &structure->used, &structure->size);
   }
 #endif // !defined(_di_f_utf_string_triples_decrease_by_) || !defined(_di_f_utf_string_triples_increase_) || !defined(_di_f_utf_string_triples_increase_by_)
 

diff --git a/level_0/f_utf/c/utf/private-triples.h b/level_0/f_utf/c/utf/private-triples.h
index d8d7c65aad9186e0df60cc5eb943a0d34299ed2f..f401e48c88b1533dc03ddad7bd42a0e492a2591a 100644 (file)
--- a/level_0/f_utf/c/utf/private-triples.h
+++ b/level_0/f_utf/c/utf/private-triples.h
@@ -1,15 +1,15 @@
 /**
  * FLL - Level 0
  *
- * Project: String
+ * Project: UTF
  * API Version: 0.7
  * Licenses: lgpl-2.1-or-later
  *
  * These are provided for internal reduction in redundant code.
  * These should not be exposed/used outside of this project.
  */
-#ifndef _PRIVATE_F_utf_triples_h
-#define _PRIVATE_F_utf_triples_h
+#ifndef _PRIVATE_F_utf_triple_h
+#define _PRIVATE_F_utf_triple_h
 
 #ifdef __cplusplus
 extern "C" {
@@ -22,7 +22,7 @@ extern "C" {
  *
  * @param length
  *   The new size to use.
- * @param triples
+ * @param structure
  *   The triples to adjust.
  *
  * @return
@@ -33,11 +33,10 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_adjust().
  *
  * @see f_memory_adjust()
- *
  * @see f_utf_string_triples_adjust()
  */
 #if !defined(_di_f_utf_string_triples_adjust_) || !defined(_di_f_utf_string_triples_decimate_by_)
-  extern f_status_t private_f_utf_string_triples_adjust(const f_number_unsigned_t length, f_utf_string_triples_t * const triples) F_attribute_visibility_internal_d;
+  extern f_status_t private_f_utf_string_triples_adjust(const f_number_unsigned_t length, f_utf_string_triples_t * const structure) F_attribute_visibility_internal_d;
 #endif // !defined(_di_f_utf_string_triples_adjust_) || !defined(_di_f_utf_string_triples_decimate_by_)
 
 /**
@@ -46,7 +45,7 @@ extern "C" {
  * Intended to be shared to each of the different implementation variations.
  *
  * @param source
- *   The source triples to append.
+ *   The source destination to append.
  * @param destination
  *   The destination triples the source is appended onto.
  *
@@ -58,7 +57,6 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  *
  * @see f_memory_resize()
- *
  * @see f_utf_string_triples_append_all()
  * @see f_utf_string_tripless_append()
  * @see f_utf_string_tripless_append_all()
@@ -74,7 +72,7 @@ extern "C" {
  *
  * @param length
  *   The new size to use.
- * @param triples
+ * @param structure
  *   The triples to resize.
  *
  * @return
@@ -85,17 +83,66 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  *
  * @see f_memory_resize()
- *
  * @see f_utf_string_triples_decrease_by()
  * @see f_utf_string_triples_increase()
  * @see f_utf_string_triples_increase_by()
  */
 #if !defined(_di_f_utf_string_triples_decrease_by_) || !defined(_di_f_utf_string_triples_increase_) || !defined(_di_f_utf_string_triples_increase_by_)
-  extern f_status_t private_f_utf_string_triples_resize(const f_number_unsigned_t length, f_utf_string_triples_t * const triples) F_attribute_visibility_internal_d;
+  extern f_status_t private_f_utf_string_triples_resize(const f_number_unsigned_t length, f_utf_string_triples_t * const structure) F_attribute_visibility_internal_d;
 #endif // !defined(_di_f_utf_string_triples_decrease_by_) || !defined(_di_f_utf_string_triples_increase_) || !defined(_di_f_utf_string_triples_increase_by_)
 
+/**
+ * Private implementation for resizing.
+ *
+ * Intended to be shared to each of the different implementation variations.
+ *
+ * @param length
+ *   The new size to use.
+ * @param structure
+ *   The tripless to adjust.
+ *
+ * @return
+ *   F_none on success.
+ *
+ *   F_array_too_large (with error bit) if the combined array is too large.
+ *
+ *   Errors (with error bit) from: f_memory_adjust().
+ *
+ * @see f_memory_adjust()
+ * @see f_utf_string_tripless_adjust()
+ */
+#if !defined(_di_f_utf_string_tripless_adjust_) || !defined(_di_f_utf_string_tripless_decimate_by_)
+  extern f_status_t private_f_utf_string_tripless_adjust(const f_number_unsigned_t length, f_utf_string_tripless_t * const structure) F_attribute_visibility_internal_d;
+#endif // !defined(_di_f_utf_string_tripless_adjust_) || !defined(_di_f_utf_string_tripless_decimate_by_)
+
+/**
+ * Private implementation for resizing.
+ *
+ * Intended to be shared to each of the different implementation variations.
+ *
+ * @param length
+ *   The new size to use.
+ * @param structure
+ *   The tripless to resize.
+ *
+ * @return
+ *   F_none on success.
+ *
+ *   F_array_too_large (with error bit) if the combined array is too large.
+ *
+ *   Errors (with error bit) from: f_memory_resize().
+ *
+ * @see f_memory_resize()
+ * @see f_utf_string_tripless_decrease_by()
+ * @see f_utf_string_tripless_increase()
+ * @see f_utf_string_tripless_increase_by()
+ */
+#if !defined(_di_f_utf_string_tripless_decrease_by_) || !defined(_di_f_utf_string_tripless_increase_) || !defined(_di_f_utf_string_tripless_increase_by_)
+  extern f_status_t private_f_utf_string_tripless_resize(const f_number_unsigned_t length, f_utf_string_tripless_t * const structure) F_attribute_visibility_internal_d;
+#endif // !defined(_di_f_utf_string_tripless_decrease_by_) || !defined(_di_f_utf_string_tripless_increase_) || !defined(_di_f_utf_string_tripless_increase_by_)
+
 #ifdef __cplusplus
 } // extern "C"
 #endif
 
-#endif // _PRIVATE_F_utf_triples_h
+#endif // _PRIVATE_F_utf_triple_h

diff --git a/level_0/f_utf/c/utf/private-tripless.c b/level_0/f_utf/c/utf/private-tripless.c
index 8e4d4079de1af55387e037fcbdc7fe91b49cf218..875bd237bca8fa791e4dadf0738fc5102eaa77bf 100644 (file)
--- a/level_0/f_utf/c/utf/private-tripless.c
+++ b/level_0/f_utf/c/utf/private-tripless.c
@@ -10,58 +10,32 @@ extern "C" {
 #endif
 
 #if !defined(_di_f_utf_string_tripless_adjust_) || !defined(_di_f_utf_string_tripless_decimate_by_)
-  f_status_t private_f_utf_string_tripless_adjust(const f_number_unsigned_t length, f_utf_string_tripless_t * const tripless) {
-
-    if (tripless->used + length > F_number_t_size_unsigned_d) {
-      return F_status_set_error(F_array_too_large);
-    }
+  f_status_t private_f_utf_string_tripless_adjust(const f_number_unsigned_t length, f_utf_string_tripless_t * const structure) {
 
     f_status_t status = F_none;
 
-    for (f_number_unsigned_t i = length; i < tripless->size; ++i) {
+    for (f_number_unsigned_t i = length; i < structure->size; ++i) {
 
-      status = private_f_utf_string_triples_adjust(0, &tripless->array[i]);
+      status = private_f_utf_string_triples_adjust(0, &structure->array[i]);
       if (F_status_is_error(status)) return status;
     } // for
 
-    status = f_memory_adjust(tripless->size, length, sizeof(f_utf_string_triples_t), (void **) & tripless->array);
-    if (F_status_is_error(status)) return status;
-
-    tripless->size = length;
-
-    if (tripless->used > tripless->size) {
-      tripless->used = length;
-    }
-
-    return F_none;
+    return f_memory_array_adjust(length, sizeof(f_utf_string_triples_t), (void **) &structure->array, &structure->used, &structure->size);
   }
 #endif // !defined(_di_f_utf_string_tripless_adjust_) || !defined(_di_f_utf_string_tripless_decimate_by_)
 
 #if !defined(_di_f_utf_string_tripless_decrease_by_) || !defined(_di_f_utf_string_tripless_increase_) || !defined(_di_f_utf_string_tripless_increase_by_)
-  f_status_t private_f_utf_string_tripless_resize(const f_number_unsigned_t length, f_utf_string_tripless_t * const tripless) {
-
-    if (tripless->used + length > F_number_t_size_unsigned_d) {
-      return F_status_set_error(F_array_too_large);
-    }
+  f_status_t private_f_utf_string_tripless_resize(const f_number_unsigned_t length, f_utf_string_tripless_t * const structure) {
 
     f_status_t status = F_none;
 
-    for (f_number_unsigned_t i = length; i < tripless->size; ++i) {
+    for (f_number_unsigned_t i = length; i < structure->size; ++i) {
 
-      status = private_f_utf_string_triples_resize(0, &tripless->array[i]);
+      status = private_f_utf_string_triples_resize(0, &structure->array[i]);
       if (F_status_is_error(status)) return status;
     } // for
 
-    status = f_memory_resize(tripless->size, length, sizeof(f_utf_string_triples_t), (void **) & tripless->array);
-    if (F_status_is_error(status)) return status;
-
-    tripless->size = length;
-
-    if (tripless->used > tripless->size) {
-      tripless->used = length;
-    }
-
-    return F_none;
+    return f_memory_array_resize(length, sizeof(f_utf_string_triples_t), (void **) &structure->array, &structure->used, &structure->size);
   }
 #endif // !defined(_di_f_utf_string_tripless_decrease_by_) || !defined(_di_f_utf_string_tripless_increase_) || !defined(_di_f_utf_string_tripless_increase_by_)
 

diff --git a/level_0/f_utf/c/utf/private-tripless.h b/level_0/f_utf/c/utf/private-tripless.h
index 19b6d9c8fe00b19e144d108eabd4ed346d035592..b2d97f7ee6b5470e06194be09d6c22804dd4117c 100644 (file)
--- a/level_0/f_utf/c/utf/private-tripless.h
+++ b/level_0/f_utf/c/utf/private-tripless.h
@@ -1,7 +1,7 @@
 /**
  * FLL - Level 0
  *
- * Project: String
+ * Project: UTF
  * API Version: 0.7
  * Licenses: lgpl-2.1-or-later
  *
@@ -22,7 +22,7 @@ extern "C" {
  *
  * @param length
  *   The new size to use.
- * @param tripless
+ * @param structure
  *   The tripless to adjust.
  *
  * @return
@@ -33,11 +33,10 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_adjust().
  *
  * @see f_memory_adjust()
- *
  * @see f_utf_string_tripless_adjust()
  */
 #if !defined(_di_f_utf_string_tripless_adjust_) || !defined(_di_f_utf_string_tripless_decimate_by_)
-  extern f_status_t private_f_utf_string_tripless_adjust(const f_number_unsigned_t length, f_utf_string_tripless_t * const tripless) F_attribute_visibility_internal_d;
+  extern f_status_t private_f_utf_string_tripless_adjust(const f_number_unsigned_t length, f_utf_string_tripless_t * const structure) F_attribute_visibility_internal_d;
 #endif // !defined(_di_f_utf_string_tripless_adjust_) || !defined(_di_f_utf_string_tripless_decimate_by_)
 
 /**
@@ -47,7 +46,7 @@ extern "C" {
  *
  * @param length
  *   The new size to use.
- * @param tripless
+ * @param structure
  *   The tripless to resize.
  *
  * @return
@@ -58,13 +57,12 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  *
  * @see f_memory_resize()
- *
  * @see f_utf_string_tripless_decrease_by()
  * @see f_utf_string_tripless_increase()
  * @see f_utf_string_tripless_increase_by()
  */
 #if !defined(_di_f_utf_string_tripless_decrease_by_) || !defined(_di_f_utf_string_tripless_increase_) || !defined(_di_f_utf_string_tripless_increase_by_)
-  extern f_status_t private_f_utf_string_tripless_resize(const f_number_unsigned_t length, f_utf_string_tripless_t * const tripless) F_attribute_visibility_internal_d;
+  extern f_status_t private_f_utf_string_tripless_resize(const f_number_unsigned_t length, f_utf_string_tripless_t * const structure) F_attribute_visibility_internal_d;
 #endif // !defined(_di_f_utf_string_tripless_decrease_by_) || !defined(_di_f_utf_string_tripless_increase_) || !defined(_di_f_utf_string_tripless_increase_by_)
 
 #ifdef __cplusplus

diff --git a/level_0/f_utf/c/utf/static.h b/level_0/f_utf/c/utf/static.h
index 9ce7632808581b73e90378b546c35cfa19a56f6e..107b0a3e44cc4c11edebb566eb16009243c8b069 100644 (file)
--- a/level_0/f_utf/c/utf/static.h
+++ b/level_0/f_utf/c/utf/static.h
@@ -1,7 +1,7 @@
 /**
  * FLL - Level 0
  *
- * Project: String
+ * Project: UTF
  * API Version: 0.7
  * Licenses: lgpl-2.1-or-later
  *

diff --git a/level_0/f_utf/c/utf/statics.h b/level_0/f_utf/c/utf/statics.h
index ea06898317b67a18d3faf264e1211cf6d08bf542..c3e5d524f83a290dc9c9e42ccf154a09ef92dde9 100644 (file)
--- a/level_0/f_utf/c/utf/statics.h
+++ b/level_0/f_utf/c/utf/statics.h
@@ -1,7 +1,7 @@
 /**
  * FLL - Level 0
  *
- * Project: String
+ * Project: UTF
  * API Version: 0.7
  * Licenses: lgpl-2.1-or-later
  *

diff --git a/level_0/f_utf/c/utf/staticss.h b/level_0/f_utf/c/utf/staticss.h
index eeb68e3bd9d310d8601f0fdbf034e01c413ff874..bae7e40be366a9e4b3e2a1942dad287c23132c84 100644 (file)
--- a/level_0/f_utf/c/utf/staticss.h
+++ b/level_0/f_utf/c/utf/staticss.h
@@ -1,7 +1,7 @@
 /**
  * FLL - Level 0
  *
- * Project: String
+ * Project: UTF
  * API Version: 0.7
  * Licenses: lgpl-2.1-or-later
  *

diff --git a/level_0/f_utf/c/utf/strings.c b/level_0/f_utf/c/utf/strings.c
index 80b23b572024a1f70660e90c90dfa301252cfb59..d03b9b3d84fd3e9d5ef3103eafdcaac3e1e95566 100644 (file)
--- a/level_0/f_utf/c/utf/strings.c
+++ b/level_0/f_utf/c/utf/strings.c
@@ -25,10 +25,7 @@ extern "C" {
     #endif // _di_level_0_parameter_checking_
 
     if (!length) return F_data_not;
-
-    if (destination->used < length) {
-      return private_f_utf_string_append(source, length, destination);
-    }
+    if (destination->used < length) return private_f_utf_string_append(source, length, destination);
 
     f_number_unsigned_t i = 1;
     f_number_unsigned_t j = 1;
@@ -66,10 +63,7 @@ extern "C" {
     #endif // _di_level_0_parameter_checking_
 
     if (!length) return F_data_not;
-
-    if (!destination->used) {
-      return private_f_utf_string_append_nulless(source, length, destination);
-    }
+    if (!destination->used) return private_f_utf_string_append_nulless(source, length, destination);
 
     f_number_unsigned_t i = 1;
     f_number_unsigned_t j = 1;
@@ -118,9 +112,7 @@ extern "C" {
       if (!destination) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    if (!length) {
-      return F_data_not;
-    }
+    if (!length) return F_data_not;
 
     if (glue_length && destination->used) {
       f_status_t status = private_f_utf_string_append(glue, glue_length, destination);
@@ -201,10 +193,7 @@ extern "C" {
     #endif // _di_level_0_parameter_checking_
 
     if (!length) return F_data_not;
-
-    if (destination->used < length) {
-      return private_f_utf_string_prepend(source, length, destination);
-    }
+    if (destination->used < length) return private_f_utf_string_prepend(source, length, destination);
 
     f_number_unsigned_t i = 0;
     f_number_unsigned_t j = 0;
@@ -242,10 +231,7 @@ extern "C" {
     #endif // _di_level_0_parameter_checking_
 
     if (!length) return F_data_not;
-
-    if (!destination->used) {
-      return private_f_utf_string_prepend_nulless(source, length, destination);
-    }
+    if (!destination->used) return private_f_utf_string_prepend_nulless(source, length, destination);
 
     f_number_unsigned_t i = 0;
     f_number_unsigned_t j = 0;
@@ -294,21 +280,15 @@ extern "C" {
       if (!range) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    if (range->start > range->stop) {
-      return F_data_not_stop;
-    }
+    if (range->start > range->stop) return F_data_not_stop;
 
     while (string[range->start] != f_utf_char_t_eol_s) {
 
-      if (macro_f_utf_char_t_width_is(string[range->start]) == 1) {
-        return F_status_set_error(F_utf_fragment);
-      }
+      if (macro_f_utf_char_t_width_is(string[range->start]) == 1) return F_status_set_error(F_utf_fragment);
 
       ++range->start;
 
-      if (range->start > range->stop) {
-        return F_none_stop;
-      }
+      if (range->start > range->stop) return F_none_stop;
     } // while
 
     return F_none;
@@ -321,21 +301,15 @@ extern "C" {
       if (!range) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    if (range->start > range->stop) {
-      return F_data_not_stop;
-    }
+    if (range->start > range->stop) return F_data_not_stop;
 
     while (string[range->start] != seek_to) {
 
-      if (string[range->start] == f_utf_char_t_eol_s) {
-        return F_none_eol;
-      }
+      if (string[range->start] == f_utf_char_t_eol_s) return F_none_eol;
 
       ++range->start;
 
-      if (range->start > range->stop) {
-        return F_none_stop;
-      }
+      if (range->start > range->stop) return F_none_stop;
     } // while
 
     return F_none;
@@ -348,17 +322,13 @@ extern "C" {
       if (!range) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    if (range->start > range->stop) {
-      return F_data_not_stop;
-    }
+    if (range->start > range->stop) return F_data_not_stop;
 
     while (string[range->start] != seek_to) {
 
       ++range->start;
 
-      if (range->start > range->stop) {
-        return F_none_stop;
-      }
+      if (range->start > range->stop) return F_none_stop;
     } // while
 
     return F_none;

diff --git a/level_0/f_utf/c/utf/stringss.c b/level_0/f_utf/c/utf/stringss.c
index 80b23b572024a1f70660e90c90dfa301252cfb59..d03b9b3d84fd3e9d5ef3103eafdcaac3e1e95566 100644 (file)
--- a/level_0/f_utf/c/utf/stringss.c
+++ b/level_0/f_utf/c/utf/stringss.c
@@ -25,10 +25,7 @@ extern "C" {
     #endif // _di_level_0_parameter_checking_
 
     if (!length) return F_data_not;
-
-    if (destination->used < length) {
-      return private_f_utf_string_append(source, length, destination);
-    }
+    if (destination->used < length) return private_f_utf_string_append(source, length, destination);
 
     f_number_unsigned_t i = 1;
     f_number_unsigned_t j = 1;
@@ -66,10 +63,7 @@ extern "C" {
     #endif // _di_level_0_parameter_checking_
 
     if (!length) return F_data_not;
-
-    if (!destination->used) {
-      return private_f_utf_string_append_nulless(source, length, destination);
-    }
+    if (!destination->used) return private_f_utf_string_append_nulless(source, length, destination);
 
     f_number_unsigned_t i = 1;
     f_number_unsigned_t j = 1;
@@ -118,9 +112,7 @@ extern "C" {
       if (!destination) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    if (!length) {
-      return F_data_not;
-    }
+    if (!length) return F_data_not;
 
     if (glue_length && destination->used) {
       f_status_t status = private_f_utf_string_append(glue, glue_length, destination);
@@ -201,10 +193,7 @@ extern "C" {
     #endif // _di_level_0_parameter_checking_
 
     if (!length) return F_data_not;
-
-    if (destination->used < length) {
-      return private_f_utf_string_prepend(source, length, destination);
-    }
+    if (destination->used < length) return private_f_utf_string_prepend(source, length, destination);
 
     f_number_unsigned_t i = 0;
     f_number_unsigned_t j = 0;
@@ -242,10 +231,7 @@ extern "C" {
     #endif // _di_level_0_parameter_checking_
 
     if (!length) return F_data_not;
-
-    if (!destination->used) {
-      return private_f_utf_string_prepend_nulless(source, length, destination);
-    }
+    if (!destination->used) return private_f_utf_string_prepend_nulless(source, length, destination);
 
     f_number_unsigned_t i = 0;
     f_number_unsigned_t j = 0;
@@ -294,21 +280,15 @@ extern "C" {
       if (!range) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    if (range->start > range->stop) {
-      return F_data_not_stop;
-    }
+    if (range->start > range->stop) return F_data_not_stop;
 
     while (string[range->start] != f_utf_char_t_eol_s) {
 
-      if (macro_f_utf_char_t_width_is(string[range->start]) == 1) {
-        return F_status_set_error(F_utf_fragment);
-      }
+      if (macro_f_utf_char_t_width_is(string[range->start]) == 1) return F_status_set_error(F_utf_fragment);
 
       ++range->start;
 
-      if (range->start > range->stop) {
-        return F_none_stop;
-      }
+      if (range->start > range->stop) return F_none_stop;
     } // while
 
     return F_none;
@@ -321,21 +301,15 @@ extern "C" {
       if (!range) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    if (range->start > range->stop) {
-      return F_data_not_stop;
-    }
+    if (range->start > range->stop) return F_data_not_stop;
 
     while (string[range->start] != seek_to) {
 
-      if (string[range->start] == f_utf_char_t_eol_s) {
-        return F_none_eol;
-      }
+      if (string[range->start] == f_utf_char_t_eol_s) return F_none_eol;
 
       ++range->start;
 
-      if (range->start > range->stop) {
-        return F_none_stop;
-      }
+      if (range->start > range->stop) return F_none_stop;
     } // while
 
     return F_none;
@@ -348,17 +322,13 @@ extern "C" {
       if (!range) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    if (range->start > range->stop) {
-      return F_data_not_stop;
-    }
+    if (range->start > range->stop) return F_data_not_stop;
 
     while (string[range->start] != seek_to) {
 
       ++range->start;
 
-      if (range->start > range->stop) {
-        return F_none_stop;
-      }
+      if (range->start > range->stop) return F_none_stop;
     } // while
 
     return F_none;

diff --git a/level_0/f_utf/c/utf/triple.c b/level_0/f_utf/c/utf/triple.c
index 707d9106d06b776b26b77f430f3c55da8fb87cd1..170d4a4b7992a3019291ee438f430fa47eeb2c7b 100644 (file)
--- a/level_0/f_utf/c/utf/triple.c
+++ b/level_0/f_utf/c/utf/triple.c
@@ -1,6 +1,5 @@
 #include "../utf.h"
 #include "../private-utf.h"
-#include "private-string.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_utf/c/utf/triple.h b/level_0/f_utf/c/utf/triple.h
index 6da73d49f61c067affd17040dc6f33d46bb1523f..f73d3485c5c8105e2dac0801de8240d606e20a46 100644 (file)
--- a/level_0/f_utf/c/utf/triple.h
+++ b/level_0/f_utf/c/utf/triple.h
@@ -5,9 +5,9 @@
  * API Version: 0.7
  * Licenses: lgpl-2.1-or-later
  *
- * Defines 3-tuple of UTF-8 string data called a triple (which is an ordered list of 3 strings).
+ * Defines 3-tuple of string data called a triple (which is an ordered list of 3 strings).
  *
- * This is auto-included by utf.h and should not need to be explicitly included.
+ * This is auto-included by string.h and should not need to be explicitly included.
  */
 #ifndef _F_utf_triple_h
 #define _F_utf_triple_h

diff --git a/level_0/f_utf/c/utf/triples.c b/level_0/f_utf/c/utf/triples.c
index 0121aeb5e9882cd15d3be664e57f4493a8fc284c..6f5ce999d39c8d79640520e68d45360d593670db 100644 (file)
--- a/level_0/f_utf/c/utf/triples.c
+++ b/level_0/f_utf/c/utf/triples.c
@@ -8,12 +8,12 @@ extern "C" {
 #endif
 
 #ifndef _di_f_utf_string_triples_adjust_
-  f_status_t f_utf_string_triples_adjust(const f_number_unsigned_t length, f_utf_string_triples_t * const triples) {
+  f_status_t f_utf_string_triples_adjust(const f_number_unsigned_t length, f_utf_string_triples_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!triples) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    return private_f_utf_string_triples_adjust(length, triples);
+    return private_f_utf_string_triples_adjust(length, structure);
   }
 #endif // _di_f_utf_string_triples_adjust_
 
@@ -97,53 +97,45 @@ extern "C" {
 #endif // _di_f_utf_string_triples_append_all_
 
 #ifndef _di_f_utf_string_triples_decimate_by_
-  f_status_t f_utf_string_triples_decimate_by(const f_number_unsigned_t amount, f_utf_string_triples_t * const triples) {
+  f_status_t f_utf_string_triples_decimate_by(const f_number_unsigned_t amount, f_utf_string_triples_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!triples) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    if (triples->size > amount) {
-      return private_f_utf_string_triples_adjust(triples->size - amount, triples);
-    }
+    if (!amount) return F_data_not;
 
-    return private_f_utf_string_triples_adjust(0, triples);
+    return private_f_utf_string_triples_adjust((structure->size > amount) ? structure->size - amount : 0, structure);
   }
 #endif // _di_f_utf_string_triples_decimate_by_
 
 #ifndef _di_f_utf_string_triples_decrease_by_
-  f_status_t f_utf_string_triples_decrease_by(const f_number_unsigned_t amount, f_utf_string_triples_t * const triples) {
+  f_status_t f_utf_string_triples_decrease_by(const f_number_unsigned_t amount, f_utf_string_triples_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!triples) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
     if (!amount) return F_data_not;
 
-    if (triples->size > amount) {
-      return private_f_utf_string_triples_resize(triples->size - amount, triples);
-    }
-
-    return private_f_utf_string_triples_resize(0, triples);
+    return private_f_utf_string_triples_resize((structure->size > amount) ? structure->size - amount : 0, structure);
   }
 #endif // _di_f_utf_string_triples_decrease_by_
 
 #ifndef _di_f_utf_string_triples_increase_
-  f_status_t f_utf_string_triples_increase(const f_number_unsigned_t step, f_utf_string_triples_t * const triples) {
+  f_status_t f_utf_string_triples_increase(const f_number_unsigned_t step, f_utf_string_triples_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!triples) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    if (step && triples->used + 1 > triples->size) {
-      f_number_unsigned_t length = triples->used + F_memory_default_allocation_small_d;
+    if (step && structure->used + 1 > structure->size) {
+      f_number_unsigned_t length = structure->used + F_memory_default_allocation_small_d;
 
       if (length > F_number_t_size_unsigned_d) {
-        if (triples->used + 1 > F_number_t_size_unsigned_d) {
-          return F_status_set_error(F_array_too_large);
-        }
+        if (structure->used + 1 > F_number_t_size_unsigned_d) return F_status_set_error(F_array_too_large);
 
         length = F_number_t_size_unsigned_d;
       }
 
-      return private_f_utf_string_triples_resize(length, triples);
+      return private_f_utf_string_triples_resize(length, structure);
     }
 
     return F_data_not;
@@ -151,20 +143,20 @@ extern "C" {
 #endif // _di_f_utf_string_triples_increase_
 
 #ifndef _di_f_utf_string_triples_increase_by_
-  f_status_t f_utf_string_triples_increase_by(const f_number_unsigned_t amount, f_utf_string_triples_t * const triples) {
+  f_status_t f_utf_string_triples_increase_by(const f_number_unsigned_t amount, f_utf_string_triples_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!triples) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
     if (amount) {
-      if (triples->used >= F_number_t_size_unsigned_d) return F_status_set_error(F_array_too_large);
+      if (structure->used >= F_number_t_size_unsigned_d) return F_status_set_error(F_array_too_large);
 
-      const f_number_unsigned_t length = triples->used + amount;
+      const f_number_unsigned_t length = structure->used + amount;
 
-      if (length > triples->size) {
+      if (length > structure->size) {
         if (length > F_number_t_size_unsigned_d) return F_status_set_error(F_array_too_large);
 
-        return private_f_utf_string_triples_resize(length, triples);
+        return private_f_utf_string_triples_resize(length, structure);
       }
     }
 
@@ -173,12 +165,12 @@ extern "C" {
 #endif // _di_f_utf_string_triples_increase_by_
 
 #ifndef _di_f_utf_string_triples_resize_
-  f_status_t f_utf_string_triples_resize(const f_number_unsigned_t length, f_utf_string_triples_t * const triples) {
+  f_status_t f_utf_string_triples_resize(const f_number_unsigned_t length, f_utf_string_triples_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!triples) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    return private_f_utf_string_triples_resize(length, triples);
+    return private_f_utf_string_triples_resize(length, structure);
   }
 #endif // _di_f_utf_string_triples_resize_
 

diff --git a/level_0/f_utf/c/utf/triples.h b/level_0/f_utf/c/utf/triples.h
index e68b7789468f388a02f6b041fa456caf21ead517..673259a73729a1ba5b9661689d59d1296facaef1 100644 (file)
--- a/level_0/f_utf/c/utf/triples.h
+++ b/level_0/f_utf/c/utf/triples.h
@@ -5,9 +5,9 @@
  * API Version: 0.7
  * Licenses: lgpl-2.1-or-later
  *
- * Defines 3-tuple of UTF-8 string data called a triple (which is an ordered list of 3 strings).
+ * Defines 3-tuple of string data called a triple (which is an ordered list of 3 strings).
  *
- * This is auto-included by utf.h and should not need to be explicitly included.
+ * This is auto-included by string.h and should not need to be explicitly included.
  */
 #ifndef _F_utf_triples_h
 #define _F_utf_triples_h
@@ -54,7 +54,7 @@ extern "C" {
  *
  * @param length
  *   The new size to use.
- * @param triples
+ * @param structure
  *   The string triples array to resize.
  *
  * @return
@@ -64,7 +64,7 @@ extern "C" {
  *   F_parameter (with error bit) if a parameter is invalid.
  */
 #ifndef _di_f_utf_string_triples_adjust_
-  extern f_status_t f_utf_string_triples_adjust(const f_number_unsigned_t length, f_utf_string_triples_t * const triples);
+  extern f_status_t f_utf_string_triples_adjust(const f_number_unsigned_t length, f_utf_string_triples_t * const structure);
 #endif // _di_f_utf_string_triples_adjust_
 
 /**
@@ -118,7 +118,7 @@ extern "C" {
  *
  * @param amount
  *   A positive number representing how much to decimate the size by.
- * @param triples
+ * @param structure
  *   The string triples array to resize.
  *
  * @return
@@ -130,7 +130,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_utf_string_triples_decimate_by_
-  extern f_status_t f_utf_string_triples_decimate_by(const f_number_unsigned_t amount, f_utf_string_triples_t * const triples);
+  extern f_status_t f_utf_string_triples_decimate_by(const f_number_unsigned_t amount, f_utf_string_triples_t * const structure);
 #endif // _di_f_utf_string_triples_decimate_by_
 
 /**
@@ -142,7 +142,7 @@ extern "C" {
  *
  * @param amount
  *   A positive number representing how much to decrease the size by.
- * @param triples
+ * @param structure
  *   The string triples array to resize.
  *
  * @return
@@ -154,7 +154,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_utf_string_triples_decrease_by_
-  extern f_status_t f_utf_string_triples_decrease_by(const f_number_unsigned_t amount, f_utf_string_triples_t * const triples);
+  extern f_status_t f_utf_string_triples_decrease_by(const f_number_unsigned_t amount, f_utf_string_triples_t * const structure);
 #endif // _di_f_utf_string_triples_decrease_by_
 
 /**
@@ -166,7 +166,7 @@ extern "C" {
  * @param step
  *   The allocation step to use.
  *   Must be greater than 0.
- * @param triples
+ * @param structure
  *   The string triples array to resize.
  *
  * @return
@@ -179,7 +179,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_utf_string_triples_increase_
-  extern f_status_t f_utf_string_triples_increase(const f_number_unsigned_t step, f_utf_string_triples_t * const triples);
+  extern f_status_t f_utf_string_triples_increase(const f_number_unsigned_t step, f_utf_string_triples_t * const structure);
 #endif // _di_f_utf_string_triples_increase_
 
 /**
@@ -191,7 +191,7 @@ extern "C" {
  *
  * @param amount
  *   A positive number representing how much to increase the size by.
- * @param triples
+ * @param structure
  *   The string triples array to resize.
  *
  * @return
@@ -204,7 +204,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_utf_string_triples_increase_by_
-  extern f_status_t f_utf_string_triples_increase_by(const f_number_unsigned_t amount, f_utf_string_triples_t * const triples);
+  extern f_status_t f_utf_string_triples_increase_by(const f_number_unsigned_t amount, f_utf_string_triples_t * const structure);
 #endif // _di_f_utf_string_triples_increase_by_
 
 /**
@@ -212,7 +212,7 @@ extern "C" {
  *
  * @param length
  *   The new size to use.
- * @param triples
+ * @param structure
  *   The string triples array to adjust.
  *
  * @return
@@ -223,7 +223,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_utf_string_triples_resize_
-  extern f_status_t f_utf_string_triples_resize(const f_number_unsigned_t length, f_utf_string_triples_t * const triples);
+  extern f_status_t f_utf_string_triples_resize(const f_number_unsigned_t length, f_utf_string_triples_t * const structure);
 #endif // _di_f_utf_string_triples_resize_
 
 #ifdef __cplusplus

diff --git a/level_0/f_utf/c/utf/tripless.c b/level_0/f_utf/c/utf/tripless.c
index ff4e31bdfe08e27286ca4c7b8d4af396a4509a59..7a043e39e5143d1cfb6bd95cd8f29f43174cbf47 100644 (file)
--- a/level_0/f_utf/c/utf/tripless.c
+++ b/level_0/f_utf/c/utf/tripless.c
@@ -66,65 +66,55 @@ extern "C" {
 #endif // _di_f_utf_string_tripless_append_all_
 
 #ifndef _di_f_utf_string_tripless_adjust_
-  f_status_t f_utf_string_tripless_adjust(const f_number_unsigned_t length, f_utf_string_tripless_t * const tripless) {
+  f_status_t f_utf_string_tripless_adjust(const f_number_unsigned_t length, f_utf_string_tripless_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!tripless) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    return private_f_utf_string_tripless_adjust(length, tripless);
+    return private_f_utf_string_tripless_adjust(length, structure);
   }
 #endif // _di_f_utf_string_tripless_adjust_
 
 #ifndef _di_f_utf_string_tripless_decimate_by_
-  f_status_t f_utf_string_tripless_decimate_by(const f_number_unsigned_t amount, f_utf_string_tripless_t * const tripless) {
+  f_status_t f_utf_string_tripless_decimate_by(const f_number_unsigned_t amount, f_utf_string_tripless_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!tripless) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
     if (!amount) return F_data_not;
 
-    if (tripless->size > amount) {
-      return private_f_utf_string_tripless_adjust(tripless->size - amount, tripless);
-    }
-
-    return private_f_utf_string_tripless_adjust(0, tripless);
+    return private_f_utf_string_tripless_adjust((structure->size > amount) ? structure->size - amount : 0, structure);
   }
 #endif // _di_f_utf_string_tripless_decimate_by_
 
 #ifndef _di_f_utf_string_tripless_decrease_by_
-  f_status_t f_utf_string_tripless_decrease_by(const f_number_unsigned_t amount, f_utf_string_tripless_t * const tripless) {
+  f_status_t f_utf_string_tripless_decrease_by(const f_number_unsigned_t amount, f_utf_string_tripless_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!tripless) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
     if (!amount) return F_data_not;
 
-    if (tripless->size > amount) {
-      return private_f_utf_string_tripless_resize(tripless->size - amount, tripless);
-    }
-
-    return private_f_utf_string_tripless_resize(0, tripless);
+    return private_f_utf_string_tripless_resize((structure->size > amount) ? structure->size - amount : 0, structure);
   }
 #endif // _di_f_utf_string_tripless_decrease_by_
 
 #ifndef _di_f_utf_string_tripless_increase_
-  f_status_t f_utf_string_tripless_increase(const f_number_unsigned_t step, f_utf_string_tripless_t * const tripless) {
+  f_status_t f_utf_string_tripless_increase(const f_number_unsigned_t step, f_utf_string_tripless_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!tripless) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    if (step && tripless->used + 1 > tripless->size) {
-      f_number_unsigned_t length = tripless->used + step;
+    if (step && structure->used + 1 > structure->size) {
+      f_number_unsigned_t length = structure->used + step;
 
       if (length > F_number_t_size_unsigned_d) {
-        if (tripless->used + 1 > F_number_t_size_unsigned_d) {
-          return F_status_set_error(F_array_too_large);
-        }
+        if (structure->used + 1 > F_number_t_size_unsigned_d) return F_status_set_error(F_array_too_large);
 
         length = F_number_t_size_unsigned_d;
       }
 
-      return private_f_utf_string_tripless_resize(length, tripless);
+      return private_f_utf_string_tripless_resize(length, structure);
     }
 
     return F_data_not;
@@ -132,20 +122,20 @@ extern "C" {
 #endif // _di_f_utf_string_tripless_increase_
 
 #ifndef _di_f_utf_string_tripless_increase_by_
-  f_status_t f_utf_string_tripless_increase_by(const f_number_unsigned_t amount, f_utf_string_tripless_t * const tripless) {
+  f_status_t f_utf_string_tripless_increase_by(const f_number_unsigned_t amount, f_utf_string_tripless_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!tripless) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
     if (amount) {
-      if (tripless->used >= F_number_t_size_unsigned_d) return F_status_set_error(F_array_too_large);
+      if (structure->used >= F_number_t_size_unsigned_d) return F_status_set_error(F_array_too_large);
 
-      const f_number_unsigned_t length = tripless->used + amount;
+      const f_number_unsigned_t length = structure->used + amount;
 
-      if (length > tripless->size) {
+      if (length > structure->size) {
         if (length > F_number_t_size_unsigned_d) return F_status_set_error(F_array_too_large);
 
-        return private_f_utf_string_tripless_resize(length, tripless);
+        return private_f_utf_string_tripless_resize(length, structure);
       }
     }
 
@@ -154,12 +144,12 @@ extern "C" {
 #endif // _di_f_utf_string_tripless_increase_by_
 
 #ifndef _di_f_utf_string_tripless_resize_
-  f_status_t f_utf_string_tripless_resize(const f_number_unsigned_t length, f_utf_string_tripless_t * const tripless) {
+  f_status_t f_utf_string_tripless_resize(const f_number_unsigned_t length, f_utf_string_tripless_t * const structure) {
     #ifndef _di_level_0_parameter_checking_
-      if (!tripless) return F_status_set_error(F_parameter);
+      if (!structure) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    return private_f_utf_string_tripless_resize(length, tripless);
+    return private_f_utf_string_tripless_resize(length, structure);
   }
 #endif // _di_f_utf_string_tripless_resize_
 

diff --git a/level_0/f_utf/c/utf/tripless.h b/level_0/f_utf/c/utf/tripless.h
index c7655ffccc63e7c868764e0f7a3ce18f95131664..9dfe427d34d83cd8c02ccd78b437beeb6dc0d709 100644 (file)
--- a/level_0/f_utf/c/utf/tripless.h
+++ b/level_0/f_utf/c/utf/tripless.h
@@ -5,9 +5,9 @@
  * API Version: 0.7
  * Licenses: lgpl-2.1-or-later
  *
- * Defines 3-tuple of UTF-8 string data called a triple (which is an ordered list of 3 strings).
+ * Defines 3-tuple of string data called a triple (which is an ordered list of 3 strings).
  *
- * This is auto-included by utf.h and should not need to be explicitly included.
+ * This is auto-included by string.h and should not need to be explicitly included.
  */
 #ifndef _F_utf_tripless_h
 #define _F_utf_tripless_h
@@ -54,7 +54,7 @@ extern "C" {
  *
  * @param length
  *   The new size to use.
- * @param tripless
+ * @param structure
  *   The string tripless array to resize.
  *
  * @return
@@ -64,7 +64,7 @@ extern "C" {
  *   F_parameter (with error bit) if a parameter is invalid.
  */
 #ifndef _di_f_utf_string_tripless_adjust_
-  extern f_status_t f_utf_string_tripless_adjust(const f_number_unsigned_t length, f_utf_string_tripless_t * const tripless);
+  extern f_status_t f_utf_string_tripless_adjust(const f_number_unsigned_t length, f_utf_string_tripless_t * const structure);
 #endif // _di_f_utf_string_tripless_adjust_
 
 /**
@@ -118,7 +118,7 @@ extern "C" {
  *
  * @param amount
  *   A positive number representing how much to decimate the size by.
- * @param tripless
+ * @param structure
  *   The string tripless array to resize.
  *
  * @return
@@ -130,7 +130,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_utf_string_tripless_decimate_by_
-  extern f_status_t f_utf_string_tripless_decimate_by(const f_number_unsigned_t amount, f_utf_string_tripless_t * const tripless);
+  extern f_status_t f_utf_string_tripless_decimate_by(const f_number_unsigned_t amount, f_utf_string_tripless_t * const structure);
 #endif // _di_f_utf_string_tripless_decimate_by_
 
 /**
@@ -142,7 +142,7 @@ extern "C" {
  *
  * @param amount
  *   A positive number representing how much to decrease the size by.
- * @param tripless
+ * @param structure
  *   The string tripless array to resize.
  *
  * @return
@@ -154,7 +154,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_utf_string_tripless_decrease_by_
-  extern f_status_t f_utf_string_tripless_decrease_by(const f_number_unsigned_t amount, f_utf_string_tripless_t * const tripless);
+  extern f_status_t f_utf_string_tripless_decrease_by(const f_number_unsigned_t amount, f_utf_string_tripless_t * const structure);
 #endif // _di_f_utf_string_tripless_decrease_by_
 
 /**
@@ -166,7 +166,7 @@ extern "C" {
  * @param step
  *   The allocation step to use.
  *   Must be greater than 0.
- * @param tripless
+ * @param structure
  *   The string tripless array to resize.
  *
  * @return
@@ -179,7 +179,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_utf_string_tripless_increase_
-  extern f_status_t f_utf_string_tripless_increase(const f_number_unsigned_t step, f_utf_string_tripless_t * const tripless);
+  extern f_status_t f_utf_string_tripless_increase(const f_number_unsigned_t step, f_utf_string_tripless_t * const structure);
 #endif // _di_f_utf_string_tripless_increase_
 
 /**
@@ -191,7 +191,7 @@ extern "C" {
  *
  * @param amount
  *   A positive number representing how much to increase the size by.
- * @param tripless
+ * @param structure
  *   The string tripless array to resize.
  *
  * @return
@@ -204,7 +204,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_utf_string_tripless_increase_by_
-  extern f_status_t f_utf_string_tripless_increase_by(const f_number_unsigned_t amount, f_utf_string_tripless_t * const tripless);
+  extern f_status_t f_utf_string_tripless_increase_by(const f_number_unsigned_t amount, f_utf_string_tripless_t * const structure);
 #endif // _di_f_utf_string_tripless_increase_by_
 
 /**
@@ -212,7 +212,7 @@ extern "C" {
  *
  * @param length
  *   The new size to use.
- * @param tripless
+ * @param structure
  *   The string tripless array to adjust.
  *
  * @return
@@ -223,7 +223,7 @@ extern "C" {
  *   Errors (with error bit) from: f_memory_resize().
  */
 #ifndef _di_f_utf_string_tripless_resize_
-  extern f_status_t f_utf_string_tripless_resize(const f_number_unsigned_t length, f_utf_string_tripless_t * const tripless);
+  extern f_status_t f_utf_string_tripless_resize(const f_number_unsigned_t length, f_utf_string_tripless_t * const structure);
 #endif // _di_f_utf_string_tripless_resize_
 
 #ifdef __cplusplus