Cleanup: fix parameter order of fl_conversion_* functions.

diff --git a/level_1/fl_conversion/c/conversion.c b/level_1/fl_conversion/c/conversion.c
index aafe1455c52265fa83b2bb03a7ead8333bcd155f..dad93088a5a6e97dd489db26871adcecd879046d 100644 (file)
--- a/level_1/fl_conversion/c/conversion.c
+++ b/level_1/fl_conversion/c/conversion.c
@@ -5,11 +5,11 @@ extern "C" {
 #endif
 
 #ifndef _di_fl_conversion_string_to_binary_signed_
-  f_status_t fl_conversion_string_to_binary_signed(const f_string_t string, f_number_signed_t *number, const f_string_range_t range, const bool negative) {
+  f_status_t fl_conversion_string_to_binary_signed(const f_string_t string, const f_string_range_t range, const bool negative, f_number_signed_t *number) {
     #ifndef _di_level_1_parameter_checking_
       if (!string) return F_status_set_error(F_parameter);
-      if (!number) return F_status_set_error(F_parameter);
       if (range.start > range.stop) return F_status_set_error(F_parameter);
+      if (!number) return F_status_set_error(F_parameter);
     #endif // _di_level_1_parameter_checking_
 
     if (!string[0]) {
@@ -65,11 +65,11 @@ extern "C" {
 #endif // _di_fl_conversion_string_to_binary_signed_
 
 #ifndef _di_fl_conversion_string_to_binary_unsigned_
-  f_status_t fl_conversion_string_to_binary_unsigned(const f_string_t string, f_number_unsigned_t *number, const f_string_range_t range) {
+  f_status_t fl_conversion_string_to_binary_unsigned(const f_string_t string, const f_string_range_t range, f_number_unsigned_t *number) {
     #ifndef _di_level_1_parameter_checking_
       if (!string) return F_status_set_error(F_parameter);
-      if (!number) return F_status_set_error(F_parameter);
       if (range.start > range.stop) return F_status_set_error(F_parameter);
+      if (!number) return F_status_set_error(F_parameter);
     #endif // _di_level_1_parameter_checking_
 
     if (!string[0]) {
@@ -109,11 +109,11 @@ extern "C" {
 #endif // _di_fl_conversion_string_to_binary_unsigned_
 
 #ifndef _di_fl_conversion_string_to_decimal_signed_
-  f_status_t fl_conversion_string_to_decimal_signed(const f_string_t string, f_number_signed_t *number, const f_string_range_t range, const bool negative) {
+  f_status_t fl_conversion_string_to_decimal_signed(const f_string_t string, const f_string_range_t range, const bool negative, f_number_signed_t *number) {
     #ifndef _di_level_1_parameter_checking_
       if (!string) return F_status_set_error(F_parameter);
-      if (!number) return F_status_set_error(F_parameter);
       if (range.start > range.stop) return F_status_set_error(F_parameter);
+      if (!number) return F_status_set_error(F_parameter);
     #endif // _di_level_1_parameter_checking_
 
     if (!string[0]) {
@@ -174,11 +174,11 @@ extern "C" {
 #endif // _di_fl_conversion_string_to_decimal_signed_
 
 #ifndef _di_fl_conversion_string_to_decimal_unsigned_
-  f_status_t fl_conversion_string_to_decimal_unsigned(const f_string_t string, f_number_unsigned_t *number, const f_string_range_t range) {
+  f_status_t fl_conversion_string_to_decimal_unsigned(const f_string_t string, const f_string_range_t range, f_number_unsigned_t *number) {
     #ifndef _di_level_1_parameter_checking_
       if (!string) return F_status_set_error(F_parameter);
-      if (!number) return F_status_set_error(F_parameter);
       if (range.start > range.stop) return F_status_set_error(F_parameter);
+      if (!number) return F_status_set_error(F_parameter);
     #endif // _di_level_1_parameter_checking_
 
     if (!string[0]) {
@@ -221,11 +221,11 @@ extern "C" {
 #endif // _di_fl_conversion_string_to_decimal_unsigned_
 
 #ifndef _di_fl_conversion_string_to_duodecimal_signed_
-  f_status_t fl_conversion_string_to_duodecimal_signed(const f_string_t string, f_number_signed_t *number, const f_string_range_t range, const bool negative) {
+  f_status_t fl_conversion_string_to_duodecimal_signed(const f_string_t string, const f_string_range_t range, const bool negative, f_number_signed_t *number) {
     #ifndef _di_level_1_parameter_checking_
       if (!string) return F_status_set_error(F_parameter);
-      if (!number) return F_status_set_error(F_parameter);
       if (range.start > range.stop) return F_status_set_error(F_parameter);
+      if (!number) return F_status_set_error(F_parameter);
     #endif // _di_level_1_parameter_checking_
 
     if (!string[0]) {
@@ -286,11 +286,11 @@ extern "C" {
 #endif // _di_fl_conversion_string_to_duodecimal_signed_
 
 #ifndef _di_fl_conversion_string_to_duodecimal_unsigned_
-  f_status_t fl_conversion_string_to_duodecimal_unsigned(const f_string_t string, f_number_unsigned_t *number, const f_string_range_t range) {
+  f_status_t fl_conversion_string_to_duodecimal_unsigned(const f_string_t string, const f_string_range_t range, f_number_unsigned_t *number) {
     #ifndef _di_level_1_parameter_checking_
       if (!string) return F_status_set_error(F_parameter);
-      if (!number) return F_status_set_error(F_parameter);
       if (range.start > range.stop) return F_status_set_error(F_parameter);
+      if (!number) return F_status_set_error(F_parameter);
     #endif // _di_level_1_parameter_checking_
 
     if (!string[0]) {
@@ -333,11 +333,11 @@ extern "C" {
 #endif // _di_fl_conversion_string_to_duodecimal_unsigned_
 
 #ifndef _di_fl_conversion_string_to_hexidecimal_signed_
-  f_status_t fl_conversion_string_to_hexidecimal_signed(const f_string_t string, f_number_signed_t *number, const f_string_range_t range, const bool negative) {
+  f_status_t fl_conversion_string_to_hexidecimal_signed(const f_string_t string, const f_string_range_t range, const bool negative, f_number_signed_t *number) {
     #ifndef _di_level_1_parameter_checking_
       if (!string) return F_status_set_error(F_parameter);
-      if (!number) return F_status_set_error(F_parameter);
       if (range.start > range.stop) return F_status_set_error(F_parameter);
+      if (!number) return F_status_set_error(F_parameter);
     #endif // _di_level_1_parameter_checking_
 
     if (!string[0]) {
@@ -398,11 +398,11 @@ extern "C" {
 #endif // _di_fl_conversion_string_to_hexidecimal_signed_
 
 #ifndef _di_fl_conversion_string_to_hexidecimal_unsigned_
-  f_status_t fl_conversion_string_to_hexidecimal_unsigned(const f_string_t string, f_number_unsigned_t *number, const f_string_range_t range) {
+  f_status_t fl_conversion_string_to_hexidecimal_unsigned(const f_string_t string, const f_string_range_t range, f_number_unsigned_t *number) {
     #ifndef _di_level_1_parameter_checking_
       if (!string) return F_status_set_error(F_parameter);
-      if (!number) return F_status_set_error(F_parameter);
       if (range.start > range.stop) return F_status_set_error(F_parameter);
+      if (!number) return F_status_set_error(F_parameter);
     #endif // _di_level_1_parameter_checking_
 
     if (!string[0]) {
@@ -445,11 +445,11 @@ extern "C" {
 #endif // _di_fl_conversion_string_to_hexidecimal_unsigned_
 
 #ifndef _di_fl_conversion_string_to_octal_signed_
-  f_status_t fl_conversion_string_to_octal_signed(const f_string_t string, f_number_signed_t *number, const f_string_range_t range, const bool negative) {
+  f_status_t fl_conversion_string_to_octal_signed(const f_string_t string, const f_string_range_t range, const bool negative, f_number_signed_t *number) {
     #ifndef _di_level_1_parameter_checking_
       if (!string) return F_status_set_error(F_parameter);
-      if (!number) return F_status_set_error(F_parameter);
       if (range.start > range.stop) return F_status_set_error(F_parameter);
+      if (!number) return F_status_set_error(F_parameter);
     #endif // _di_level_1_parameter_checking_
 
     if (!string[0]) {
@@ -510,11 +510,11 @@ extern "C" {
 #endif // _di_fl_conversion_string_to_octal_signed_
 
 #ifndef _di_fl_conversion_string_to_octal_unsigned_
-  f_status_t fl_conversion_string_to_octal_unsigned(const f_string_t string, f_number_unsigned_t *number, const f_string_range_t range) {
+  f_status_t fl_conversion_string_to_octal_unsigned(const f_string_t string, const f_string_range_t range, f_number_unsigned_t *number) {
     #ifndef _di_level_1_parameter_checking_
       if (!string) return F_status_set_error(F_parameter);
-      if (!number) return F_status_set_error(F_parameter);
       if (range.start > range.stop) return F_status_set_error(F_parameter);
+      if (!number) return F_status_set_error(F_parameter);
     #endif // _di_level_1_parameter_checking_
 
     if (!string[0]) {
@@ -557,11 +557,11 @@ extern "C" {
 #endif // _di_fl_conversion_string_to_octal_unsigned_
 
 #ifndef _di_fl_conversion_string_to_number_signed_
-  f_status_t fl_conversion_string_to_number_signed(const f_string_t string, f_number_signed_t *number, const f_string_range_t range) {
+  f_status_t fl_conversion_string_to_number_signed(const f_string_t string, const f_string_range_t range, f_number_signed_t *number) {
     #ifndef _di_level_1_parameter_checking_
       if (!string) return F_status_set_error(F_parameter);
-      if (!number) return F_status_set_error(F_parameter);
       if (range.start > range.stop) return F_status_set_error(F_parameter);
+      if (!number) return F_status_set_error(F_parameter);
     #endif // _di_level_1_parameter_checking_
 
     if (!string[0]) {
@@ -693,31 +693,31 @@ extern "C" {
     }
 
     if (mode == 10) {
-      return fl_conversion_string_to_decimal_signed(string, number, location_offset, vector == -1);
+      return fl_conversion_string_to_decimal_signed(string, location_offset, vector == -1, number);
     }
 
     if (mode == 16) {
-      return fl_conversion_string_to_hexidecimal_signed(string, number, location_offset, vector == -1);
+      return fl_conversion_string_to_hexidecimal_signed(string, location_offset, vector == -1, number);
     }
 
     if (mode == 12) {
-      return fl_conversion_string_to_duodecimal_signed(string, number, location_offset, vector == -1);
+      return fl_conversion_string_to_duodecimal_signed(string, location_offset, vector == -1, number);
     }
 
     if (mode == 8) {
-      return fl_conversion_string_to_octal_signed(string, number, location_offset, vector == -1);
+      return fl_conversion_string_to_octal_signed(string, location_offset, vector == -1, number);
     }
 
-    return fl_conversion_string_to_binary_signed(string, number, location_offset, vector == -1);
+    return fl_conversion_string_to_binary_signed(string, location_offset, vector == -1, number);
   }
 #endif // _di_fl_conversion_string_to_number_signed_
 
 #ifndef _di_fl_conversion_string_to_number_unsigned_
-  f_status_t fl_conversion_string_to_number_unsigned(const f_string_t string, f_number_unsigned_t *number, const f_string_range_t range) {
+  f_status_t fl_conversion_string_to_number_unsigned(const f_string_t string, const f_string_range_t range, f_number_unsigned_t *number) {
     #ifndef _di_level_1_parameter_checking_
       if (!string) return F_status_set_error(F_parameter);
-      if (!number) return F_status_set_error(F_parameter);
       if (range.start > range.stop) return F_status_set_error(F_parameter);
+      if (!number) return F_status_set_error(F_parameter);
     #endif // _di_level_1_parameter_checking_
 
     if (!string[0]) {
@@ -837,19 +837,19 @@ extern "C" {
     }
 
     if (mode == 10) {
-      status = fl_conversion_string_to_decimal_unsigned(string, number, location_offset);
+      status = fl_conversion_string_to_decimal_unsigned(string, location_offset, number);
     }
     else if (mode == 16) {
-      status = fl_conversion_string_to_hexidecimal_unsigned(string, number, location_offset);
+      status = fl_conversion_string_to_hexidecimal_unsigned(string, location_offset, number);
     }
     else if (mode == 12) {
-      status = fl_conversion_string_to_duodecimal_unsigned(string, number, location_offset);
+      status = fl_conversion_string_to_duodecimal_unsigned(string, location_offset, number);
     }
     else if (mode == 8) {
-      status = fl_conversion_string_to_octal_unsigned(string, number, location_offset);
+      status = fl_conversion_string_to_octal_unsigned(string, location_offset, number);
     }
     else {
-      status = fl_conversion_string_to_binary_unsigned(string, number, location_offset);
+      status = fl_conversion_string_to_binary_unsigned(string, location_offset, number);
     }
 
     // +/- signs are not allowed.

diff --git a/level_1/fl_conversion/c/conversion.h b/level_1/fl_conversion/c/conversion.h
index d9aa28d41750324777f1f405735aa8e083335256..884b9d32201a1f47c74da7a75bd62a0e281b42f4 100644 (file)
--- a/level_1/fl_conversion/c/conversion.h
+++ b/level_1/fl_conversion/c/conversion.h
@@ -35,24 +35,25 @@ extern "C" {
  *
  * @param string
  *   The string to convert.
- * @param number
- *   This will store the value of the converted string.
- *   This value is only changed on success.
  * @param location
  *   The start/stop range to convert.
  * @param negative
  *   Set to 0 to treat string as a positive number, 1 for as a negative number.
+ * @param number
+ *   This will store the value of the converted string.
+ *   This value is only changed on success.
  *
  * @return
  *   F_none if the binary string was converted to an signed long.
  *   F_data_not if string starts with a null (length is 0).
+ *
  *   F_number (with error bit) if no conversion was made due to non-binary values being found.
  *   F_number_overflow (with error bit) on integer overflow.
  *   F_number_underflow (with error bit) on integer underflow.
  *   F_parameter (with error bit) if a parameter is invalid.
  */
 #ifndef _di_fl_conversion_string_to_binary_signed_
-  extern f_status_t fl_conversion_string_to_binary_signed(const f_string_t string, f_number_signed_t *number, const f_string_range_t range, const bool negative);
+  extern f_status_t fl_conversion_string_to_binary_signed(const f_string_t string, const f_string_range_t range, const bool negative, f_number_signed_t *number);
 #endif // _di_fl_conversion_string_to_binary_signed_
 
 /**
@@ -64,21 +65,22 @@ extern "C" {
  *
  * @param string
  *   The string to convert.
+ * @param range
+ *   The start/stop range to convert.
  * @param number
  *   This will store the value of the converted string.
  *   This value is only changed on success.
- * @param range
- *   The start/stop range to convert.
  *
  * @return
  *   F_none if the binary string was converted to an unsigned long.
  *   F_data_not if string starts with a null (length is 0).
+ *
  *   F_number (with error bit) if no conversion was made due to non-binary values being found.
  *   F_number_overflow (with error bit) on integer overflow.
  *   F_parameter (with error bit) if a parameter is invalid.
  */
 #ifndef _di_fl_conversion_string_to_binary_unsigned_
-  extern f_status_t fl_conversion_string_to_binary_unsigned(const f_string_t string, f_number_unsigned_t *number, const f_string_range_t range);
+  extern f_status_t fl_conversion_string_to_binary_unsigned(const f_string_t string, const f_string_range_t range, f_number_unsigned_t *number);
 #endif // _di_fl_conversion_string_to_binary_unsigned_
 
 /**
@@ -90,24 +92,25 @@ extern "C" {
  *
  * @param string
  *   The string to convert.
- * @param number
- *   This will store the value of the converted string.
- *   This value is only changed on success.
  * @param range
  *   The start/stop range to convert.
  * @param negative
  *   Set to 0 to treat string as a positive number, 1 for as a negative number.
+ * @param number
+ *   This will store the value of the converted string.
+ *   This value is only changed on success.
  *
  * @return
  *   F_none if the decimal string was converted to an signed long.
  *   F_data_not if string starts with a null (length is 0).
+ *
  *   F_number (with error bit) if no conversion was made due to non-decimal values being found.
  *   F_number_overflow (with error bit) on integer overflow.
  *   F_number_underflow (with error bit) on integer underflow.
  *   F_parameter (with error bit) if a parameter is invalid.
  */
 #ifndef _di_fl_conversion_string_to_decimal_signed_
-  extern f_status_t fl_conversion_string_to_decimal_signed(const f_string_t string, f_number_signed_t *number, const f_string_range_t range, const bool negative);
+  extern f_status_t fl_conversion_string_to_decimal_signed(const f_string_t string, const f_string_range_t range, const bool negative, f_number_signed_t *number);
 #endif // _di_fl_conversion_string_to_decimal_signed_
 
 /**
@@ -119,21 +122,22 @@ extern "C" {
  *
  * @param string
  *   The string to convert.
+ * @param range
+ *   The start/stop range to convert.
  * @param number
  *   This will store the value of the converted string.
  *   This value is only changed on success.
- * @param range
- *   The start/stop range to convert.
  *
  * @return
  *   F_none if the decimal string was converted to an unsigned long.
  *   F_data_not if string starts with a null (length is 0).
+ *
  *   F_number (with error bit) if no conversion was made due to non-decimal values being found.
  *   F_number_overflow (with error bit) on integer overflow.
  *   F_parameter (with error bit) if a parameter is invalid.
  */
 #ifndef _di_fl_conversion_string_to_decimal_unsigned_
-  extern f_status_t fl_conversion_string_to_decimal_unsigned(const f_string_t string, f_number_unsigned_t *number, const f_string_range_t range);
+  extern f_status_t fl_conversion_string_to_decimal_unsigned(const f_string_t string, const f_string_range_t range, f_number_unsigned_t *number);
 #endif // _di_fl_conversion_string_to_decimal_unsigned_
 
 /**
@@ -145,24 +149,25 @@ extern "C" {
  *
  * @param string
  *   The string to convert.
- * @param number
- *   This will store the value of the converted string.
- *   This value is only changed on success.
  * @param range
  *   The start/stop range to convert.
  * @param negative
  *   Set to 0 to treat string as a positive number, 1 for as a negative number.
+ * @param number
+ *   This will store the value of the converted string.
+ *   This value is only changed on success.
  *
  * @return
  *   F_none if the duodecimal string was converted to an signed long.
  *   F_data_not if string starts with a null (length is 0).
+ *
  *   F_number (with error bit) if no conversion was made due to non-duodecimal values being found.
  *   F_number_overflow (with error bit) on integer overflow.
  *   F_number_underflow (with error bit) on integer underflow.
  *   F_parameter (with error bit) if a parameter is invalid.
  */
 #ifndef _di_fl_conversion_string_to_duodecimal_signed_
-  extern f_status_t fl_conversion_string_to_duodecimal_signed(const f_string_t string, f_number_signed_t *number, const f_string_range_t range, const bool negative);
+  extern f_status_t fl_conversion_string_to_duodecimal_signed(const f_string_t string, const f_string_range_t range, const bool negative, f_number_signed_t *number);
 #endif // _di_fl_conversion_string_to_duodecimal_signed_
 
 /**
@@ -174,21 +179,22 @@ extern "C" {
  *
  * @param string
  *   The string to convert.
+ * @param range
+ *   The start/stop range to convert.
  * @param number
  *   This will store the value of the converted string.
  *   This value is only changed on success.
- * @param range
- *   The start/stop range to convert.
  *
  * @return
  *   F_none if the duodecimal string was converted to an unsigned long.
  *   F_data_not if string starts with a null (length is 0).
+ *
  *   F_number (with error bit) if no conversion was made due to non-duodecimal values being found.
  *   F_number_overflow (with error bit) on integer overflow.
  *   F_parameter (with error bit) if a parameter is invalid.
  */
 #ifndef _di_fl_conversion_string_to_duodecimal_unsigned_
-  extern f_status_t fl_conversion_string_to_duodecimal_unsigned(const f_string_t string, f_number_unsigned_t *number, const f_string_range_t range);
+  extern f_status_t fl_conversion_string_to_duodecimal_unsigned(const f_string_t string, const f_string_range_t range, f_number_unsigned_t *number);
 #endif // _di_fl_conversion_string_to_duodecimal_unsigned_
 
 /**
@@ -200,24 +206,25 @@ extern "C" {
  *
  * @param string
  *   The string to convert.
- * @param number
- *   This will store the value of the converted string.
- *   This value is only changed on success.
  * @param range
  *   The start/stop range to convert.
  * @param negative
  *   Set to 0 to treat string as a positive number, 1 for as a negative number.
+ * @param number
+ *   This will store the value of the converted string.
+ *   This value is only changed on success.
  *
  * @return
  *   F_none if the hexidecimal string was converted to an signed long.
  *   F_data_not if string starts with a null (length is 0).
+ *
  *   F_number (with error bit) if no conversion was made due to non-hexidecimal values being found.
  *   F_number_overflow (with error bit) on integer overflow.
  *   F_number_underflow (with error bit) on integer underflow.
  *   F_parameter (with error bit) if a parameter is invalid.
  */
 #ifndef _di_fl_conversion_string_to_hexidecimal_signed_
-  extern f_status_t fl_conversion_string_to_hexidecimal_signed(const f_string_t string, f_number_signed_t *number, const f_string_range_t range, const bool negative);
+  extern f_status_t fl_conversion_string_to_hexidecimal_signed(const f_string_t string, const f_string_range_t range, const bool negative, f_number_signed_t *number);
 #endif // _di_fl_conversion_string_to_hexidecimal_signed_
 
 /**
@@ -229,21 +236,22 @@ extern "C" {
  *
  * @param string
  *   The string to convert.
+ * @param range
+ *   The start/stop range to convert.
  * @param number
  *   This will store the value of the converted string.
  *   This value is only changed on success.
- * @param range
- *   The start/stop range to convert.
  *
  * @return
  *   F_none if the hexidecimal string was converted to an unsigned long.
  *   F_data_not if string starts with a null (length is 0).
+ *
  *   F_number (with error bit) if no conversion was made due to non-hexidecimal values being found.
  *   F_number_overflow (with error bit) on integer overflow.
  *   F_parameter (with error bit) if a parameter is invalid.
  */
 #ifndef _di_fl_conversion_string_to_hexidecimal_unsigned_
-  extern f_status_t fl_conversion_string_to_hexidecimal_unsigned(const f_string_t string, f_number_unsigned_t *number, const f_string_range_t range);
+  extern f_status_t fl_conversion_string_to_hexidecimal_unsigned(const f_string_t string, const f_string_range_t range, f_number_unsigned_t *number);
 #endif // _di_fl_conversion_string_to_hexidecimal_unsigned_
 
 /**
@@ -255,23 +263,24 @@ extern "C" {
  *
  * @param string
  *   The string to convert.
- * @param number
- *   This will store the value of the converted string.
- *   This value is only changed on success.
  * @param range
  *   The start/stop range to convert.
  * @param negative
  *   Set to 0 to treat string as a positive number, 1 for as a negative number.
+ * @param number
+ *   This will store the value of the converted string.
+ *   This value is only changed on success.
  *
  * @return
  *   F_none if the octal string was converted to an signed long.
  *   F_data_not if string starts with a null (length is 0).
+ *
  *   F_number (with error bit) if no conversion was made due to non-octal values being found.
  *   F_number_overflow (with error bit) on integer overflow.
  *   F_parameter (with error bit) if a parameter is invalid.
  */
 #ifndef _di_fl_conversion_string_to_octal_signed_
-  extern f_status_t fl_conversion_string_to_octal_signed(const f_string_t string, f_number_signed_t *number, const f_string_range_t range, const bool negative);
+  extern f_status_t fl_conversion_string_to_octal_signed(const f_string_t string, const f_string_range_t range, const bool negative, f_number_signed_t *number);
 #endif // _di_fl_conversion_string_to_octal_signed_
 
 /**
@@ -283,21 +292,22 @@ extern "C" {
  *
  * @param string
  *   The string to convert.
+ * @param range
+ *   The start/stop range to convert.
  * @param number
  *   This will store the value of the converted string.
  *   This value is only changed on success.
- * @param range
- *   The start/stop range to convert.
  *
  * @return
  *   F_none if the octal string was converted to an unsigned long.
  *   F_data_not if string starts with a null (length is 0).
+ *
  *   F_number (with error bit) if no conversion was made due to non-octal values being found.
  *   F_number_overflow (with error bit) on integer overflow.
  *   F_parameter (with error bit) if a parameter is invalid.
  */
 #ifndef _di_fl_conversion_string_to_octal_unsigned_
-  extern f_status_t fl_conversion_string_to_octal_unsigned(const f_string_t string, f_number_unsigned_t *number, const f_string_range_t range);
+  extern f_status_t fl_conversion_string_to_octal_unsigned(const f_string_t string, const f_string_range_t range, f_number_unsigned_t *number);
 #endif // _di_fl_conversion_string_to_octal_unsigned_
 
 /**
@@ -321,15 +331,16 @@ extern "C" {
  *
  * @param string
  *   The string to convert.
+ * @param range
+ *   The start/stop range to convert.
  * @param number
  *   This will store the value of the converted string.
  *   This value is only changed on success.
- * @param range
- *   The start/stop range to convert.
  *
  * @return
  *   F_none on success.
  *   F_data_not if string starts with a null (length is 0).
+ *
  *   F_complete_not_utf (with error bit) if an incomplete UTF-8 fragment is found.
  *   F_number (with error bit) if parameter is not a number.
  *   F_number_overflow (with error bit) on integer overflow.
@@ -339,7 +350,7 @@ extern "C" {
  * @see strtoll()
  */
 #ifndef _di_fl_conversion_string_to_number_signed_
-  extern f_status_t fl_conversion_string_to_number_signed(const f_string_t string, f_number_signed_t *number, const f_string_range_t range);
+  extern f_status_t fl_conversion_string_to_number_signed(const f_string_t string, const f_string_range_t range, f_number_signed_t *number);
 #endif // _di_fl_conversion_string_to_number_signed_
 
 /**
@@ -364,15 +375,16 @@ extern "C" {
  *
  * @param string
  *   The string to convert.
+ * @param range
+ *   The start/stop range to convert.
  * @param number
  *   This will store the value of the converted string.
  *   This value is only changed on success.
- * @param range
- *   The start/stop range to convert.
  *
  * @return
  *   F_none on success.
  *   F_data_not if string starts with a null (length is 0).
+ *
  *   F_complete_not_utf (with error bit) if an incomplete UTF-8 fragment is found.
  *   F_number (with error bit) if parameter is not a number.
  *   F_number_negative (with error bit) on negative value.
@@ -383,7 +395,7 @@ extern "C" {
  * @see strtoull()
  */
 #ifndef _di_fl_conversion_string_to_number_unsigned_
-  extern f_status_t fl_conversion_string_to_number_unsigned(const f_string_t string, f_number_unsigned_t *number, const f_string_range_t range);
+  extern f_status_t fl_conversion_string_to_number_unsigned(const f_string_t string, const f_string_range_t range, f_number_unsigned_t *number);
 #endif // _di_fl_conversion_string_to_number_unsigned_
 
 #ifdef __cplusplus

diff --git a/level_2/fll_fss/c/private-fss.c b/level_2/fll_fss/c/private-fss.c
index 7802e9eb93187db2ec3a504671ea118db943c5c4..addc98cbd24255b118ed47cd4079e2a57c456d60 100644 (file)
--- a/level_2/fll_fss/c/private-fss.c
+++ b/level_2/fll_fss/c/private-fss.c
@@ -52,7 +52,7 @@ extern "C" {
                         range.stop = i;
 
                         // 1: A possibly valid header type was found, now convert it into its proper format and save the header type.
-                        const f_status_t status = fl_conversion_string_to_hexidecimal_unsigned(buffer.string, &header->type, range);
+                        const f_status_t status = fl_conversion_string_to_hexidecimal_unsigned(buffer.string, range, &header->type);
                         if (F_status_is_error(status)) return status;
 
                         if (status == F_none) {
@@ -110,7 +110,7 @@ extern "C" {
                       range.start = i - 4;
                       range.stop = i;
 
-                      const f_status_t status = fl_conversion_string_to_hexidecimal_unsigned(buffer.string, &header->type, range);
+                      const f_status_t status = fl_conversion_string_to_hexidecimal_unsigned(buffer.string, range, &header->type);
                       if (F_status_is_error(status)) return status;
 
                       header->length = i + 1;

diff --git a/level_3/byte_dump/c/byte_dump.c b/level_3/byte_dump/c/byte_dump.c
index 9356eaaefc68d421daea814fa3a1451a1f7e1e4a..1fe2f612d24b15be0bb7efdff240d22c4c3b2300 100644 (file)
--- a/level_3/byte_dump/c/byte_dump.c
+++ b/level_3/byte_dump/c/byte_dump.c
@@ -234,7 +234,7 @@ extern "C" {
 
         f_number_unsigned_t number = 0;
 
-        status = fl_conversion_string_to_number_unsigned(arguments.argv[index], &number, range);
+        status = fl_conversion_string_to_number_unsigned(arguments.argv[index], range, &number);
 
         if (F_status_is_error(status) || number < 1 || number >= 0xfb) {
           fl_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error);
@@ -266,7 +266,7 @@ extern "C" {
 
         f_number_unsigned_t number = 0;
 
-        status = fl_conversion_string_to_number_unsigned(arguments.argv[index], &number, range);
+        status = fl_conversion_string_to_number_unsigned(arguments.argv[index], range, &number);
 
         if (F_status_is_error(status) || number > f_number_t_size_unsigned) {
           fl_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error);
@@ -298,7 +298,7 @@ extern "C" {
 
         f_number_unsigned_t number = 0;
 
-        status = fl_conversion_string_to_number_unsigned(arguments.argv[index], &number, range);
+        status = fl_conversion_string_to_number_unsigned(arguments.argv[index], range, &number);
 
         if (F_status_is_error(status) || number < 0 || number > f_number_t_size_unsigned) {
           fl_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error);

diff --git a/level_3/controller/c/private-controller.c b/level_3/controller/c/private-controller.c
index 851f948f8553795016121e6e2eead2b06e9cc097..8250911f2519a310f5b4528f979bba7b8f0b3edf 100644 (file)
--- a/level_3/controller/c/private-controller.c
+++ b/level_3/controller/c/private-controller.c
@@ -228,7 +228,7 @@ extern "C" {
         if (!isspace(pid_buffer.string[range.stop])) break;
       } // for
 
-      status = fl_conversion_string_to_decimal_unsigned(pid_buffer.string, &number, range);
+      status = fl_conversion_string_to_decimal_unsigned(pid_buffer.string, range, &number);
 
       if (F_status_is_error_not(status) && number == data.pid) {
         status = f_file_remove(path_pid.string);
@@ -266,7 +266,7 @@ extern "C" {
     f_number_unsigned_t number = 0;
 
     // @todo fix argument ordering in fl_conversion_string_to_number_unsigned().
-    f_status_t status = fl_conversion_string_to_number_unsigned(buffer.string, &number, range);
+    f_status_t status = fl_conversion_string_to_number_unsigned(buffer.string, range, &number);
 
     if (F_status_is_error(status)) {
       status = F_status_set_fine(status);
@@ -308,7 +308,7 @@ extern "C" {
     f_number_unsigned_t number = 0;
 
     // @todo fix argument ordering in fl_conversion_string_to_number_unsigned().
-    f_status_t status = fl_conversion_string_to_number_unsigned(buffer.string, &number, range);
+    f_status_t status = fl_conversion_string_to_number_unsigned(buffer.string, range, &number);
 
     if (F_status_is_error(status)) {
       status = F_status_set_fine(status);

diff --git a/level_3/controller/c/private-entry.c b/level_3/controller/c/private-entry.c
index 7720c06132e7143f7b03f570bff78ec1107867a6..3c4534eb9253a95b2d2f683e4fe4d4501811729e 100644 (file)
--- a/level_3/controller/c/private-entry.c
+++ b/level_3/controller/c/private-entry.c
@@ -498,7 +498,7 @@ extern "C" {
             if (action->status == F_none) {
               const f_string_range_t range = f_macro_string_range_t_initialize(action->parameters.array[1].used);
 
-              status = fl_conversion_string_to_number_unsigned(action->parameters.array[1].string, &action->number, range);
+              status = fl_conversion_string_to_number_unsigned(action->parameters.array[1].string, range, &action->number);
 
               if (F_status_is_error(status) || status == F_data_not) {
                 action->number = 0;

diff --git a/level_3/controller/c/private-rule.c b/level_3/controller/c/private-rule.c
index 32e8bd00b093a8f47870bced60e5c368d8345bfe..804e18898e0e68d5a67edad85e331f2509cb4ab8 100644 (file)
--- a/level_3/controller/c/private-rule.c
+++ b/level_3/controller/c/private-rule.c
@@ -3057,7 +3057,7 @@ extern "C" {
             break;
           }
 
-          status = fl_conversion_string_to_number_signed(cache->buffer_item.string, &number, cache->content_actions.array[i].array[j]);
+          status = fl_conversion_string_to_number_signed(cache->buffer_item.string, cache->content_actions.array[i].array[j], &number);
 
           if (F_status_is_error(status)) {
             status = F_status_set_fine(status);
@@ -3538,7 +3538,7 @@ extern "C" {
 
         for (j = 1; j < 3; ++j, number = 0) {
 
-          status = fl_conversion_string_to_number_signed(cache->buffer_item.string, &number, cache->content_actions.array[i].array[j]);
+          status = fl_conversion_string_to_number_signed(cache->buffer_item.string, cache->content_actions.array[i].array[j], &number);
 
           if (F_status_is_error(status)) {
             status = F_status_set_fine(status);
@@ -3854,7 +3854,7 @@ extern "C" {
 
           f_number_signed_t number = 0;
 
-          status = fl_conversion_string_to_number_signed(cache->buffer_item.string, &number, cache->content_actions.array[i].array[1]);
+          status = fl_conversion_string_to_number_signed(cache->buffer_item.string, cache->content_actions.array[i].array[1], &number);
 
           if (F_status_is_error(status) || (zero_only && number) || (!zero_only && (number < 1 || number > 99))) {
             status = F_status_set_fine(status);
@@ -4053,7 +4053,7 @@ extern "C" {
         else if (type == controller_rule_setting_type_nice) {
           f_number_signed_t number = 0;
 
-          status = fl_conversion_string_to_number_signed(cache->buffer_item.string, &number, cache->content_actions.array[i].array[0]);
+          status = fl_conversion_string_to_number_signed(cache->buffer_item.string, cache->content_actions.array[i].array[0], &number);
 
           if (F_status_is_error(status) || number < -20 || number > 19) {
             status = F_status_set_fine(status);

diff --git a/level_3/fake/c/private-make.c b/level_3/fake/c/private-make.c
index 72bd3b661c23675f525690455d2766871a9aeeaa..24c4c92b5af1a388eb5a1278a1b26a5fb5bc73b0 100644 (file)
--- a/level_3/fake/c/private-make.c
+++ b/level_3/fake/c/private-make.c
@@ -49,7 +49,7 @@ extern "C" {
 
     f_number_unsigned_t number = 0;
 
-    f_status_t status = fl_conversion_string_to_number_unsigned(buffer.string, &number, range);
+    f_status_t status = fl_conversion_string_to_number_unsigned(buffer.string, range, &number);
 
     if (F_status_is_error(status)) {
       status = F_status_set_fine(status);
@@ -127,7 +127,7 @@ extern "C" {
 
     f_number_unsigned_t number = 0;
 
-    f_status_t status = fl_conversion_string_to_number_unsigned(buffer.string, &number, range);
+    f_status_t status = fl_conversion_string_to_number_unsigned(buffer.string, range, &number);
 
     if (F_status_is_error(status)) {
       status = F_status_set_fine(status);
@@ -3169,7 +3169,7 @@ extern "C" {
           status_number = F_status_set_error(F_failure);
         }
         else {
-          status_number = fl_conversion_string_to_number_unsigned(arguments.array[i].string, &number_left, range);
+          status_number = fl_conversion_string_to_number_unsigned(arguments.array[i].string, range, &number_left);
         }
 
         if (F_status_is_error_not(status_number)) {
@@ -3193,7 +3193,7 @@ extern "C" {
                 status_number = F_status_set_error(F_failure);
               }
               else {
-                status_number = fl_conversion_string_to_number_unsigned(arguments.array[i].string, &number_right, range);
+                status_number = fl_conversion_string_to_number_unsigned(arguments.array[i].string, range, &number_right);
               }
             }
             else {
@@ -4842,7 +4842,7 @@ extern "C" {
                   status_number = F_status_set_error(F_failure);
                 }
                 else {
-                  status_number = fl_conversion_string_to_number_unsigned(arguments.array[i].string, &number, range);
+                  status_number = fl_conversion_string_to_number_unsigned(arguments.array[i].string, range, &number);
                 }
               }
               else {

diff --git a/level_3/fss_basic_list_read/c/fss_basic_list_read.c b/level_3/fss_basic_list_read/c/fss_basic_list_read.c
index 901e41c242ec3a9a2d810436f91cb84ef68c8052..07542847f93a22ac53736049c9f400706770cb27 100644 (file)
--- a/level_3/fss_basic_list_read/c/fss_basic_list_read.c
+++ b/level_3/fss_basic_list_read/c/fss_basic_list_read.c
@@ -388,7 +388,7 @@ extern "C" {
               range.start++;
             }
 
-            status = fl_conversion_string_to_number_unsigned(arguments.argv[location], &data->delimit_depth, range);
+            status = fl_conversion_string_to_number_unsigned(arguments.argv[location], range, &data->delimit_depth);
 
             if (F_status_is_error(status)) {
               fll_error_parameter_integer_print(data->error, F_status_set_fine(status), "fl_conversion_string_to_number_unsigned", F_true, fss_basic_list_read_long_delimit, arguments.argv[location]);

diff --git a/level_3/fss_basic_list_read/c/private-fss_basic_list_read.c b/level_3/fss_basic_list_read/c/private-fss_basic_list_read.c
index d63c8d0b02f19fb0c4f149fb4770398d87ea4c37..f1e2e6fb313f6a55c0ab51a896556a1305cc8abc 100644 (file)
--- a/level_3/fss_basic_list_read/c/private-fss_basic_list_read.c
+++ b/level_3/fss_basic_list_read/c/private-fss_basic_list_read.c
@@ -46,7 +46,7 @@ extern "C" {
 
         const f_string_range_t range = f_macro_string_range_t_initialize(strlen(arguments.argv[position_depth]));
 
-        status = fl_conversion_string_to_number_unsigned(arguments.argv[position_depth], &depths->array[i].depth, range);
+        status = fl_conversion_string_to_number_unsigned(arguments.argv[position_depth], range, &depths->array[i].depth);
 
         if (F_status_is_error(status)) {
           fll_error_parameter_integer_print(data.error, F_status_set_fine(status), "fl_conversion_string_to_number_unsigned", F_true, fss_basic_list_read_long_depth, arguments.argv[position_depth]);
@@ -69,7 +69,7 @@ extern "C" {
 
           const f_string_range_t range = f_macro_string_range_t_initialize(strlen(arguments.argv[depths->array[i].index_at]));
 
-          status = fl_conversion_string_to_number_unsigned(arguments.argv[depths->array[i].index_at], &depths->array[i].value_at, range);
+          status = fl_conversion_string_to_number_unsigned(arguments.argv[depths->array[i].index_at], range, &depths->array[i].value_at);
 
           if (F_status_is_error(status)) {
             fll_error_parameter_integer_print(data.error, F_status_set_fine(status), "fl_conversion_string_to_number_unsigned", F_true, fss_basic_list_read_long_at, arguments.argv[depths->array[i].index_at]);
@@ -231,7 +231,7 @@ extern "C" {
       const f_array_length_t index = data->parameters[fss_basic_list_read_parameter_select].values.array[data->parameters[fss_basic_list_read_parameter_select].values.used - 1];
       const f_string_range_t range = f_macro_string_range_t_initialize(strlen(arguments.argv[index]));
 
-      status = fl_conversion_string_to_number_unsigned(arguments.argv[index], &select, range);
+      status = fl_conversion_string_to_number_unsigned(arguments.argv[index], range, &select);
 
       if (F_status_is_error(status)) {
         fll_error_parameter_integer_print(data->error, F_status_set_fine(status), "fl_conversion_string_to_number_unsigned", F_true, fss_basic_list_read_long_select, arguments.argv[index]);
@@ -250,7 +250,7 @@ extern "C" {
       const f_array_length_t index = data->parameters[fss_basic_list_read_parameter_line].values.array[data->parameters[fss_basic_list_read_parameter_line].values.used - 1];
       const f_string_range_t range = f_macro_string_range_t_initialize(strlen(arguments.argv[index]));
 
-      status = fl_conversion_string_to_number_unsigned(arguments.argv[index], &line, range);
+      status = fl_conversion_string_to_number_unsigned(arguments.argv[index], range, &line);
 
       if (F_status_is_error(status)) {
         fll_error_parameter_integer_print(data->error, F_status_set_fine(status), "fl_conversion_string_to_number_unsigned", F_true, fss_basic_list_read_long_line, arguments.argv[index]);

diff --git a/level_3/fss_basic_read/c/fss_basic_read.c b/level_3/fss_basic_read/c/fss_basic_read.c
index 41d70dc1ff40777321679869081eaec94006baf7..9452edcd1d59c8187da27d898bd4751f944ae038 100644 (file)
--- a/level_3/fss_basic_read/c/fss_basic_read.c
+++ b/level_3/fss_basic_read/c/fss_basic_read.c
@@ -388,7 +388,7 @@ extern "C" {
               range.start++;
             }
 
-            status = fl_conversion_string_to_number_unsigned(arguments.argv[location], &data->delimit_depth, range);
+            status = fl_conversion_string_to_number_unsigned(arguments.argv[location], range, &data->delimit_depth);
 
             if (F_status_is_error(status)) {
               fll_error_parameter_integer_print(data->error, F_status_set_fine(status), "fl_conversion_string_to_number_unsigned", F_true, fss_basic_read_long_delimit, arguments.argv[location]);

diff --git a/level_3/fss_basic_read/c/private-fss_basic_read.c b/level_3/fss_basic_read/c/private-fss_basic_read.c
index 6948a1e267491364e6d2d686ddf7e24c9d477f55..bcbc39d4ec8ca495b8aab49e77a0f3ac222a47f6 100644 (file)
--- a/level_3/fss_basic_read/c/private-fss_basic_read.c
+++ b/level_3/fss_basic_read/c/private-fss_basic_read.c
@@ -46,7 +46,7 @@ extern "C" {
 
         const f_string_range_t range = f_macro_string_range_t_initialize(strlen(arguments.argv[position_depth]));
 
-        status = fl_conversion_string_to_number_unsigned(arguments.argv[position_depth], &depths->array[i].depth, range);
+        status = fl_conversion_string_to_number_unsigned(arguments.argv[position_depth], range, &depths->array[i].depth);
 
         if (F_status_is_error(status)) {
           fll_error_parameter_integer_print(data.error, F_status_set_fine(status), "fl_conversion_string_to_number_unsigned", F_true, fss_basic_read_long_depth, arguments.argv[position_depth]);
@@ -69,7 +69,7 @@ extern "C" {
 
           const f_string_range_t range = f_macro_string_range_t_initialize(strlen(arguments.argv[depths->array[i].index_at]));
 
-          status = fl_conversion_string_to_number_unsigned(arguments.argv[depths->array[i].index_at], &depths->array[i].value_at, range);
+          status = fl_conversion_string_to_number_unsigned(arguments.argv[depths->array[i].index_at], range, &depths->array[i].value_at);
 
           if (F_status_is_error(status)) {
             fll_error_parameter_integer_print(data.error, F_status_set_fine(status), "fl_conversion_string_to_number_unsigned", F_true, fss_basic_read_long_at, arguments.argv[depths->array[i].index_at]);
@@ -220,7 +220,7 @@ extern "C" {
       const f_array_length_t index = data->parameters[fss_basic_read_parameter_select].values.array[data->parameters[fss_basic_read_parameter_select].values.used - 1];
       const f_string_range_t range = f_macro_string_range_t_initialize(strlen(arguments.argv[index]));
 
-      status = fl_conversion_string_to_number_unsigned(arguments.argv[index], &select, range);
+      status = fl_conversion_string_to_number_unsigned(arguments.argv[index], range, &select);
 
       if (F_status_is_error(status)) {
         fll_error_parameter_integer_print(data->error, F_status_set_fine(status), "fl_conversion_string_to_number_unsigned", F_true, fss_basic_read_long_select, arguments.argv[index]);
@@ -239,7 +239,7 @@ extern "C" {
       const f_array_length_t index = data->parameters[fss_basic_read_parameter_line].values.array[data->parameters[fss_basic_read_parameter_line].values.used - 1];
       const f_string_range_t range = f_macro_string_range_t_initialize(strlen(arguments.argv[index]));
 
-      status = fl_conversion_string_to_number_unsigned(arguments.argv[index], &line, range);
+      status = fl_conversion_string_to_number_unsigned(arguments.argv[index], range, &line);
 
       if (F_status_is_error(status)) {
         fll_error_parameter_integer_print(data->error, F_status_set_fine(status), "fl_conversion_string_to_number_unsigned", F_true, fss_basic_read_long_line, arguments.argv[index]);

diff --git a/level_3/fss_embedded_list_read/c/fss_embedded_list_read.c b/level_3/fss_embedded_list_read/c/fss_embedded_list_read.c
index c0cf8092a957f696f227ae44418a9904044803c9..f47e50a4bb18f9f727842c89a8031cc377622800 100644 (file)
--- a/level_3/fss_embedded_list_read/c/fss_embedded_list_read.c
+++ b/level_3/fss_embedded_list_read/c/fss_embedded_list_read.c
@@ -388,7 +388,7 @@ extern "C" {
               range.start++;
             }
 
-            status = fl_conversion_string_to_number_unsigned(arguments.argv[location], &data->delimit_depth, range);
+            status = fl_conversion_string_to_number_unsigned(arguments.argv[location], range, &data->delimit_depth);
 
             if (F_status_is_error(status)) {
               fll_error_parameter_integer_print(data->error, F_status_set_fine(status), "fl_conversion_string_to_number_unsigned", F_true, fss_embedded_list_read_long_delimit, arguments.argv[location]);

diff --git a/level_3/fss_embedded_list_read/c/private-fss_embedded_list_read.c b/level_3/fss_embedded_list_read/c/private-fss_embedded_list_read.c
index 7d786feb74c4cde5ab110372d6aed85eed9e80eb..93d3cadc568d4334e80d25e37418fed3adefe4d3 100644 (file)
--- a/level_3/fss_embedded_list_read/c/private-fss_embedded_list_read.c
+++ b/level_3/fss_embedded_list_read/c/private-fss_embedded_list_read.c
@@ -125,7 +125,7 @@ extern "C" {
         if (values_type[i] == fss_embedded_list_read_parameter_depth || values_type[i] == fss_embedded_list_read_parameter_at) {
           const f_string_range_t range = f_macro_string_range_t_initialize(strlen(arguments.argv[values_order[i]]));
 
-          status = fl_conversion_string_to_number_unsigned(arguments.argv[values_order[i]], &number, range);
+          status = fl_conversion_string_to_number_unsigned(arguments.argv[values_order[i]], range, &number);
 
           if (F_status_is_error(status)) {
             fll_error_parameter_integer_print(data.error, F_status_set_fine(status), "fl_conversion_string_to_number_unsigned", F_true, fss_embedded_list_read_long_depth, arguments.argv[values_order[i]]);
@@ -279,7 +279,7 @@ extern "C" {
         const f_array_length_t index = data->parameters[fss_embedded_list_read_parameter_select].values.array[data->parameters[fss_embedded_list_read_parameter_select].values.used - 1];
         const f_string_range_t range = f_macro_string_range_t_initialize(strlen(arguments.argv[index]));
 
-        status = fl_conversion_string_to_number_unsigned(arguments.argv[index], &select, range);
+        status = fl_conversion_string_to_number_unsigned(arguments.argv[index], range, &select);
 
         if (F_status_is_error(status)) {
           fll_error_parameter_integer_print(data->error, F_status_set_fine(status), "fl_conversion_string_to_number_unsigned", F_true, fss_embedded_list_read_long_select, arguments.argv[index]);
@@ -299,7 +299,7 @@ extern "C" {
       const f_array_length_t index = data->parameters[fss_embedded_list_read_parameter_line].values.array[data->parameters[fss_embedded_list_read_parameter_line].values.used - 1];
       const f_string_range_t range = f_macro_string_range_t_initialize(strlen(arguments.argv[index]));
 
-      status = fl_conversion_string_to_number_unsigned(arguments.argv[index], &line, range);
+      status = fl_conversion_string_to_number_unsigned(arguments.argv[index], range, &line);
 
       if (F_status_is_error(status)) {
         fll_error_parameter_integer_print(data->error, F_status_set_fine(status), "fl_conversion_string_to_number_unsigned", F_true, fss_embedded_list_read_long_line, arguments.argv[index]);

diff --git a/level_3/fss_embedded_list_write/c/private-fss_embedded_list_write.c b/level_3/fss_embedded_list_write/c/private-fss_embedded_list_write.c
index f9809a3f7961f564d6f8f6089a16047653a8b2ef..62ff1ee141277d3f888c70ba837e332f58e82858 100644 (file)
--- a/level_3/fss_embedded_list_write/c/private-fss_embedded_list_write.c
+++ b/level_3/fss_embedded_list_write/c/private-fss_embedded_list_write.c
@@ -371,7 +371,7 @@ extern "C" {
         range.start = 1;
       }
 
-      status = fl_conversion_string_to_number_unsigned(arguments.argv[index], &number, range);
+      status = fl_conversion_string_to_number_unsigned(arguments.argv[index], range, &number);
 
       if (F_status_is_error(status)) {
         fll_error_parameter_integer_print(data.error, F_status_set_fine(status), "fl_conversion_string_to_number_unsigned", F_true, fss_embedded_list_write_long_ignore, arguments.argv[index]);
@@ -390,7 +390,7 @@ extern "C" {
         range.start = 1;
       }
 
-      status = fl_conversion_string_to_number_unsigned(arguments.argv[index], &number, range);
+      status = fl_conversion_string_to_number_unsigned(arguments.argv[index], range, &number);
 
       if (F_status_is_error(status)) {
         fll_error_parameter_integer_print(data.error, F_status_set_fine(status), "fl_conversion_string_to_number_unsigned", F_true, fss_embedded_list_write_long_ignore, arguments.argv[index]);

diff --git a/level_3/fss_extended_list_read/c/fss_extended_list_read.c b/level_3/fss_extended_list_read/c/fss_extended_list_read.c
index 82cdbee9a33a4c5521fe45df8f155f587374bd29..22c616add9b12be747d6e2a6a55210724705155b 100644 (file)
--- a/level_3/fss_extended_list_read/c/fss_extended_list_read.c
+++ b/level_3/fss_extended_list_read/c/fss_extended_list_read.c
@@ -388,7 +388,7 @@ extern "C" {
               range.start++;
             }
 
-            status = fl_conversion_string_to_number_unsigned(arguments.argv[location], &data->delimit_depth, range);
+            status = fl_conversion_string_to_number_unsigned(arguments.argv[location], range, &data->delimit_depth);
 
             if (F_status_is_error(status)) {
               fll_error_parameter_integer_print(data->error, F_status_set_fine(status), "fl_conversion_string_to_number_unsigned", F_true, fss_extended_list_read_long_delimit, arguments.argv[location]);

diff --git a/level_3/fss_extended_list_read/c/private-fss_extended_list_read.c b/level_3/fss_extended_list_read/c/private-fss_extended_list_read.c
index 30f89716385f33f768acb0835ec6b33f95c58aa6..fde8513db694032924e217a21df0bb4ecc5b8d5f 100644 (file)
--- a/level_3/fss_extended_list_read/c/private-fss_extended_list_read.c
+++ b/level_3/fss_extended_list_read/c/private-fss_extended_list_read.c
@@ -46,7 +46,7 @@ extern "C" {
 
         const f_string_range_t range = f_macro_string_range_t_initialize(strlen(arguments.argv[position_depth]));
 
-        status = fl_conversion_string_to_number_unsigned(arguments.argv[position_depth], &depths->array[i].depth, range);
+        status = fl_conversion_string_to_number_unsigned(arguments.argv[position_depth], range, &depths->array[i].depth);
 
         if (F_status_is_error(status)) {
           fll_error_parameter_integer_print(data.error, F_status_set_fine(status), "fl_conversion_string_to_number_unsigned", F_true, fss_extended_list_read_long_depth, arguments.argv[position_depth]);
@@ -69,7 +69,7 @@ extern "C" {
 
           const f_string_range_t range = f_macro_string_range_t_initialize(strlen(arguments.argv[depths->array[i].index_at]));
 
-          status = fl_conversion_string_to_number_unsigned(arguments.argv[depths->array[i].index_at], &depths->array[i].value_at, range);
+          status = fl_conversion_string_to_number_unsigned(arguments.argv[depths->array[i].index_at], range, &depths->array[i].value_at);
 
           if (F_status_is_error(status)) {
             fll_error_parameter_integer_print(data.error, F_status_set_fine(status), "fl_conversion_string_to_number_unsigned", F_true, fss_extended_list_read_long_at, arguments.argv[depths->array[i].index_at]);
@@ -231,7 +231,7 @@ extern "C" {
       const f_array_length_t index = data->parameters[fss_extended_list_read_parameter_select].values.array[data->parameters[fss_extended_list_read_parameter_select].values.used - 1];
       const f_string_range_t range = f_macro_string_range_t_initialize(strlen(arguments.argv[index]));
 
-      status = fl_conversion_string_to_number_unsigned(arguments.argv[index], &select, range);
+      status = fl_conversion_string_to_number_unsigned(arguments.argv[index], range, &select);
 
       if (F_status_is_error(status)) {
         fll_error_parameter_integer_print(data->error, F_status_set_fine(status), "fl_conversion_string_to_number_unsigned", F_true, fss_extended_list_read_long_select, arguments.argv[index]);
@@ -250,7 +250,7 @@ extern "C" {
       const f_array_length_t index = data->parameters[fss_extended_list_read_parameter_line].values.array[data->parameters[fss_extended_list_read_parameter_line].values.used - 1];
       const f_string_range_t range = f_macro_string_range_t_initialize(strlen(arguments.argv[index]));
 
-      status = fl_conversion_string_to_number_unsigned(arguments.argv[index], &line, range);
+      status = fl_conversion_string_to_number_unsigned(arguments.argv[index], range, &line);
 
       if (F_status_is_error(status)) {
         fll_error_parameter_integer_print(data->error, F_status_set_fine(status), "fl_conversion_string_to_number_unsigned", F_true, fss_extended_list_read_long_line, arguments.argv[index]);

diff --git a/level_3/fss_extended_list_write/c/private-fss_extended_list_write.c b/level_3/fss_extended_list_write/c/private-fss_extended_list_write.c
index 8d3ca8c15b74b4b7cfa2891ef18cd0eeb940acec..587b61e4f935410936fdca427ec2950c77170856 100644 (file)
--- a/level_3/fss_extended_list_write/c/private-fss_extended_list_write.c
+++ b/level_3/fss_extended_list_write/c/private-fss_extended_list_write.c
@@ -371,7 +371,7 @@ extern "C" {
         range.start = 1;
       }
 
-      status = fl_conversion_string_to_number_unsigned(arguments.argv[index], &number, range);
+      status = fl_conversion_string_to_number_unsigned(arguments.argv[index], range, &number);
 
       if (F_status_is_error(status)) {
         fll_error_parameter_integer_print(data.error, F_status_set_fine(status), "fl_conversion_string_to_number_unsigned", F_true, fss_extended_list_write_long_ignore, arguments.argv[index]);
@@ -390,7 +390,7 @@ extern "C" {
         range.start = 1;
       }
 
-      status = fl_conversion_string_to_number_unsigned(arguments.argv[index], &number, range);
+      status = fl_conversion_string_to_number_unsigned(arguments.argv[index], range, &number);
 
       if (F_status_is_error(status)) {
         fll_error_parameter_integer_print(data.error, F_status_set_fine(status), "fl_conversion_string_to_number_unsigned", F_true, fss_extended_list_write_long_ignore, arguments.argv[index]);

diff --git a/level_3/fss_extended_read/c/fss_extended_read.c b/level_3/fss_extended_read/c/fss_extended_read.c
index 9e270b798581e3b1c923611bfec0e09c4f43bcb5..1090cddccb67818442b66f2fdcd8a5fa2eb7f9f4 100644 (file)
--- a/level_3/fss_extended_read/c/fss_extended_read.c
+++ b/level_3/fss_extended_read/c/fss_extended_read.c
@@ -388,7 +388,7 @@ extern "C" {
               range.start++;
             }
 
-            status = fl_conversion_string_to_number_unsigned(arguments.argv[location], &data->delimit_depth, range);
+            status = fl_conversion_string_to_number_unsigned(arguments.argv[location], range, &data->delimit_depth);
 
             if (F_status_is_error(status)) {
               fll_error_parameter_integer_print(data->error, F_status_set_fine(status), "fl_conversion_string_to_number_unsigned", F_true, fss_extended_read_long_delimit, arguments.argv[location]);

diff --git a/level_3/fss_extended_read/c/private-fss_extended_read.c b/level_3/fss_extended_read/c/private-fss_extended_read.c
index 36f7db4161b37c8d63a2c16dc377287f04d22fe3..bad7a5775bdc532f1eb0a4b0284221b83365cfe4 100644 (file)
--- a/level_3/fss_extended_read/c/private-fss_extended_read.c
+++ b/level_3/fss_extended_read/c/private-fss_extended_read.c
@@ -73,7 +73,7 @@ extern "C" {
 
         const f_string_range_t range = f_macro_string_range_t_initialize(strlen(arguments.argv[position_depth]));
 
-        status = fl_conversion_string_to_number_unsigned(arguments.argv[position_depth], &depths->array[i].depth, range);
+        status = fl_conversion_string_to_number_unsigned(arguments.argv[position_depth], range, &depths->array[i].depth);
 
         if (F_status_is_error(status)) {
           fll_error_parameter_integer_print(data.error, F_status_set_fine(status), "fl_conversion_string_to_number_unsigned", F_true, fss_extended_read_long_depth, arguments.argv[position_depth]);
@@ -96,7 +96,7 @@ extern "C" {
 
           const f_string_range_t range = f_macro_string_range_t_initialize(strlen(arguments.argv[depths->array[i].index_at]));
 
-          status = fl_conversion_string_to_number_unsigned(arguments.argv[depths->array[i].index_at], &depths->array[i].value_at, range);
+          status = fl_conversion_string_to_number_unsigned(arguments.argv[depths->array[i].index_at], range, &depths->array[i].value_at);
 
           if (F_status_is_error(status)) {
             fll_error_parameter_integer_print(data.error, F_status_set_fine(status), "fl_conversion_string_to_number_unsigned", F_true, fss_extended_read_long_at, arguments.argv[depths->array[i].index_at]);
@@ -248,7 +248,7 @@ extern "C" {
       const f_array_length_t index = data->parameters[fss_extended_read_parameter_select].values.array[data->parameters[fss_extended_read_parameter_select].values.used - 1];
       const f_string_range_t range = f_macro_string_range_t_initialize(strlen(arguments.argv[index]));
 
-      status = fl_conversion_string_to_number_unsigned(arguments.argv[index], &select, range);
+      status = fl_conversion_string_to_number_unsigned(arguments.argv[index], range, &select);
 
       if (F_status_is_error(status)) {
         fll_error_parameter_integer_print(data->error, F_status_set_fine(status), "fl_conversion_string_to_number_unsigned", F_true, fss_extended_read_long_select, arguments.argv[index]);
@@ -262,7 +262,7 @@ extern "C" {
       const f_array_length_t index = data->parameters[fss_extended_read_parameter_line].values.array[data->parameters[fss_extended_read_parameter_line].values.used - 1];
       const f_string_range_t range = f_macro_string_range_t_initialize(strlen(arguments.argv[index]));
 
-      status = fl_conversion_string_to_number_unsigned(arguments.argv[index], &line, range);
+      status = fl_conversion_string_to_number_unsigned(arguments.argv[index], range, &line);
 
       if (F_status_is_error(status)) {
         fll_error_parameter_integer_print(data->error, F_status_set_fine(status), "fl_conversion_string_to_number_unsigned", F_true, fss_extended_read_long_line, arguments.argv[index]);

diff --git a/level_3/fss_status_code/c/private-fss_status_code.c b/level_3/fss_status_code/c/private-fss_status_code.c
index 81feda255be37315154522d25cb8b4f484947270..40fa405aa7e2425989847d06ad4a920bcb0bf04c 100644 (file)
--- a/level_3/fss_status_code/c/private-fss_status_code.c
+++ b/level_3/fss_status_code/c/private-fss_status_code.c
@@ -50,7 +50,7 @@ extern "C" {
 
       f_number_unsigned_t number = 0;
 
-      status = fl_conversion_string_to_number_unsigned(value, &number, range);
+      status = fl_conversion_string_to_number_unsigned(value, range, &number);
 
       if (status == F_none) {
         fl_color_print(data.output.stream, data.context.set.error, "invalid name%c", f_string_eol_s[0]);
@@ -131,7 +131,7 @@ extern "C" {
   f_status_t fss_status_code_convert_number(const fss_status_code_data_t data, const f_string_t value, f_number_unsigned_t *number) {
     const f_string_range_t range = f_macro_string_range_t_initialize(strlen(value));
 
-    f_status_t status = fl_conversion_string_to_number_unsigned(value, number, range);
+    f_status_t status = fl_conversion_string_to_number_unsigned(value, range, number);
 
     if (*number > F_status_size_max_with_signal) {
       fl_color_print(data.output.stream, data.context.set.error, "out of range%c", f_string_eol_s[0]);

diff --git a/level_3/iki_read/c/iki_read.c b/level_3/iki_read/c/iki_read.c
index 573cca13660d2d7fee37017488ba4c3641207392..52c8347d4e532156f2254c2fbe3bbee09da4fec6 100644 (file)
--- a/level_3/iki_read/c/iki_read.c
+++ b/level_3/iki_read/c/iki_read.c
@@ -194,7 +194,7 @@ extern "C" {
 
         f_number_unsigned_t number = 0;
 
-        status = fl_conversion_string_to_number_unsigned(arguments.argv[index], &number, range);
+        status = fl_conversion_string_to_number_unsigned(arguments.argv[index], range, &number);
 
         if (F_status_is_error(status)) {
           fll_error_parameter_integer_print(data->error, F_status_set_fine(status), "fl_conversion_string_to_number_unsigned", F_true, iki_read_long_at, arguments.argv[index]);
@@ -234,7 +234,7 @@ extern "C" {
 
         f_number_unsigned_t number = 0;
 
-        status = fl_conversion_string_to_number_unsigned(arguments.argv[index], &number, range);
+        status = fl_conversion_string_to_number_unsigned(arguments.argv[index], range, &number);
 
         if (F_status_is_error(status)) {
           fll_error_parameter_integer_print(data->error, F_status_set_fine(status), "fl_conversion_string_to_number_unsigned", F_true, iki_read_long_line, arguments.argv[index]);

diff --git a/level_3/status_code/c/private-status_code.c b/level_3/status_code/c/private-status_code.c
index 1cff4c821d65d0621944556cf7a883f34a30c1af..e8b18e05b5b09400a91ea2da2508336eb4b1b3e6 100644 (file)
--- a/level_3/status_code/c/private-status_code.c
+++ b/level_3/status_code/c/private-status_code.c
@@ -52,7 +52,7 @@ extern "C" {
 
       f_number_unsigned_t number = 0;
 
-      status = fl_conversion_string_to_number_unsigned(value, &number, range);
+      status = fl_conversion_string_to_number_unsigned(value, range, &number);
 
       if (status == F_none) {
         fl_color_print(data.output.stream, data.context.set.error, "invalid name%c", f_string_eol_s[0]);
@@ -129,7 +129,7 @@ extern "C" {
   f_status_t status_code_convert_number(const status_code_data_t data, const f_string_t value, f_number_unsigned_t *number) {
     const f_string_range_t range = f_macro_string_range_t_initialize(strlen(value));
 
-    f_status_t status = fl_conversion_string_to_number_unsigned(value, number, range);
+    f_status_t status = fl_conversion_string_to_number_unsigned(value, range, number);
 
     if (*number > F_status_size_max_with_signal) {
       fl_color_print(data.output.stream, data.context.set.error, "out of range%c", f_string_eol_s[0]);