Update: ensure f_no_data is returned when applicable for fl_string and fl_utf functions

diff --git a/level_1/fl_string/c/private-string.c b/level_1/fl_string/c/private-string.c
index 5f4f9319d6d00aecfb49ec8b8806dec0639f0751..2b62f192daa6b0b8b8207658077c525d16d201f5 100644 (file)
--- a/level_1/fl_string/c/private-string.c
+++ b/level_1/fl_string/c/private-string.c
@@ -411,6 +411,17 @@ extern "C" {
       if (status == f_false) break;
     } // for
 
+    if (*stop == *start) {
+      status = f_utf_is_whitespace(source + *stop, (stop_original - *stop) + 1);
+      if (f_status_is_error(status)) {
+        if (f_status_set_fine(status) == f_maybe) return f_status_set_error(f_invalid_utf);
+
+        return status;
+      }
+
+      if (status == f_true) return f_no_data;
+    }
+
     return f_none;
   }
 #endif // !defined(_di_fl_string_rip_) || !defined(_di_fl_string_dynamic_rip_) || !defined(_di_fl_string_rip_nulless_) || !defined(_di_fl_string_dynamic_rip_nulless_)

diff --git a/level_1/fl_string/c/private-string.h b/level_1/fl_string/c/private-string.h
index 77994d78dfaca11e1be8f3b6ffd4c8535f7768fc..1c7ee77a87bb3a0e43c40e45cdb0d8aa1f0e4178 100644 (file)
--- a/level_1/fl_string/c/private-string.h
+++ b/level_1/fl_string/c/private-string.h
@@ -211,6 +211,7 @@ extern "C" {
  *
  * @return
  *   f_none on success.
+ *   f_no_data on success but only whitespace found.
  *   f_invalid_parameter (with error bit) if a parameter is invalid.
  *   f_error_allocation (with error bit) on memory allocation error.
  *   f_error_reallocation (with error bit) on memory reallocation error.

diff --git a/level_1/fl_string/c/string.c b/level_1/fl_string/c/string.c
index e59f5e8d78a00ca0980d4e46cdf8e0f26998a931..9d61eba7f84bd977c4da1a68423cd22254a9b961 100644 (file)
--- a/level_1/fl_string/c/string.c
+++ b/level_1/fl_string/c/string.c
@@ -652,6 +652,7 @@ extern "C" {
     f_status status = private_fl_string_rip_find_range(source, &begin, &end);
 
     if (f_status_is_error(status)) return status;
+    if (status == f_no_data) return status;
 
     return private_fl_string_append(source, begin, end, destination);
   }
@@ -670,6 +671,7 @@ extern "C" {
     f_status status = private_fl_string_rip_find_range(source, &begin, &end);
 
     if (f_status_is_error(status)) return status;
+    if (status == f_no_data) return status;
 
     return private_fl_string_append_nulless(source, begin, end, destination);
   }

diff --git a/level_1/fl_utf/c/private-utf.c b/level_1/fl_utf/c/private-utf.c
index cfd223af173bb1d045ed12282c353409fb70958c..48b10ec516a0cb359a2e3239cf009c80d440491c 100644 (file)
--- a/level_1/fl_utf/c/private-utf.c
+++ b/level_1/fl_utf/c/private-utf.c
@@ -378,6 +378,17 @@ extern "C" {
       if (status == f_false) break;
     } // for
 
+    if (*stop == *start) {
+      status = f_utf_character_is_whitespace(source[*stop]);
+      if (f_status_is_error(status)) {
+        if (f_status_set_fine(status) == f_maybe) return f_status_set_error(f_invalid_utf);
+
+        return status;
+      }
+
+      if (status == f_true) return f_no_data;
+    }
+
     return f_none;
   }
 #endif // !defined(_di_fl_utf_string_rip_) || !defined(_di_fl_utf_string_dynamic_rip_) || !defined(_di_fl_utf_string_rip_nulless_) || !defined(_di_fl_utf_string_dynamic_rip_nulless_)

diff --git a/level_1/fl_utf/c/private-utf.h b/level_1/fl_utf/c/private-utf.h
index 6e0d215b4019f3d96012b00133fa17272fbb9cca..a2417f0b6563a04c238ca8dbf8b7d23ac2d27205 100644 (file)
--- a/level_1/fl_utf/c/private-utf.h
+++ b/level_1/fl_utf/c/private-utf.h
@@ -211,6 +211,7 @@ extern "C" {
  *
  * @return
  *   f_none on success.
+ *   f_no_data on success but only whitespace found.
  *   f_invalid_parameter (with error bit) if a parameter is invalid.
  *   f_error_allocation (with error bit) on memory allocation error.
  *   f_error_reallocation (with error bit) on memory reallocation error.

diff --git a/level_1/fl_utf/c/utf.c b/level_1/fl_utf/c/utf.c
index 1e9ef87c0b83c723df8cb4a4a564316667bbcc95..9bf9443bd4e40f5cf3c835d894c882450b1e1813 100644 (file)
--- a/level_1/fl_utf/c/utf.c
+++ b/level_1/fl_utf/c/utf.c
@@ -562,6 +562,7 @@ extern "C" {
     f_status status = private_fl_utf_string_rip_find_range(source, &begin, &end);
 
     if (f_status_is_error(status)) return status;
+    if (status == f_no_data) return status;
 
     return private_fl_utf_string_append(source, begin, end, destination);
   }
@@ -580,6 +581,7 @@ extern "C" {
     f_status status = private_fl_utf_string_rip_find_range(source, &begin, &end);
 
     if (f_status_is_error(status)) return status;
+    if (status == f_no_data) return status;
 
     return private_fl_utf_string_append_nulless(source, begin, end, destination);
   }