Update: remove common type wrappers and use typedef instead of '#define'

I intend to begin transitioning from the core types like 'int', 'char', etc...
As part of this, I need to remove a number of the type #define wrappers.
This is also done, in part, because I learned that there are some equivalents to f_min_s_int.

Using explicit types is safer and better designed than something like 'char'.
The goal will be to replace 'char' with uint8_t (or int8_t as needed).

Furthermore, specifying int32_t and int64_t (and similar) should improve the code quality.
The use of types like "wchar", is dangerous because some systems use different sizes.
Instead, for something like "wchar", an uint32_t, might be used.
(although this project is to be designed around UTF-8 so the use of wchar is wrong anyway but it does make good example.)

diff --git a/level_0/f_color/c/color.h b/level_0/f_color/c/color.h
index 12b40ed0e44f409a5833270d5250d38cc1468134..88e08d8c47e1927841d4adbb09730b5769ba4c6c 100644 (file)
--- a/level_0/f_color/c/color.h
+++ b/level_0/f_color/c/color.h
@@ -24,7 +24,7 @@ extern "C" {
 #endif // _di_f_color_max_size_
 
 #ifndef _di_f_color_types_
-  typedef f_min_u_int f_color_id;
+  typedef unsigned short f_color_id;
 
   // f_color_id codes
   #define f_color_code_linux     0

diff --git a/level_0/f_console/c/console.h b/level_0/f_console/c/console.h
index 87031946c57a0f5a68dcd423010140a18f307bf8..b3605dc0c8908e27324bb4db02c4493109d331d2 100644 (file)
--- a/level_0/f_console/c/console.h
+++ b/level_0/f_console/c/console.h
@@ -104,7 +104,7 @@ extern "C" {
  * - other: parameters using neither minus nor plus sign, such as 'build'.
  */
 #ifndef _di_f_console_types_
-  typedef f_min_u_short f_console_id;
+  typedef unsigned short f_console_id;
 
   enum {
     f_console_result_none,

diff --git a/level_0/f_conversion/c/conversion.c b/level_0/f_conversion/c/conversion.c
index 281f2d9978f6d105217a83235f3e98bba8909bf8..98434fb55efb2bb30f6f1dd886ffff73ced9c281 100644 (file)
--- a/level_0/f_conversion/c/conversion.c
+++ b/level_0/f_conversion/c/conversion.c
@@ -33,7 +33,7 @@ extern "C" {
 #endif // _di_f_is_hexidecimal_
 
 #ifndef _di_f_character_to_digit_
-  f_return_status f_character_to_digit(const char character, f_u_long *digit) {
+  f_return_status f_character_to_digit(const char character, unsigned long *digit) {
     #ifndef _di_level_0_parameter_checking_
       if (digit == 0) return f_status_set_error(f_invalid_parameter);
     #endif // _di_level_0_parameter_checking_
@@ -58,7 +58,7 @@ extern "C" {
 #endif // _di_f_character_to_digit_
 
 #ifndef _di_f_character_to_hexdecimal_
-  f_return_status f_character_to_hexdecimal(const char character, f_u_long *digit) {
+  f_return_status f_character_to_hexdecimal(const char character, unsigned long *digit) {
     #ifndef _di_level_0_parameter_checking_
       if (digit == 0) return f_status_set_error(f_invalid_parameter);
     #endif // _di_level_0_parameter_checking_
@@ -95,7 +95,7 @@ extern "C" {
 #endif // _di_f_character_to_hexdecimal_
 
 #ifndef _di_f_string_to_decimal_
-  f_return_status f_string_to_decimal(const f_string string, f_u_long *digit, const f_string_location location) {
+  f_return_status f_string_to_decimal(const f_string string, unsigned long *digit, const f_string_location location) {
     #ifndef _di_level_0_parameter_checking_
       if (digit == 0) return f_status_set_error(f_invalid_parameter);
       if (location.start < 0) return f_status_set_error(f_invalid_parameter);
@@ -104,8 +104,8 @@ extern "C" {
     #endif // _di_level_0_parameter_checking_
 
     f_string_length current_location = location.start;
-    f_u_long scale = 0;
-    f_u_long temp_digit = 0;
+    unsigned long scale = 0;
+    unsigned long temp_digit = 0;
 
     while (current_location < location.stop) {
       if (f_character_to_digit(string[current_location], &temp_digit) == f_none) {
@@ -132,7 +132,7 @@ extern "C" {
 #endif // _di_f_string_to_decimal_
 
 #ifndef _di_f_string_to_hexidecimal_
-  f_return_status f_string_to_hexidecimal(const f_string string, f_u_long *digit, const f_string_location location) {
+  f_return_status f_string_to_hexidecimal(const f_string string, unsigned long *digit, const f_string_location location) {
     #ifndef _di_level_0_parameter_checking_
       if (digit == 0) return f_status_set_error(f_invalid_parameter);
       if (location.start < 0) return f_status_set_error(f_invalid_parameter);
@@ -141,8 +141,8 @@ extern "C" {
     #endif // _di_level_0_parameter_checking_
 
     f_string_length current_location = location.start;
-    f_u_long scale = 0;
-    f_u_long temp_digit = 0;
+    unsigned long scale = 0;
+    unsigned long temp_digit = 0;
 
     while (current_location < location.stop) {
       if (f_character_to_hexdecimal(string[current_location], &temp_digit) == f_none) {

diff --git a/level_0/f_conversion/c/conversion.h b/level_0/f_conversion/c/conversion.h
index 56fb087c34667b66a9b0fe5a89e279f23e792748..c13bdb77dc812ab912e996763ca619b750fe023f 100644 (file)
--- a/level_0/f_conversion/c/conversion.h
+++ b/level_0/f_conversion/c/conversion.h
@@ -52,14 +52,14 @@ extern "C" {
   /**
    * convert a single character into the digit that it represents.
    */
-  extern f_return_status f_character_to_digit(const char character, f_u_long *digit);
+  extern f_return_status f_character_to_digit(const char character, unsigned long *digit);
 #endif // _di_f_character_to_digit_
 
 #ifndef _di_f_character_to_hexdecimal_
   /**
    *convert a single character into the hexidecimal digit that it represents.
    */
-  extern f_return_status f_character_to_hexdecimal(const char character, f_u_long *digit);
+  extern f_return_status f_character_to_hexdecimal(const char character, unsigned long *digit);
 #endif // _di_f_character_to_hexdecimal_
 
 #ifndef _di_f_string_to_decimal_
@@ -68,7 +68,7 @@ extern "C" {
    * convert a series of positive numbers into a string, stopping at one of the following: EOS, max_length, or a non-digit.
    * will not process signed statuses (+/-).
    */
-  extern f_return_status f_string_to_decimal(const f_string string, f_u_long *digit, const f_string_location location);
+  extern f_return_status f_string_to_decimal(const f_string string, unsigned long *digit, const f_string_location location);
 #endif // _di_f_string_to_decimal_
 
 #ifndef _di_f_string_to_hexidecimal_
@@ -78,7 +78,7 @@ extern "C" {
    * convert a series of positive  numbers into a string, stopping at one of the following: EOS, max_length, or a non-hexdigit.
    * will not process signed statuses (+/-).
    */
-  extern f_return_status f_string_to_hexidecimal(const f_string string, f_u_long *digit, const f_string_location location);
+  extern f_return_status f_string_to_hexidecimal(const f_string string, unsigned long *digit, const f_string_location location);
 #endif // _di_f_string_to_hexidecimal_
 
 #ifdef __cplusplus

diff --git a/level_0/f_file/c/file.c b/level_0/f_file/c/file.c
index b44522bf194fd7e5a866775318d24fec83a24160..85589d01e924734da43da978a9cb1d56f46e5c35 100644 (file)
--- a/level_0/f_file/c/file.c
+++ b/level_0/f_file/c/file.c
@@ -171,10 +171,10 @@ extern "C" {
     if (file->address == 0) return f_status_set_error(f_file_not_open);
 
     // first seek to 'where' we need to begin the read
-    f_u_long current_file_position = ftell(file->address);
-    if (current_file_position == (f_u_long) -1) return f_status_set_error(f_file_seek_error);
+    unsigned long current_file_position = ftell(file->address);
+    if (current_file_position == (unsigned long) -1) return f_status_set_error(f_file_seek_error);
 
-    f_s_int result = 0;
+    int result = 0;
 
     if (current_file_position > location.file_start) {
       result = f_file_seek_from_current(file->address, file->byte_size * (0 - (current_file_position - location.file_start)));
@@ -225,7 +225,7 @@ extern "C" {
 
     if (file->address == 0) return f_status_set_error(f_file_not_open);
 
-    f_s_int result = 0;
+    int result = 0;
 
     // now do the actual read
     result = fread(buffer->string + buffer->used, file->byte_size, buffer->size - buffer->used - 1, file->address);
@@ -281,7 +281,7 @@ extern "C" {
 #endif // _di_f_file_stat_
 
 #ifndef _di_f_file_stat_by_id_
-  f_return_status f_file_stat_by_id(const f_s_int file_id, struct stat *file_stat) {
+  f_return_status f_file_stat_by_id(const int file_id, struct stat *file_stat) {
     #ifndef _di_level_0_parameter_checking_
       if (file_id <= 0) return f_status_set_error(f_invalid_parameter);
     #endif // _di_level_0_parameter_checking_
@@ -290,7 +290,7 @@ extern "C" {
       return f_none;
     }
 
-    f_s_int result = 0;
+    int result = 0;
 
     result = fstat(file_id, file_stat);
     if (result < 0) {

diff --git a/level_0/f_file/c/file.h b/level_0/f_file/c/file.h
index 7f130db7474d640f8b0d4313c258d36eae16fefb..5446331fd94f55b3d3b0702f9f630d49836610f5 100644 (file)
--- a/level_0/f_file/c/file.h
+++ b/level_0/f_file/c/file.h
@@ -31,7 +31,7 @@ extern "C" {
 #endif
 
 #ifndef _di_f_file_types_
-  typedef f_s_int  f_file_id;
+  typedef int  f_file_id;
   typedef f_string f_file_mode;
   typedef mode_t f_file_mask;
 
@@ -295,7 +295,7 @@ extern "C" {
   /**
    * read file statistics by file id.
    */
-  extern f_return_status f_file_stat_by_id(const f_s_int file_id, struct stat *file_stat);
+  extern f_return_status f_file_stat_by_id(const int file_id, struct stat *file_stat);
 #endif // _di_f_file_stat_by_id_
 
 #ifdef __cplusplus

diff --git a/level_0/f_fss/c/fss.h b/level_0/f_fss/c/fss.h
index 17bee35291c8d7f85a012ac6091448b8bb43a31f..9d9883f24e09762ad1a26d24aa9f4537a3474fa5 100644 (file)
--- a/level_0/f_fss/c/fss.h
+++ b/level_0/f_fss/c/fss.h
@@ -43,7 +43,7 @@ extern "C" {
   #define f_fss_type_header_part5   '-'
   #define f_fss_type_header_close   '\n'
 
-  #define f_fss_id            f_u_long
+  #define f_fss_id            unsigned long
   #define f_fss_checksum      f_string_dynamic
   #define f_fss_header_length f_string_length
 

diff --git a/level_0/f_socket/c/socket.h b/level_0/f_socket/c/socket.h
index 58b1278eb3298ca1053dc86db1a607e36de74380..8ff8483bf082b225e8b968b25fc756743645cc89 100644 (file)
--- a/level_0/f_socket/c/socket.h
+++ b/level_0/f_socket/c/socket.h
@@ -25,8 +25,8 @@ extern "C"{
 #endif
 
 #ifndef _di_f_socket_types_
-  #define f_socket_id       f_s_int
-  #define f_socket_close_id f_u_short
+  #define f_socket_id       int
+  #define f_socket_close_id unsigned short
 
   enum {
     f_socket_close_fast,       // As in close();

diff --git a/level_0/f_string/c/string.h b/level_0/f_string/c/string.h
index 6748ef2352c6c295796309ee60efd8fef5adc3f3..ec0816c5ac81291afd4ad955e6b73874537f1f58 100644 (file)
--- a/level_0/f_string/c/string.h
+++ b/level_0/f_string/c/string.h
@@ -94,7 +94,7 @@ extern "C" {
 #endif // _di_f_string_
 
 #ifndef _di_f_string_length_
-  typedef f_s_long f_string_length;
+  typedef long f_string_length;
 
   #define f_string_length_printf string_format_long_integer
 

diff --git a/level_0/f_type/c/type.h b/level_0/f_type/c/type.h
index ef1792bcf0f3ec6cb565206e2439cf75671d027f..0b439425d59ea0f154b52b4a51c8e259c3d4f894 100644 (file)
--- a/level_0/f_type/c/type.h
+++ b/level_0/f_type/c/type.h
@@ -34,65 +34,11 @@
 extern "C" {
 #endif
 
-#ifndef _di_f_types_normal
-  #define f_s_int         signed int
-  #define f_s_long        signed long
-  #define f_s_short       signed short
-  #define f_s_long_long   signed long long
-  #define f_s_short_short signed short
-  #define f_s_double      double
-  #define f_s_long_double long double
-  #define f_u_int         unsigned int
-  #define f_u_short       unsigned short
-  #define f_u_short_short unsigned short
-  #define f_u_long        unsigned long
-  #define f_u_long_long   unsigned long long
-  #define f_u_double      double
-  #define f_u_long_double long double
-  #define f_bool          unsigned short
-#endif // _di_f_types_normal
+#ifndef _di_f_type_bool_
+  typedef unsigned short f_bool;
+#endif // _di_f_type_bool_
 
-/**
- * The minimal types represent to the system admin or whomever else handles compilation that the data type should NOT be smaller than the specified size, but can be any size larger.
- */
-#ifndef _di_f_types_min
-  #define f_min_s_int          f_s_int
-  #define f_min_s_short        f_s_short
-  #define f_min_s_long         f_s_long
-  #define f_min_s_short_short  f_s_short_short
-  #define f_min_s_long_long    f_s_long_long
-  #define f_min_s_double       f_s_double
-  #define f_min_s_long_double  f_s_long_double
-  #define f_min_u_int          f_u_int
-  #define f_min_u_short        f_u_short
-  #define f_min_u_long         f_u_long
-  #define f_min_u_short_short  f_u_short_short
-  #define f_min_u_long_long    f_u_long_long
-  #define f_min_u_double       f_u_double
-  #define f_min_u_long_double  f_u_long_double
-#endif // _di_f_types_min
-
-/**
- * The maximum types represent to the system admin or whomever else handles compilation that the data type should NOT be larger than the specified size, but can be any size smaller.
- */
-#ifndef _di_f_types_max
-  #define f_max_s_int          f_s_int
-  #define f_max_s_short        f_s_short
-  #define f_max_s_long         f_s_long
-  #define f_max_s_short_short  f_s_short_short
-  #define f_max_s_long_long    f_s_long_long
-  #define f_max_s_double       f_s_double
-  #define f_max_s_long_double  f_s_long_double
-  #define f_max_u_int          f_u_int
-  #define f_max_u_short        f_u_short
-  #define f_max_u_long         f_u_long
-  #define f_max_u_short_short  f_u_short_short
-  #define f_max_u_long_long    f_u_long_long
-  #define f_max_u_double       f_u_double
-  #define f_max_u_long_double  f_u_long_double
-#endif // _di_f_types_max
-
-#ifndef _di_f_status_
+#ifndef _di_f_type_status_
   typedef uint16_t f_status;
 
   // The c language gives warnings about return types of constants.
@@ -103,42 +49,44 @@ extern "C" {
   #else
     #define f_return_status f_status
   #endif // __cplusplus
-#endif // _di_f_status_
+#endif // _di_f_type_status_
 
 /**
  * Defines the maximum size to be supported.
- * Ideally these don't get optimized away and are detected at runtime as a result of the bitwise operator.
+ *
+ * The max size is to be the (max supported size - 1) such that that last number can be used for overflow operations.
  */
-#ifndef _di_f_types_sizes_
-  #define f_unsigned_char_size        ((unsigned char) -1)
-  #define f_unsigned_short_size       ((unsigned short) -1)
-  #define f_unsigned_int_size         ((unsigned int) -1)
-  #define f_unsigned_long_size        ((unsigned long) -1)
-  #define f_unsigned_long_long_size   ((unsigned long long) -1)
-  #define f_unsigned_double_size      ((unsigned double) -1)
-  #define f_unsigned_long_double_size ((unsigned double) -1)
-  #define f_signed_char_size          (((unsigned char) -1) / 2)
-  #define f_signed_short_size         (((unsigned short) -1) / 2)
-  #define f_signed_int_size           (((unsigned int) -1) / 2)
-  #define f_signed_long_size          (((unsigned long) -1) / 2)
-  #define f_signed_long_long_size     (((unsigned long long) -1) / 2)
-#endif // _di_f_types_sizes_
+#ifndef _di_f_type_sizes_
+  #define f_unsigned_char_size        (((unsigned char) -1) - 1)
+  #define f_unsigned_short_size       (((unsigned short) -1) - 1)
+  #define f_unsigned_int_size         (((unsigned int) -1) - 1)
+  #define f_unsigned_long_size        (((unsigned long) -1) - 1)
+  #define f_unsigned_long_long_size   (((unsigned long long) -1) - 1)
+  #define f_unsigned_double_size      (((unsigned double) -1) - 1)
+  #define f_unsigned_long_double_size (((unsigned double) -1) - 1)
+  #define f_signed_char_size          ((((unsigned char) -1) / 2) - 1)
+  #define f_signed_short_size         ((((unsigned short) -1) / 2) - 1)
+  #define f_signed_int_size           ((((unsigned int) -1) / 2) - 1)
+  #define f_signed_long_size          ((((unsigned long) -1) / 2) - 1)
+  #define f_signed_long_long_size     ((((unsigned long long) -1) / 2) - 1)
+#endif // _di_f_type_sizes_
+
 
-#ifndef _di_f_types_standard_output_
+#ifndef _di_f_type_standard_output_
   #define f_standard_debug   stdout
   #define f_standard_error   stderr
   #define f_standard_input   stdin
   #define f_standard_output  stdout
   #define f_standard_warning stdout
-#endif // _di_f_types_standard_output_
+#endif // _di_f_type_standard_output_
 
 /**
  * Defines a variable to be used by arrays.
  */
 #ifndef _di_f_array_length_
-  typedef f_s_long      f_array_length;
-  typedef f_s_int       f_array_length_short;
-  typedef f_s_long_long f_array_length_long;
+  typedef long      f_array_length;
+  typedef int       f_array_length_short;
+  typedef long long f_array_length_long;
 #endif // _di_f_array_length_
 
 #ifndef _di_f_gcc_specific_

diff --git a/level_0/f_utf/c/utf.c b/level_0/f_utf/c/utf.c
index 5db64bb1071ce5e7c22c1886f666da9e338b7be4..ff26f875355ecc239c3465d8fea4915fc202f948 100644 (file)
--- a/level_0/f_utf/c/utf.c
+++ b/level_0/f_utf/c/utf.c
@@ -18,12 +18,12 @@ extern "C" {
 #endif // _di_f_utf_is_big_endian_
 
 #ifndef _di_f_utf_is_
-  f_return_status f_utf_is(const f_string character, const f_u_short max_width) {
+  f_return_status f_utf_is(const f_string character, const unsigned short max_width) {
     #ifndef _di_level_0_parameter_checking_
       if (max_width < 1) return f_status_set_error(f_invalid_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    f_u_short width = f_macro_utf_byte_width_is(*character);
+    unsigned short width = f_macro_utf_byte_width_is(*character);
 
     if (width == 0) {
       return f_false;
@@ -37,12 +37,12 @@ extern "C" {
 #endif // _di_f_utf_is_
 
 #ifndef _di_f_utf_is_bom_
-  f_return_status f_utf_is_bom(const f_string character, const f_u_short max_width) {
+  f_return_status f_utf_is_bom(const f_string character, const unsigned short max_width) {
     #ifndef _di_level_0_parameter_checking_
       if (max_width < 1) return f_status_set_error(f_invalid_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    f_u_short width = f_macro_utf_byte_width_is(*character);
+    unsigned short width = f_macro_utf_byte_width_is(*character);
 
     if (width == 0) {
       return f_false;
@@ -67,7 +67,7 @@ extern "C" {
 
 #ifndef _di_f_utf_is_character_
   f_return_status f_utf_is_character(const f_utf_character character) {
-    f_u_short width = f_macro_utf_character_width_is(character);
+    unsigned short width = f_macro_utf_character_width_is(character);
 
     if (width == 0) {
       return f_false;
@@ -81,7 +81,7 @@ extern "C" {
 #endif // _di_f_utf_is_
 
 #ifndef _di_f_utf_is_graph_
-  f_return_status f_utf_is_graph(const f_string character, const f_u_short max_width) {
+  f_return_status f_utf_is_graph(const f_string character, const unsigned short max_width) {
     #ifndef _di_level_0_parameter_checking_
       if (max_width < 1) return f_status_set_error(f_invalid_parameter);
     #endif // _di_level_0_parameter_checking_
@@ -113,12 +113,12 @@ extern "C" {
 #endif // _di_f_utf_is_graph_
 
 #ifndef _di_f_utf_is_space_
-  f_return_status f_utf_is_space(const f_string character, const f_u_short max_width) {
+  f_return_status f_utf_is_space(const f_string character, const unsigned short max_width) {
     #ifndef _di_level_0_parameter_checking_
       if (max_width < 1) return f_status_set_error(f_invalid_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    f_u_short width = f_macro_utf_byte_width_is(*character);
+    unsigned short width = f_macro_utf_byte_width_is(*character);
 
     if (width == 0) {
       if (isspace(*character)) {
@@ -252,12 +252,12 @@ extern "C" {
 #endif // _di_f_utf_is_space_
 
 #ifndef _di_f_utf_is_substitute_
-  f_return_status f_utf_is_substitute(const f_string character, const f_u_short max_width) {
+  f_return_status f_utf_is_substitute(const f_string character, const unsigned short max_width) {
     #ifndef _di_level_0_parameter_checking_
       if (max_width < 1) return f_status_set_error(f_invalid_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    f_u_short width = f_macro_utf_byte_width_is(*character);
+    unsigned short width = f_macro_utf_byte_width_is(*character);
 
     if (width == 0) {
       // there is no substitute character in ASCII.
@@ -304,12 +304,12 @@ extern "C" {
 #endif // _di_f_utf_is_substitute_
 
 #ifndef _di_f_utf_is_whitespace_
-  f_return_status f_utf_is_whitespace(const f_string character, const f_u_short max_width) {
+  f_return_status f_utf_is_whitespace(const f_string character, const unsigned short max_width) {
     #ifndef _di_level_0_parameter_checking_
       if (max_width < 1) return f_status_set_error(f_invalid_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    f_u_short width = f_macro_utf_byte_width_is(*character);
+    unsigned short width = f_macro_utf_byte_width_is(*character);
 
     if (width == 0) {
       if (isspace(*character)) {
@@ -454,7 +454,7 @@ extern "C" {
 
 #ifndef _di_f_utf_is_space_character_
   f_return_status f_utf_is_space_character(const f_utf_character character) {
-    f_u_short width = f_macro_utf_character_width_is(character);
+    unsigned short width = f_macro_utf_character_width_is(character);
 
     if (width == 0) {
       char ascii = character >> 24;
@@ -605,7 +605,7 @@ extern "C" {
 
 #ifndef _di_f_utf_is_substitute_character_
   f_return_status f_utf_is_substitute_character(const f_utf_character character) {
-    f_u_short width = f_macro_utf_character_width_is(character);
+    unsigned short width = f_macro_utf_character_width_is(character);
 
     if (width == 0) {
       // there is no substitute character in ASCII.
@@ -667,7 +667,7 @@ extern "C" {
 
 #ifndef _di_f_utf_is_whitespace_character_
   f_return_status f_utf_is_whitespace_character(const f_utf_character character) {
-    f_u_short width = f_macro_utf_character_width_is(character);
+    unsigned short width = f_macro_utf_character_width_is(character);
 
     if (width == 0) {
       char ascii = character >> 24;
@@ -797,13 +797,13 @@ extern "C" {
 #endif // _di_f_utf_is_whitespace_character_
 
 #ifndef _di_f_utf_char_to_character_
-  f_return_status f_utf_char_to_character(const f_string character, const f_u_short max_width, f_utf_character *utf_character) {
+  f_return_status f_utf_char_to_character(const f_string character, const unsigned short max_width, f_utf_character *utf_character) {
     #ifndef _di_level_0_parameter_checking_
       if (max_width < 1) return f_status_set_error(f_invalid_parameter);
       if (utf_character == 0) return f_status_set_error(f_invalid_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    f_u_short width = f_macro_utf_byte_width_is(*character);
+    unsigned short width = f_macro_utf_byte_width_is(*character);
 
     if (width == 0) {
       *utf_character = f_macro_utf_character_from_char_1(character[0]);
@@ -843,7 +843,7 @@ extern "C" {
 #endif // _di_f_utf_char_to_character_
 
 #ifndef _di_f_utf_character_to_char_
-  f_return_status f_utf_character_to_char(const f_utf_character utf_character, f_string *character, f_u_short *max_width) {
+  f_return_status f_utf_character_to_char(const f_utf_character utf_character, f_string *character, unsigned short *max_width) {
     #ifndef _di_level_0_parameter_checking_
       if (utf_character == 0) return f_status_set_error(f_invalid_parameter);
       if (max_width == 0 && *character != 0) return f_status_set_error(f_invalid_parameter);
@@ -853,7 +853,7 @@ extern "C" {
 
     f_status status = f_none;
 
-    f_u_short width = f_macro_utf_character_width_is(utf_character);
+    unsigned short width = f_macro_utf_character_width_is(utf_character);
 
     if (max_width == 0) {
       f_macro_string_new(status, *character, width);

diff --git a/level_0/f_utf/c/utf.h b/level_0/f_utf/c/utf.h
index 897d5505b00198f57bbe3ec10be6aaedc256ad87..d1e6939874bc41a4f4b17c6cf0b3de2bdc86a6b0 100644 (file)
--- a/level_0/f_utf/c/utf.h
+++ b/level_0/f_utf/c/utf.h
@@ -186,7 +186,7 @@ extern "C" {
  * Provide a type specifically for UTF-8 strings.
  */
 #ifndef _di_f_utf_string_length_
-  typedef f_s_long f_utf_string_length;
+  typedef long f_utf_string_length;
 
   #define f_macro_utf_string_length_new(status, string, length)    status = f_memory_new((void **) & string, sizeof(f_utf_string_length), length)
 
@@ -538,7 +538,7 @@ extern "C" {
  *   f_invalid_parameter (with error bit) if a parameter is invalid.
  */
 #ifndef _di_f_utf_is_
-  extern f_return_status f_utf_is(const f_string character, const f_u_short max_width);
+  extern f_return_status f_utf_is(const f_string character, const unsigned short max_width);
 #endif // _di_f_utf_is_
 
 /**
@@ -559,7 +559,7 @@ extern "C" {
  *   f_invalid_parameter (with error bit) if a parameter is invalid.
  */
 #ifndef _di_f_utf_is_bom_
-  extern f_return_status f_utf_is_bom(const f_string character, const f_u_short max_width);
+  extern f_return_status f_utf_is_bom(const f_string character, const unsigned short max_width);
 #endif // _di_f_utf_is_bom_
 
 /**
@@ -598,7 +598,7 @@ extern "C" {
  *   f_invalid_parameter (with error bit) if a parameter is invalid.
  */
 #ifndef _di_f_utf_is_graph_
-  extern f_return_status f_utf_is_graph(const f_string character, const f_u_short max_width);
+  extern f_return_status f_utf_is_graph(const f_string character, const unsigned short max_width);
 #endif // _di_f_utf_is_graph_
 
 /**
@@ -621,7 +621,7 @@ extern "C" {
  *   f_invalid_parameter (with error bit) if a parameter is invalid.
  */
 #ifndef _di_f_utf_is_space_
-  extern f_return_status f_utf_is_space(const f_string character, const f_u_short max_width);
+  extern f_return_status f_utf_is_space(const f_string character, const unsigned short max_width);
 #endif // _di_f_utf_is_space_
 
 /**
@@ -644,7 +644,7 @@ extern "C" {
  *   f_invalid_parameter (with error bit) if a parameter is invalid.
  */
 #ifndef _di_f_utf_is_substitute_
-  extern f_return_status f_utf_is_substitute(const f_string character, const f_u_short max_width);
+  extern f_return_status f_utf_is_substitute(const f_string character, const unsigned short max_width);
 #endif // _di_f_utf_is_substitute_
 
 /**
@@ -667,7 +667,7 @@ extern "C" {
  *   f_invalid_parameter (with error bit) if a parameter is invalid.
  */
 #ifndef _di_f_utf_is_whitespace_
-  extern f_return_status f_utf_is_whitespace(const f_string character, const f_u_short max_width);
+  extern f_return_status f_utf_is_whitespace(const f_string character, const unsigned short max_width);
 #endif // _di_f_utf_is_whitespace_
 
 /**
@@ -781,7 +781,7 @@ extern "C" {
  *   f_invalid_parameter (with error bit) if a parameter is invalid.
  */
 #ifndef _di_f_utf_char_to_character_
-  extern f_return_status f_utf_char_to_character(const f_string character, const f_u_short max_width, f_utf_character *utf_character);
+  extern f_return_status f_utf_char_to_character(const f_string character, const unsigned short max_width, f_utf_character *utf_character);
 #endif // _di_f_utf_char_to_character_
 
 /**
@@ -809,7 +809,7 @@ extern "C" {
  *   f_failure (with error bit) if width is not long enough to convert.
  */
 #ifndef _di_f_utf_character_to_char_
-  extern f_return_status f_utf_character_to_char(const f_utf_character utf_character, f_string *character, f_u_short *max_width);
+  extern f_return_status f_utf_character_to_char(const f_utf_character utf_character, f_string *character, unsigned short *max_width);
 #endif // _di_f_utf_character_to_char_
 
 #ifdef __cplusplus

diff --git a/level_1/fl_console/c/console.c b/level_1/fl_console/c/console.c
index d0d12ff01b8d8c7887c54690f7b11580da39a4d0..38f2018868ca69e6468b84389c9b28ba6e409490 100644 (file)
--- a/level_1/fl_console/c/console.c
+++ b/level_1/fl_console/c/console.c
@@ -20,9 +20,9 @@ extern "C" {
     f_string_length string_length = 0;
     f_array_length parameter_counter = 0;
 
-    f_u_short console_short = f_console_none;
-    f_u_short console_long = f_console_none;
-    f_u_short console_type = f_console_type_normal;
+    unsigned short console_short = f_console_none;
+    unsigned short console_long = f_console_none;
+    unsigned short console_type = f_console_type_normal;
 
     f_string_lengths needs_additional = f_string_lengths_initialize;
 

diff --git a/level_1/fl_directory/c/directory.c b/level_1/fl_directory/c/directory.c
index 26c21438f28a61eebdde619f87990ce47e7edb05..0ffb29d723696f5969d048ef27106229bf12e7e5 100644 (file)
--- a/level_1/fl_directory/c/directory.c
+++ b/level_1/fl_directory/c/directory.c
@@ -12,8 +12,8 @@ extern "C" {
     #endif // _di_level_1_parameter_checking_
 
     struct dirent **listing = 0;
-    f_s_int length = 0;
-    f_s_int counter = 0;
+    int length = 0;
+    int counter = 0;
     f_string_length size = 0;
     f_status status = f_none;
 

diff --git a/level_1/fl_fss/c/fss.c b/level_1/fl_fss/c/fss.c
index 035192a3d77bda2a2b9782cbfd988b414f8123e5..eb6f46b58453db400e349926f73929be72d37a61 100644 (file)
--- a/level_1/fl_fss/c/fss.c
+++ b/level_1/fl_fss/c/fss.c
@@ -17,7 +17,7 @@ extern "C" {
     if (input->start < 1) return f_none_on_eos;
 
     f_string_length i = 0;
-    f_u_short width = 0;
+    unsigned short width = 0;
 
     do {
       width = f_macro_utf_byte_width(buffer.string[input->start - 1]);
@@ -203,7 +203,7 @@ extern "C" {
 
     // make sure we are in the proper location in the file
     {
-      f_s_int seek_result = f_file_seek_from_beginning(file->address, 0);
+      int seek_result = f_file_seek_from_beginning(file->address, 0);
 
       if (seek_result != 0) return f_status_set_error(f_file_seek_error);
     }
@@ -242,7 +242,7 @@ extern "C" {
     #endif // _di_level_1_parameter_checking_
 
     f_string_length i = 0;
-    f_u_short width = 0;
+    unsigned short width = 0;
 
     do {
       width = f_macro_utf_byte_width(buffer.string[input->start]);
@@ -321,7 +321,7 @@ extern "C" {
     #endif // _di_level_1_parameter_checking_
 
     f_status status = f_none;
-    f_u_short width = 0;
+    unsigned short width = 0;
 
     f_string_length max_width = (input->stop - input->start) + 1;
 
@@ -381,7 +381,7 @@ extern "C" {
     #endif // _di_level_1_parameter_checking_
 
     f_status status = f_none;
-    f_u_short width = 0;
+    unsigned short width = 0;
 
     f_string_length max_width = (input->stop - input->start) + 1;
 
@@ -439,8 +439,8 @@ extern "C" {
 
     f_string_length position = 0;
     f_string_length distance = 0;
-    f_u_short utf_width = 0;
-    f_u_short i = 0;
+    unsigned short utf_width = 0;
+    unsigned short i = 0;
 
     position = input.start;
 

diff --git a/level_1/fl_serialized/c/serialized.c b/level_1/fl_serialized/c/serialized.c
index 5e604d5abb38eea38778cf8881f41b8892f83e11..f02e5ad0d9e129127ad9a0cb76b8eced30932d42 100644 (file)
--- a/level_1/fl_serialized/c/serialized.c
+++ b/level_1/fl_serialized/c/serialized.c
@@ -43,7 +43,7 @@ extern "C" {
     f_array_length i = 0;
     f_array_length start = 0;
 
-    f_u_short width = 0;
+    unsigned short width = 0;
 
     while (i < serialized.used) {
       width = f_macro_utf_byte_width(serialized.string[i]);
@@ -96,7 +96,7 @@ extern "C" {
     f_array_length start = 0;
     f_array_length current = 0;
 
-    f_u_short width = 0;
+    unsigned short width = 0;
 
     while (i < serialized.used) {
       width = f_macro_utf_byte_width(serialized.string[i]);

diff --git a/level_1/fl_socket/c/socket.c b/level_1/fl_socket/c/socket.c
index d3336325ea60b664b8fdaf1ff57a1819e66c0afe..e366479433b6e8507801c7ed44304eab39709c3f 100644 (file)
--- a/level_1/fl_socket/c/socket.c
+++ b/level_1/fl_socket/c/socket.c
@@ -53,7 +53,7 @@ extern "C"{
 #endif // _di_fl_socket_file_bind_
 
 #ifndef _di_fl_socket_listen_
-  f_return_status fl_socket_listen(const f_socket_id socket_id, const f_u_int socket_backlog) {
+  f_return_status fl_socket_listen(const f_socket_id socket_id, const unsigned int socket_backlog) {
     if (listen(socket_id, socket_backlog) < 0) {
       if (errno == EADDRINUSE) {
         return f_busy;
@@ -78,7 +78,7 @@ extern "C"{
 #ifndef _di_fl_socket_close_client_
   // terminate a socket connection.
   f_return_status fl_socket_close_client(const f_socket_id socket_id_client, const f_socket_close_id close_action) {
-    f_u_int error_code = 0;
+    unsigned int error_code = 0;
 
     if (close_action == f_socket_close_fast) {
       if (close(socket_id_client) < 0) {

diff --git a/level_1/fl_socket/c/socket.h b/level_1/fl_socket/c/socket.h
index 1b28fc2124564f85b855f8e0c29464e5dd1b7ea7..13bdb60173fe28847a81251ab7080ce79ebf2118 100644 (file)
--- a/level_1/fl_socket/c/socket.h
+++ b/level_1/fl_socket/c/socket.h
@@ -41,7 +41,7 @@ extern "C"{
    * terminate a socket connection.
    * suggested socket_backlog default setting = 8.
    */
-  extern f_return_status fl_socket_listen(const f_socket_id socket_id, const f_u_int socket_backlog);
+  extern f_return_status fl_socket_listen(const f_socket_id socket_id, const unsigned int socket_backlog);
 #endif // _di_fl_socket_listen_
 
 #ifndef _di_fl_socket_close_client_

diff --git a/level_1/fl_string/c/string.c b/level_1/fl_string/c/string.c
index 8fed032ce76502a842d513b489002a1182220e5f..cc97b2baa4c2d0c36384e6d12d4f897b15855afc 100644 (file)
--- a/level_1/fl_string/c/string.c
+++ b/level_1/fl_string/c/string.c
@@ -51,7 +51,7 @@ extern "C" {
     #endif // _di_level_1_parameter_checking_
 
     f_status status = f_none;
-    f_u_short width = 0;
+    unsigned short width = 0;
 
     f_string_length max_width = (location->stop - location->start) + 1;
 
@@ -111,7 +111,7 @@ extern "C" {
     #endif // _di_level_1_parameter_checking_
 
     f_status status = f_none;
-    f_u_short width = 0;
+    unsigned short width = 0;
 
     f_string_length max_width = (location->stop - location->start) + 1;
 
@@ -193,11 +193,11 @@ extern "C" {
       if (location->start >= buffer.used) return f_status_set_error(f_invalid_parameter);
     #endif // _di_level_1_parameter_checking_
 
-    const f_u_short seek_width = f_macro_utf_character_width(seek_to_this);
+    const unsigned short seek_width = f_macro_utf_character_width(seek_to_this);
 
     f_status status = f_none;
 
-    f_u_short width = 0;
+    unsigned short width = 0;
 
     f_string_length max_width = 0;
 
@@ -281,11 +281,11 @@ extern "C" {
       if (location->start >= buffer.used) return f_status_set_error(f_invalid_parameter);
     #endif // _di_level_1_parameter_checking_
 
-    const f_u_short seek_width = f_macro_utf_character_width(seek_to_this);
+    const unsigned short seek_width = f_macro_utf_character_width(seek_to_this);
 
     f_status status = f_none;
 
-    f_u_short width = 0;
+    unsigned short width = 0;
 
     f_string_length max_width = 0;
 

diff --git a/level_2/fll_execute/c/execute.c b/level_2/fll_execute/c/execute.c
index 3ed26cee7f6eef16f5772d774b0f15bf949837ca..b86ef3c99896a531e7af0bcc6a5de164ff6890dc 100644 (file)
--- a/level_2/fll_execute/c/execute.c
+++ b/level_2/fll_execute/c/execute.c
@@ -5,7 +5,7 @@ extern "C" {
 #endif
 
 #ifndef _di_fll_execute_path_
-  f_return_status fll_execute_path(const f_string program_path, const f_string_dynamics arguments, f_s_int *results) {
+  f_return_status fll_execute_path(const f_string program_path, const f_string_dynamics arguments, int *results) {
     #ifndef _di_level_2_parameter_checking_
       if (results == 0) return f_status_set_error(f_invalid_parameter);
 
@@ -73,7 +73,7 @@ extern "C" {
     fixed_arguments[arguments.used + 2] = 0;
 
     // TODO: validate that the file at program_path actually exists before attempting to fork and execute
-    f_s_int process_id = 0;
+    int process_id = 0;
 
     process_id = vfork();
 
@@ -117,7 +117,7 @@ extern "C" {
 #endif // _di_fll_execute_path_
 
 #ifndef _di_fll_execute_program_
-  f_return_status fll_execute_program(const f_string program_name, const f_string_dynamics arguments, f_s_int *results) {
+  f_return_status fll_execute_program(const f_string program_name, const f_string_dynamics arguments, int *results) {
     #ifndef _di_level_2_parameter_checking_
       if (results == 0) return f_status_set_error(f_invalid_parameter);
 
@@ -153,7 +153,7 @@ extern "C" {
     fixed_arguments[arguments.used + 2] = 0;
 
     // TODO: validate that the file at program_path actually exists before attempting to fork and execute
-    f_s_int process_id = 0;
+    int process_id = 0;
 
     process_id = vfork();
 

diff --git a/level_2/fll_execute/c/execute.h b/level_2/fll_execute/c/execute.h
index efe9a0c54286390c361e0b0c885e01b34bb7c1b6..152023598903427aefd9dae1b210c2ccddcf7808 100644 (file)
--- a/level_2/fll_execute/c/execute.h
+++ b/level_2/fll_execute/c/execute.h
@@ -34,14 +34,14 @@ extern "C" {
   /**
    * This will execute a program given some path + program name (such as "/bin/bash").
    */
-  extern f_return_status fll_execute_path(const f_string program_path, const f_string_dynamics arguments, f_s_int *results);
+  extern f_return_status fll_execute_path(const f_string program_path, const f_string_dynamics arguments, int *results);
 #endif // _di_fll_execute_path_
 
 #ifndef _di_fll_execute_program_
   /**
    * This will find the program based on PATH environment so that static paths do not have to be used as with f_execute_path.
    */
-  extern f_return_status fll_execute_program(const f_string program_name, const f_string_dynamics arguments, f_s_int *results);
+  extern f_return_status fll_execute_program(const f_string program_name, const f_string_dynamics arguments, int *results);
 #endif // _di_fll_execute_program_
 
 #ifdef __cplusplus

diff --git a/level_3/firewall/c/firewall.c b/level_3/firewall/c/firewall.c
index 4c4dc652e4d985b12c34f7a377eb107c63ad65b5..5ce847376050a6ed3e25b70a70b9022d2f53247a 100644 (file)
--- a/level_3/firewall/c/firewall.c
+++ b/level_3/firewall/c/firewall.c
@@ -83,7 +83,7 @@ extern "C" {
     else {
       // now determine which command was placed first
       f_bool found_command = f_false;
-      f_u_int command = 0;
+      unsigned int command = 0;
 
       if (data->parameters[firewall_parameter_command_start].result == f_console_result_found) {
         command = firewall_parameter_command_start;
@@ -150,7 +150,7 @@ extern "C" {
           f_bool show_ports = f_true;
 
           f_string_dynamics parameters = f_string_dynamics_initialize;
-          f_s_int results = 0;
+          int results = 0;
 
           if (data->remaining.used > 0) {
             show_nat = f_false;

diff --git a/level_3/firewall/c/main.c b/level_3/firewall/c/main.c
index 39af538215cc63d213bbbe61def62cac28f0424a..7eac47535e7fee185456dd9f6197fdc1a0a00811 100644 (file)
--- a/level_3/firewall/c/main.c
+++ b/level_3/firewall/c/main.c
@@ -1,7 +1,7 @@
 #include <level_0/status.h>
 #include <level_3/firewall.h>
 
-int main(const f_s_int argc, const f_string *argv) {
+int main(const int argc, const f_string *argv) {
   const f_console_arguments arguments = { argc, argv };
   firewall_data data = firewall_data_initialize;
 

diff --git a/level_3/firewall/c/private-firewall.c b/level_3/firewall/c/private-firewall.c
index 4c8ebeab5be0cab4aa635e1ea58d1afa54ae7c0d..aa6673f2035ee862d6094c132c7874909dd2ae8d 100644 (file)
--- a/level_3/firewall/c/private-firewall.c
+++ b/level_3/firewall/c/private-firewall.c
@@ -9,7 +9,7 @@ f_return_status firewall_perform_commands(const firewall_local_data local, const
   f_string_dynamics arguments = f_string_dynamics_initialize;
   f_string_dynamic argument = f_string_dynamic_initialize;
 
-  f_s_int results = 0;
+  int results = 0;
   f_string_length length = 0;
   f_bool invalid = f_false;
   f_bool is_ip_list = f_false;
@@ -859,7 +859,7 @@ f_return_status firewall_create_custom_chains(firewall_reserved_chains *reserved
   uint8_t tool = firewall_program_iptables;
   f_bool new_chain = f_false;
   f_bool create_chain = f_false;
-  f_s_int results = 0;
+  int results = 0;
 
   f_array_length i = 0;
   f_array_length j = 0;
@@ -1139,7 +1139,7 @@ f_return_status firewall_delete_chains(const firewall_data data) {
   for (f_string_length i = 0; i < 2; i++) {
     f_string_dynamics arguments = f_string_dynamics_initialize;
     f_string_dynamic argument[1] = f_string_dynamic_initialize;
-    f_s_int results = 0;
+    int results = 0;
 
     argument[0].string = (f_string) "-F";
     argument[0].size = 2;
@@ -1197,7 +1197,7 @@ f_return_status firewall_delete_chains(const firewall_data data) {
   for (f_string_length i = 0; i < 2; i++) {
     f_string_dynamics arguments = f_string_dynamics_initialize;
     f_string_dynamic argument[1] = f_string_dynamic_initialize;
-    f_s_int results = 0;
+    int results = 0;
 
     argument[0].string = (f_string) firewall_chain_delete_command;
     argument[0].size = firewall_chain_delete_command_length;
@@ -1284,7 +1284,7 @@ f_return_status firewall_default_lock(const firewall_data data) {
     arguments.array[2].size = arguments.array[2].used;
 
     for (f_string_length j = 0; j < 2; j++) {
-      f_s_int results = 0;
+      int results = 0;
 
       // print command when debugging.
       #ifdef _en_firewall_debug_

diff --git a/level_3/fss_status_code/c/fss_status_code.c b/level_3/fss_status_code/c/fss_status_code.c
index 6b13256aaa6d256d6912398e784a20783e81ac19..8b7f1de40924f0dae1ac8ddd3dc11154b79286f2 100644 (file)
--- a/level_3/fss_status_code/c/fss_status_code.c
+++ b/level_3/fss_status_code/c/fss_status_code.c
@@ -58,7 +58,7 @@ extern "C" {
         f_array_length counter = 0;
 
         f_status code = f_none;
-        f_u_int true = 0;
+        unsigned int true = 0;
 
         for (; counter < data->remaining.used; counter++) {
           // only numbers are valid status codes.
@@ -97,7 +97,7 @@ extern "C" {
         f_array_length counter = 0;
 
         f_status code = f_none;
-        f_u_int true = 0;
+        unsigned int true = 0;
 
         for (; counter < data->remaining.used; counter++) {
           // only numbers are valid status codes.
@@ -136,7 +136,7 @@ extern "C" {
         f_array_length counter = 0;
 
         f_status code = f_none;
-        f_u_int true = 0;
+        unsigned int true = 0;
 
         for (; counter < data->remaining.used; counter++) {
           // only numbers are valid status codes.

diff --git a/level_3/init/c/init.c b/level_3/init/c/init.c
index b161905a15da30d5b38303324e55d0f9c721a6fd..bc3d07b974666a8cac452bcdecb9beefc701f3a4 100644 (file)
--- a/level_3/init/c/init.c
+++ b/level_3/init/c/init.c
@@ -49,8 +49,8 @@ extern "C" {
 
     memset(run_level, 0, sizeof(f_autochar) * init_kernel_runlevel_buffer);
 
-    f_u_short do_socket_file = f_true;
-    f_u_short do_socket_port = f_false;
+    unsigned short do_socket_file = f_true;
+    unsigned short do_socket_port = f_false;
 
     {
       f_console_parameters parameters = { data->parameters, init_total_parameters };
@@ -69,7 +69,7 @@ extern "C" {
 
 
     if (argument->parameters[init_parameter_runlevel].result == f_console_result_found) {
-      const f_u_int parameter_length = strlen(arguments.argv[argument->parameters[init_parameter_runlevel].additional.array[0]]);
+      const unsigned int parameter_length = strlen(arguments.argv[argument->parameters[init_parameter_runlevel].additional.array[0]]);
 
       // if the run_level value is greater than the static buffer size, ignore the entire string rather than process a cut off value.
       if (parameter_length > 0 && parameter_length < init_kernel_runlevel_buffer) {

diff --git a/level_3/init/c/private-init.c b/level_3/init/c/private-init.c
index 2a4946ab66dbdd2e3b9c6a062e597f17cd97cf8b..47d9178cce5e9b91d13499f220e109513d3edb96 100644 (file)
--- a/level_3/init/c/private-init.c
+++ b/level_3/init/c/private-init.c
@@ -308,8 +308,8 @@
       if (kernel_command_line_length > 0) {
         regex_t    expression;
         regmatch_t match;
-        f_u_int    reg_result = 0;
-        f_u_int    string_length = 0;
+        unsigned int    reg_result = 0;
+        unsigned int    string_length = 0;
 
         reg_result = do_regex_match(&expression, &match, kernel_command_line_string, init_kernel_runlevel);
 

diff --git a/level_3/init/c/private-init.h b/level_3/init/c/private-init.h
index 52eb28b3ec0278e6d9bc6614816a22bed85412d2..5ac14af1ddf45e91bd754f9fd1dc236716603d28 100644 (file)
--- a/level_3/init/c/private-init.h
+++ b/level_3/init/c/private-init.h
@@ -250,13 +250,13 @@ extern "C" {
 #ifndef _di_init_data_
   typedef struct {
     f_string socket_file;
-    f_u_int  socket_port;
-    f_u_int  socket_id_target;
-    f_u_int  socket_id_client;
+    unsigned int  socket_port;
+    unsigned int  socket_id_target;
+    unsigned int  socket_id_client;
 
-    f_u_short timeout_start;
-    f_u_short timeout_stop;
-    f_u_short timeout_kill;
+    unsigned short timeout_start;
+    unsigned short timeout_stop;
+    unsigned short timeout_kill;
 
     init_rules     main_rules;
     init_categorys main_categorys;

diff --git a/level_3/status_code/c/status_code.c b/level_3/status_code/c/status_code.c
index 872aaad4c9249d2a35d991fb82c4e745079167bb..241d3e1ca4cf6d7099e13e4dcc89e4937ef4ae47 100644 (file)
--- a/level_3/status_code/c/status_code.c
+++ b/level_3/status_code/c/status_code.c
@@ -58,7 +58,7 @@ extern "C" {
         f_array_length counter = 0;
 
         f_status code = f_none;
-        f_u_short true = 0;
+        unsigned short true = 0;
 
         for (; counter < data->remaining.used; counter++) {
           // only numbers are valid status codes.
@@ -97,7 +97,7 @@ extern "C" {
         f_array_length counter = 0;
 
         f_status code = f_none;
-        f_u_short true = 0;
+        unsigned short true = 0;
 
         for (; counter < data->remaining.used; counter++) {
           // only numbers are valid status codes.
@@ -136,7 +136,7 @@ extern "C" {
         f_array_length counter = 0;
 
         f_status code = f_none;
-        f_u_short true = 0;
+        unsigned short true = 0;
 
         for (; counter < data->remaining.used; counter++) {
           // only numbers are valid status codes.