Cleanup: Simplify the naming of the process_normal functions.

The `normal` is now removed from the `process_normal` functions.
The `process_normal` callback is also shortened to just `process`.

This is the follow up to the commit 171ba867137d29242be1083a129e97839ff88b8a.

diff --git a/level_3/fss_read/c/basic/main.c b/level_3/fss_read/c/basic/main.c
index 0aaa8db6ab4f36d4e9ad2b96ccbce44d337a4694..88eae9bc73312bfba04e242782304eb3c49929dd 100644 (file)
--- a/level_3/fss_read/c/basic/main.c
+++ b/level_3/fss_read/c/basic/main.c
@@ -26,14 +26,14 @@ int main(const int argc, const f_string_t *argv, const f_string_t *envp) {
 
   data.callback.process_help = &fss_read_basic_process_help;
   data.callback.process_last_line = &fss_read_process_last_line;
-  data.callback.process_normal = &fss_read_process_normal;
+  data.callback.process = &fss_read_process;
 
-  data.callback.process_at = &fss_read_process_normal_at;
-  data.callback.process_at_line = &fss_read_process_normal_at_line;
-  data.callback.process_columns = &fss_read_process_normal_columns;
+  data.callback.process_at = &fss_read_process_at;
+  data.callback.process_at_line = &fss_read_process_at_line;
+  data.callback.process_columns = &fss_read_process_columns;
   data.callback.process_load = &fss_read_basic_process_load;
-  data.callback.process_name = &fss_read_process_normal_name;
-  data.callback.process_total = &fss_read_process_normal_total;
+  data.callback.process_name = &fss_read_process_name;
+  data.callback.process_total = &fss_read_process_total;
 
   data.callback.print_at = &fss_read_print_at;
   data.callback.print_content = &fss_read_print_content;

diff --git a/level_3/fss_read/c/basic_list/main.c b/level_3/fss_read/c/basic_list/main.c
index 6b85e52217e654ea6dd04b8641f3ef70a0f86ee2..b22d94e837f1cce3323385248dcfecc20b58f69a 100644 (file)
--- a/level_3/fss_read/c/basic_list/main.c
+++ b/level_3/fss_read/c/basic_list/main.c
@@ -26,14 +26,14 @@ int main(const int argc, const f_string_t *argv, const f_string_t *envp) {
 
   data.callback.process_help = &fss_read_basic_list_process_help;
   data.callback.process_last_line = &fss_read_process_last_line;
-  data.callback.process_normal = &fss_read_process_normal;
+  data.callback.process = &fss_read_process;
 
-  data.callback.process_at = &fss_read_process_normal_at;
-  data.callback.process_at_line = &fss_read_process_normal_at_line;
-  data.callback.process_columns = &fss_read_process_normal_columns;
+  data.callback.process_at = &fss_read_process_at;
+  data.callback.process_at_line = &fss_read_process_at_line;
+  data.callback.process_columns = &fss_read_process_columns;
   data.callback.process_load = &fss_read_basic_list_process_load;
-  data.callback.process_name = &fss_read_process_normal_name;
-  data.callback.process_total = &fss_read_process_normal_total_multiple;
+  data.callback.process_name = &fss_read_process_name;
+  data.callback.process_total = &fss_read_process_total_multiple;
 
   data.callback.print_at = &fss_read_print_at;
   data.callback.print_content = &fss_read_print_content;

diff --git a/level_3/fss_read/c/embedded_list/main.c b/level_3/fss_read/c/embedded_list/main.c
index 7855085f3de32a4d6155df862a9c2df158460f87..2f9f46b346adc742421575826915022aebb9468c 100644 (file)
--- a/level_3/fss_read/c/embedded_list/main.c
+++ b/level_3/fss_read/c/embedded_list/main.c
@@ -27,14 +27,14 @@ int main(const int argc, const f_string_t *argv, const f_string_t *envp) {
 
   data.callback.process_help = &fss_read_embedded_list_process_help;
   data.callback.process_last_line = &fss_read_process_last_line;
-  data.callback.process_normal = &fss_read_embedded_list_process_normal;
+  data.callback.process = &fss_read_embedded_list_process;
 
-  data.callback.process_at = &fss_read_process_normal_at;
-  data.callback.process_at_line = &fss_read_process_normal_at_line;
-  data.callback.process_columns = &fss_read_process_normal_columns;
+  data.callback.process_at = &fss_read_process_at;
+  data.callback.process_at_line = &fss_read_process_at_line;
+  data.callback.process_columns = &fss_read_process_columns;
   data.callback.process_load = &fss_read_embedded_list_process_load;
-  data.callback.process_name = &fss_read_process_normal_name;
-  data.callback.process_total = &fss_read_process_normal_total_multiple;
+  data.callback.process_name = &fss_read_process_name;
+  data.callback.process_total = &fss_read_process_total_multiple;
 
   data.callback.print_at = &fss_read_print_at;
   data.callback.print_content = &fss_read_print_content;

diff --git a/level_3/fss_read/c/embedded_list/process.c b/level_3/fss_read/c/embedded_list/process.c
index aec34890f2bcefcc55c1c0f193d6925110626c9c..ee7ecd94a46f5808ce7606ed468bae3bdc2a1489 100644 (file)
--- a/level_3/fss_read/c/embedded_list/process.c
+++ b/level_3/fss_read/c/embedded_list/process.c
@@ -5,8 +5,8 @@
 extern "C" {
 #endif
 
-#ifndef _di_fss_read_embedded_list_process_normal_
-  void fss_read_embedded_list_process_normal(void * const void_main) {
+#ifndef _di_fss_read_embedded_list_process_
+  void fss_read_embedded_list_process(void * const void_main) {
 
     if (!void_main) return;
 
@@ -49,7 +49,7 @@ extern "C" {
     main->callback.process_load(main);
     if (F_status_is_error(main->setting.state.status)) return;
 
-    fss_read_embedded_list_process_normal_determine_depth(main);
+    fss_read_embedded_list_process_determine_depth(main);
     if (F_status_is_error(main->setting.state.status)) return;
 
     // @todo everything below here will need to be reviewed and updated.
@@ -117,10 +117,10 @@ extern "C" {
 
     main->setting.state.status = F_okay;
   }
-#endif // _di_fss_read_embedded_list_process_normal_
+#endif // _di_fss_read_embedded_list_process_
 
-#ifndef _di_fss_read_embedded_list_process_normal_determine_depth_
-  void fss_read_embedded_list_process_normal_determine_depth(fss_read_main_t * const main) {
+#ifndef _di_fss_read_embedded_list_process_determine_depth_
+  void fss_read_embedded_list_process_determine_depth(fss_read_main_t * const main) {
 
     if (!main || !main->setting.nest.used || !main->setting.nest.depth[0].used || !main->setting.depths.used) return;
 
@@ -182,7 +182,7 @@ extern "C" {
 
     fss_read_ensure_quotes_length(main);
   }
-#endif // _di_fss_read_embedded_list_process_normal_determine_depth_
+#endif // _di_fss_read_embedded_list_process_determine_depth_
 
 #ifdef __cplusplus
 } // extern "C"

diff --git a/level_3/fss_read/c/embedded_list/process.h b/level_3/fss_read/c/embedded_list/process.h
index adc77e47b0d4cf2ce8097dc4314a6da1fe77ae89..047dd44dbbd4a627004919326dec2e038eafda0c 100644 (file)
--- a/level_3/fss_read/c/embedded_list/process.h
+++ b/level_3/fss_read/c/embedded_list/process.h
@@ -9,8 +9,8 @@
  *
  * This is auto-included and should not need to be explicitly included.
  */
-#ifndef _fss_read_embedded_list_process_normal_h
-#define _fss_read_embedded_list_process_normal_h
+#ifndef _fss_read_embedded_list_process_h
+#define _fss_read_embedded_list_process_h
 
 #ifdef __cplusplus
 extern "C" {
@@ -32,9 +32,9 @@ extern "C" {
  *
  * @see fss_read_signal_check()
  */
-#ifndef _di_fss_read_embedded_list_process_normal_
-  extern void fss_read_embedded_list_process_normal(void * const main);
-#endif // _di_fss_read_embedded_list_process_normal_
+#ifndef _di_fss_read_embedded_list_process_
+  extern void fss_read_embedded_list_process(void * const main);
+#endif // _di_fss_read_embedded_list_process_
 
 /**
  * Determine the depth in which the processing will happen and construct the Objects and Contents mapping based on this.
@@ -54,12 +54,12 @@ extern "C" {
  *
  * @see fss_read_signal_check()
  */
-#ifndef _di_fss_read_embedded_list_process_normal_determine_depth_
-  extern void fss_read_embedded_list_process_normal_determine_depth(fss_read_main_t * const main);
-#endif // _di_fss_read_embedded_list_process_normal_determine_depth_
+#ifndef _di_fss_read_embedded_list_process_determine_depth_
+  extern void fss_read_embedded_list_process_determine_depth(fss_read_main_t * const main);
+#endif // _di_fss_read_embedded_list_process_determine_depth_
 
 #ifdef __cplusplus
 } // extern "C"
 #endif
 
-#endif // _fss_read_embedded_list_process_normal_h
+#endif // _fss_read_embedded_list_process_h

diff --git a/level_3/fss_read/c/extended/main.c b/level_3/fss_read/c/extended/main.c
index 325bdbce9e95784ed88f5b90a08f9a68be7b482b..a8954bcc1730c6c68d3e14cdf9d31cae128f64a2 100644 (file)
--- a/level_3/fss_read/c/extended/main.c
+++ b/level_3/fss_read/c/extended/main.c
@@ -26,14 +26,14 @@ int main(const int argc, const f_string_t *argv, const f_string_t *envp) {
 
   data.callback.process_help = &fss_read_extended_process_help;
   data.callback.process_last_line = &fss_read_process_last_line;
-  data.callback.process_normal = &fss_read_process_normal;
+  data.callback.process = &fss_read_process;
 
-  data.callback.process_at = &fss_read_process_normal_at;
-  data.callback.process_at_line = &fss_read_process_normal_at_line;
-  data.callback.process_columns = &fss_read_process_normal_columns;
+  data.callback.process_at = &fss_read_process_at;
+  data.callback.process_at_line = &fss_read_process_at_line;
+  data.callback.process_columns = &fss_read_process_columns;
   data.callback.process_load = &fss_read_extended_process_load;
-  data.callback.process_name = &fss_read_process_normal_name;
-  data.callback.process_total = &fss_read_process_normal_total;
+  data.callback.process_name = &fss_read_process_name;
+  data.callback.process_total = &fss_read_process_total;
 
   data.callback.print_at = &fss_read_print_at;
   data.callback.print_content = &fss_read_print_content;

diff --git a/level_3/fss_read/c/extended_list/main.c b/level_3/fss_read/c/extended_list/main.c
index aabf6abf8a6aaad6224a76cf5f74b8591117f476..b67c22cf43b1b53969e6d2c26175c0ea28e465e3 100644 (file)
--- a/level_3/fss_read/c/extended_list/main.c
+++ b/level_3/fss_read/c/extended_list/main.c
@@ -26,14 +26,14 @@ int main(const int argc, const f_string_t *argv, const f_string_t *envp) {
 
   data.callback.process_help = &fss_read_extended_list_process_help;
   data.callback.process_last_line = &fss_read_process_last_line;
-  data.callback.process_normal = &fss_read_process_normal;
+  data.callback.process = &fss_read_process;
 
-  data.callback.process_at = &fss_read_process_normal_at;
-  data.callback.process_at_line = &fss_read_process_normal_at_line;
-  data.callback.process_columns = &fss_read_process_normal_columns;
+  data.callback.process_at = &fss_read_process_at;
+  data.callback.process_at_line = &fss_read_process_at_line;
+  data.callback.process_columns = &fss_read_process_columns;
   data.callback.process_load = &fss_read_extended_list_process_load;
-  data.callback.process_name = &fss_read_process_normal_name;
-  data.callback.process_total = &fss_read_process_normal_total_multiple;
+  data.callback.process_name = &fss_read_process_name;
+  data.callback.process_total = &fss_read_process_total_multiple;
 
   data.callback.print_at = &fss_read_print_at;
   data.callback.print_content = &fss_read_print_content;

diff --git a/level_3/fss_read/c/main/common/type.h b/level_3/fss_read/c/main/common/type.h
index 005e7ca48c9bedd60f6f1d48803ca9a369b6d93d..fb6ce2ecd7ea7b5f93515f9996c6cdce8dfd480b 100644 (file)
--- a/level_3/fss_read/c/main/common/type.h
+++ b/level_3/fss_read/c/main/common/type.h
@@ -134,34 +134,34 @@ extern "C" {
 /**
  * The FSS read callbacks.
  *
+ * process:           The main process callback (data from parameters and files).
  * process_help:      Process help (generally printing help).
  * process_last_line: Process printing last line if necessary when loading in a file (or pipe).
- * process_normal:    Process normally (data from parameters and files).
- *
- * process_at:      Process at parameter, usually called by the process_normal() callback.
- * process_at_line: Process line parameter for some Object index position, usually called by the process_normal() callback.
- * process_columns: Process columns parameter, usually called by the process_normal() callback.
- * process_load:    Process loading of FSS data from buffer (not to be confused with loading settings), usually called by the process_normal() callback.
- * process_name:    Process name parameter, usually called by the process_normal() callback.
- * process_total:   Process total parameter, usually called by the process_normal() callback.
- *
- * print_at:                 Print at the given location, usually called by the process_normal() callback.
- * print_object:             Print the Object, usually called by the process_normal() callback.
- * print_content:            Print the Content, usually called by the process_normal() callback.
- * print_content_empty:      Print when there is no Content, usually called by the process_normal() callback.
- * print_content_ignore:     Print the Content ignore character, usually called by several callbacks within the process_normal() callback for a pipe.
- * print_content_next:       Print the Content next (content separator), usually called by several callbacks within the process_normal() callback.
- * print_object_end:         Print the Object end, usually called by several callbacks within the process_normal() callback.
+ *
+ * process_at:      Process at parameter, usually called by the process() callback.
+ * process_at_line: Process line parameter for some Object index position, usually called by the process() callback.
+ * process_columns: Process columns parameter, usually called by the process() callback.
+ * process_load:    Process loading of FSS data from buffer (not to be confused with loading settings), usually called by the process() callback.
+ * process_name:    Process name parameter, usually called by the process() callback.
+ * process_total:   Process total parameter, usually called by the process() callback.
+ *
+ * print_at:                 Print at the given location, usually called by the process() callback.
+ * print_object:             Print the Object, usually called by the process() callback.
+ * print_content:            Print the Content, usually called by the process() callback.
+ * print_content_empty:      Print when there is no Content, usually called by the process() callback.
+ * print_content_ignore:     Print the Content ignore character, usually called by several callbacks within the process() callback for a pipe.
+ * print_content_next:       Print the Content next (content separator), usually called by several callbacks within the process() callback.
+ * print_object_end:         Print the Object end, usually called by several callbacks within the process() callback.
  * print_object_end_content: Print both the Object end and the Content.
  * print_object_end_empty:   Print the Object end when there is no Content, some standards print this and other standards print nothing (This also handles the Object end pipe).
- * print_set_end:            Print the Content set end, usually called by several callbacks within the process_normal() callback.
+ * print_set_end:            Print the Content set end, usually called by several callbacks within the process() callback.
  * print_set_end_empty:      Print set end for cases where the Content is empty and only something like a closing new line is required.
  */
 #ifndef _di_fss_read_callback_t_
   typedef struct {
+    void (*process)(void * const main);
     void (*process_help)(void * const main);
     void (*process_last_line)(void * const main);
-    void (*process_normal)(void * const main);
 
     void (*process_at)(void * const main, const bool names[], const f_number_unsigneds_t delimits_object, const f_number_unsigneds_t delimits_content);
     void (*process_at_line)(void * const void_main, const f_number_unsigned_t at, const f_number_unsigneds_t delimits_object, const f_number_unsigneds_t delimits_content, f_number_unsigned_t * const line);

diff --git a/level_3/fss_read/c/main/fss_read.c b/level_3/fss_read/c/main/fss_read.c
index 328666c23c7ce12893cfa0d316bafd2c69f292d7..e97f1d613cda18bceb6ace5965c67e32a847a75a 100644 (file)
--- a/level_3/fss_read/c/main/fss_read.c
+++ b/level_3/fss_read/c/main/fss_read.c
@@ -76,8 +76,8 @@ extern "C" {
     }
 
     if (main->setting.flag & fss_read_main_flag_object_content_d) {
-      if (main->callback.process_normal) {
-        main->callback.process_normal(void_main);
+      if (main->callback.process) {
+        main->callback.process(void_main);
       }
     }
   }

diff --git a/level_3/fss_read/c/main/fss_read.h b/level_3/fss_read/c/main/fss_read.h
index bbd386395a0f68ab05911ca721e30b289c75fd91..b2fb43ba52aea07454943ac4154eeb1027f4ad6c 100644 (file)
--- a/level_3/fss_read/c/main/fss_read.h
+++ b/level_3/fss_read/c/main/fss_read.h
@@ -127,7 +127,7 @@ extern "C" {
  *     F_true on success when performing verification and verify passed.
  *     F_false on success when performing verification and verify failed.
  *
- *     Errors (with error bit) from: main.callback.process_normal().
+ *     Errors (with error bit) from: main.callback.process().
  */
 #ifndef _di_fss_read_main_
   extern void fss_read_main(void * const main);

diff --git a/level_3/fss_read/c/main/main.c b/level_3/fss_read/c/main/main.c
index efa7e114f489c0e0eba6be12ee82456fc1ab7b3b..9d8d532a54dd1593905ae26275987dd0cda31f9f 100644 (file)
--- a/level_3/fss_read/c/main/main.c
+++ b/level_3/fss_read/c/main/main.c
@@ -100,14 +100,14 @@ int main(const int argc, const f_string_t *argv, const f_string_t *envp) {
     // Use the default standard of: FSS-0000 (Basic)
     main->callback.process_help = &fss_read_main_process_help;
     main->callback.process_last_line = &fss_read_process_last_line;
-    main->callback.process_normal = &fss_read_process_normal;
+    main->callback.process = &fss_read_process;
 
-    main->callback.process_at = &fss_read_process_normal_at;
-    main->callback.process_at_line = &fss_read_process_normal_at_line;
-    main->callback.process_columns = &fss_read_process_normal_columns;
+    main->callback.process_at = &fss_read_process_at;
+    main->callback.process_at_line = &fss_read_process_at_line;
+    main->callback.process_columns = &fss_read_process_columns;
     main->callback.process_load = &fss_read_basic_process_load;
-    main->callback.process_name = &fss_read_process_normal_name;
-    main->callback.process_total = &fss_read_process_normal_total;
+    main->callback.process_name = &fss_read_process_name;
+    main->callback.process_total = &fss_read_process_total;
 
     main->callback.print_at = &fss_read_print_at;
     main->callback.print_content = &fss_read_print_content;
@@ -160,14 +160,14 @@ int main(const int argc, const f_string_t *argv, const f_string_t *envp) {
 
         main->program.parameters.array[fss_read_parameter_payload_e].flag |= f_console_flag_disable_e;
 
-        main->callback.process_at = &fss_read_process_normal_at;
-        main->callback.process_at_line = &fss_read_process_normal_at_line;
-        main->callback.process_columns = &fss_read_process_normal_columns;
+        main->callback.process_at = &fss_read_process_at;
+        main->callback.process_at_line = &fss_read_process_at_line;
+        main->callback.process_columns = &fss_read_process_columns;
         main->callback.process_help = &fss_read_basic_process_help;
         main->callback.process_load = &fss_read_basic_process_load;
-        main->callback.process_name = &fss_read_process_normal_name;
-        main->callback.process_normal = &fss_read_process_normal;
-        main->callback.process_total = &fss_read_process_normal_total;
+        main->callback.process_name = &fss_read_process_name;
+        main->callback.process = &fss_read_process;
+        main->callback.process_total = &fss_read_process_total;
 
         main->callback.print_content = &fss_read_print_content;
         main->callback.print_content_ignore = 0;
@@ -198,14 +198,14 @@ int main(const int argc, const f_string_t *argv, const f_string_t *envp) {
 
         main->program.parameters.array[fss_read_parameter_payload_e].flag |= f_console_flag_disable_e;
 
-        main->callback.process_at = &fss_read_process_normal_at;
-        main->callback.process_at_line = &fss_read_process_normal_at_line;
-        main->callback.process_columns = &fss_read_process_normal_columns;
+        main->callback.process_at = &fss_read_process_at;
+        main->callback.process_at_line = &fss_read_process_at_line;
+        main->callback.process_columns = &fss_read_process_columns;
         main->callback.process_help = &fss_read_extended_process_help;
         main->callback.process_load = &fss_read_extended_process_load;
-        main->callback.process_name = &fss_read_process_normal_name;
-        main->callback.process_normal = &fss_read_process_normal;
-        main->callback.process_total = &fss_read_process_normal_total;
+        main->callback.process_name = &fss_read_process_name;
+        main->callback.process = &fss_read_process;
+        main->callback.process_total = &fss_read_process_total;
 
         main->callback.print_content = &fss_read_print_content;
         main->callback.print_content_next = &fss_read_extended_print_content_next;
@@ -235,14 +235,14 @@ int main(const int argc, const f_string_t *argv, const f_string_t *envp) {
 
         main->program.parameters.array[fss_read_parameter_payload_e].flag |= f_console_flag_disable_e;
 
-        main->callback.process_at = &fss_read_process_normal_at;
-        main->callback.process_at_line = &fss_read_process_normal_at_line;
-        main->callback.process_columns = &fss_read_process_normal_columns;
+        main->callback.process_at = &fss_read_process_at;
+        main->callback.process_at_line = &fss_read_process_at_line;
+        main->callback.process_columns = &fss_read_process_columns;
         main->callback.process_help = &fss_read_basic_list_process_help;
         main->callback.process_load = &fss_read_basic_list_process_load;
-        main->callback.process_name = &fss_read_process_normal_name;
-        main->callback.process_normal = &fss_read_process_normal;
-        main->callback.process_total = &fss_read_process_normal_total_multiple;
+        main->callback.process_name = &fss_read_process_name;
+        main->callback.process = &fss_read_process;
+        main->callback.process_total = &fss_read_process_total_multiple;
 
         main->callback.print_content = &fss_read_print_content;
         main->callback.print_content_next = 0;
@@ -275,14 +275,14 @@ int main(const int argc, const f_string_t *argv, const f_string_t *envp) {
 
         main->program.parameters.array[fss_read_parameter_payload_e].flag |= f_console_flag_disable_e;
 
-        main->callback.process_at = &fss_read_process_normal_at;
-        main->callback.process_at_line = &fss_read_process_normal_at_line;
-        main->callback.process_columns = &fss_read_process_normal_columns;
+        main->callback.process_at = &fss_read_process_at;
+        main->callback.process_at_line = &fss_read_process_at_line;
+        main->callback.process_columns = &fss_read_process_columns;
         main->callback.process_help = &fss_read_extended_list_process_help;
         main->callback.process_load = &fss_read_extended_list_process_load;
-        main->callback.process_name = &fss_read_process_normal_name;
-        main->callback.process_normal = &fss_read_process_normal;
-        main->callback.process_total = &fss_read_process_normal_total_multiple;
+        main->callback.process_name = &fss_read_process_name;
+        main->callback.process = &fss_read_process;
+        main->callback.process_total = &fss_read_process_total_multiple;
 
         main->callback.print_content = &fss_read_print_content;
         main->callback.print_content_next = 0;
@@ -314,14 +314,14 @@ int main(const int argc, const f_string_t *argv, const f_string_t *envp) {
 
         main->program.parameters.array[fss_read_parameter_payload_e].flag |= f_console_flag_disable_e;
 
-        main->callback.process_at = &fss_read_process_normal_at;
-        main->callback.process_at_line = &fss_read_process_normal_at_line;
-        main->callback.process_columns = &fss_read_process_normal_columns;
+        main->callback.process_at = &fss_read_process_at;
+        main->callback.process_at_line = &fss_read_process_at_line;
+        main->callback.process_columns = &fss_read_process_columns;
         main->callback.process_help = &fss_read_embedded_list_process_help;
         main->callback.process_load = &fss_read_embedded_list_process_load;
-        main->callback.process_name = &fss_read_process_normal_name;
-        main->callback.process_normal = &fss_read_embedded_list_process_normal;
-        main->callback.process_total = &fss_read_process_normal_total_multiple;
+        main->callback.process_name = &fss_read_process_name;
+        main->callback.process = &fss_read_embedded_list_process;
+        main->callback.process_total = &fss_read_process_total_multiple;
 
         main->callback.print_content = &fss_read_print_content;
         main->callback.print_content_next = 0;
@@ -352,14 +352,14 @@ int main(const int argc, const f_string_t *argv, const f_string_t *envp) {
 
         main->program.parameters.array[fss_read_parameter_payload_e].flag &= ~f_console_flag_disable_e;
 
-        main->callback.process_at = &fss_read_process_normal_at;
-        main->callback.process_at_line = &fss_read_process_normal_at_line;
-        main->callback.process_columns = &fss_read_process_normal_columns;
+        main->callback.process_at = &fss_read_process_at;
+        main->callback.process_at_line = &fss_read_process_at_line;
+        main->callback.process_columns = &fss_read_process_columns;
         main->callback.process_help = &fss_read_payload_process_help;
         main->callback.process_load = &fss_read_payload_process_load;
-        main->callback.process_name = &fss_read_process_normal_name;
-        main->callback.process_normal = &fss_read_process_normal;
-        main->callback.process_total = &fss_read_process_normal_total_multiple;
+        main->callback.process_name = &fss_read_process_name;
+        main->callback.process = &fss_read_process;
+        main->callback.process_total = &fss_read_process_total_multiple;
 
         main->callback.print_content = &fss_read_payload_print_content;
         main->callback.print_content_next = 0;

diff --git a/level_3/fss_read/c/main/main.h b/level_3/fss_read/c/main/main.h
index 916e65812938cd387ae513dda8b33eb7605e6cf5..f6331eba8035883952c15b1b59c88d209d1582ef 100644 (file)
--- a/level_3/fss_read/c/main/main.h
+++ b/level_3/fss_read/c/main/main.h
@@ -62,7 +62,7 @@ extern int main(const int argc, const f_string_t *argv, const f_string_t *envp);
  * @param main
  *   The main program and settings data.
  *
- *   This alters main.callback.process_help, main.callback.process_normal, and main.callback.process_pipe.
+ *   This alters main.callback.process_help, main.callback.process, and main.callback.process_pipe.
  *
  *   This alters main.setting.state.status:
  *     F_okay on success.

diff --git a/level_3/fss_read/c/main/process.c b/level_3/fss_read/c/main/process.c
index 236dc51a2f1547a14c67ae134d6c817c16e03a06..85951614873e7258425f5d96cf710af4a187ac84 100644 (file)
--- a/level_3/fss_read/c/main/process.c
+++ b/level_3/fss_read/c/main/process.c
@@ -4,8 +4,8 @@
 extern "C" {
 #endif
 
-#ifndef _di_fss_read_process_normal_
-  void fss_read_process_normal(void * const void_main) {
+#ifndef _di_fss_read_process_
+  void fss_read_process(void * const void_main) {
 
     if (!void_main) return;
 
@@ -110,10 +110,10 @@ extern "C" {
 
     main->setting.state.status = F_okay;
   }
-#endif // _di_fss_read_process_normal_
+#endif // _di_fss_read_process_
 
-#ifndef _di_fss_read_process_normal_at_
-  void fss_read_process_normal_at(void * const void_main, const bool names[], const f_number_unsigneds_t delimits_object, f_number_unsigneds_t delimits_content) {
+#ifndef _di_fss_read_process_at_
+  void fss_read_process_at(void * const void_main, const bool names[], const f_number_unsigneds_t delimits_object, f_number_unsigneds_t delimits_content) {
 
     if (!void_main) return;
 
@@ -183,10 +183,10 @@ extern "C" {
 
     main->setting.state.status = F_okay;
   }
-#endif // _di_fss_read_process_normal_at_
+#endif // _di_fss_read_process_at_
 
-#ifndef _di_fss_read_process_normal_at_line_
-  void fss_read_process_normal_at_line(void * const void_main, const f_number_unsigned_t at, const f_number_unsigneds_t delimits_object, const f_number_unsigneds_t delimits_content, f_number_unsigned_t * const line) {
+#ifndef _di_fss_read_process_at_line_
+  void fss_read_process_at_line(void * const void_main, const f_number_unsigned_t at, const f_number_unsigneds_t delimits_object, const f_number_unsigneds_t delimits_content, f_number_unsigned_t * const line) {
 
     if (!void_main || !line) return;
 
@@ -403,10 +403,10 @@ extern "C" {
 
     main->setting.state.status = F_okay;
   }
-#endif // _di_fss_read_process_normal_at_line_
+#endif // _di_fss_read_process_at_line_
 
-#ifndef _di_fss_read_process_normal_columns_
-  void fss_read_process_normal_columns(void * const void_main, const bool names[]) {
+#ifndef _di_fss_read_process_columns_
+  void fss_read_process_columns(void * const void_main, const bool names[]) {
 
     if (!void_main) return;
 
@@ -480,10 +480,10 @@ extern "C" {
 
     main->setting.state.status = F_okay;
   }
-#endif // _di_fss_read_process_normal_columns_
+#endif // _di_fss_read_process_columns_
 
-#ifndef _di_fss_read_process_normal_name_
-  void fss_read_process_normal_name(void * const void_main, bool names[]) {
+#ifndef _di_fss_read_process_name_
+  void fss_read_process_name(void * const void_main, bool names[]) {
 
     if (!void_main) return;
 
@@ -521,10 +521,10 @@ extern "C" {
 
     main->setting.state.status = F_okay;
   }
-#endif // _di_fss_read_process_normal_name_
+#endif // _di_fss_read_process_name_
 
-#ifndef _di_fss_read_process_normal_total_
-  void fss_read_process_normal_total(void * const void_main, const bool names[]) {
+#ifndef _di_fss_read_process_total_
+  void fss_read_process_total(void * const void_main, const bool names[]) {
 
     if (!void_main) return;
 
@@ -599,10 +599,10 @@ extern "C" {
 
     main->setting.state.status = F_okay;
   }
-#endif // _di_fss_read_process_normal_total_
+#endif // _di_fss_read_process_total_
 
-#ifndef _di_fss_read_process_normal_total_multiple_
-  void fss_read_process_normal_total_multiple(void * const void_main, const bool names[]) {
+#ifndef _di_fss_read_process_total_multiple_
+  void fss_read_process_total_multiple(void * const void_main, const bool names[]) {
 
     if (!void_main) return;
 
@@ -710,7 +710,7 @@ extern "C" {
 
     main->setting.state.status = F_okay;
   }
-#endif // _di_fss_read_process_normal_total_multiple_
+#endif // _di_fss_read_process_total_multiple_
 
 #ifdef __cplusplus
 } // extern "C"

diff --git a/level_3/fss_read/c/main/process.h b/level_3/fss_read/c/main/process.h
index f39eca1e59b5b48905ffd5bac9bd023f557e6c59..d298ed074b404f73911ce68b708e0f24eb8cc8be 100644 (file)
--- a/level_3/fss_read/c/main/process.h
+++ b/level_3/fss_read/c/main/process.h
@@ -9,8 +9,8 @@
  *
  * This is auto-included and should not need to be explicitly included.
  */
-#ifndef _fss_read_process_normal_h
-#define _fss_read_process_normal_h
+#ifndef _fss_read_process_h
+#define _fss_read_process_h
 
 #ifdef __cplusplus
 extern "C" {
@@ -41,9 +41,9 @@ extern "C" {
  *
  * @see fss_read_signal_check()
  */
-#ifndef _di_fss_read_process_normal_
-  extern void fss_read_process_normal(void * const main);
-#endif // _di_fss_read_process_normal_
+#ifndef _di_fss_read_process_
+  extern void fss_read_process(void * const main);
+#endif // _di_fss_read_process_
 
 /**
  * Process buffer according to "at" parameter rules.
@@ -72,9 +72,9 @@ extern "C" {
  *
  * @see fss_read_signal_check()
  */
-#ifndef _di_fss_read_process_normal_at_
-  extern void fss_read_process_normal_at(void * const main, const bool names[], const f_number_unsigneds_t delimits_object, const f_number_unsigneds_t delimits_content);
-#endif // _di_fss_read_process_normal_at_
+#ifndef _di_fss_read_process_at_
+  extern void fss_read_process_at(void * const main, const bool names[], const f_number_unsigneds_t delimits_object, const f_number_unsigneds_t delimits_content);
+#endif // _di_fss_read_process_at_
 
 /**
  * Process for the given Object index position for processing and ultimately printing a specific line.
@@ -108,9 +108,9 @@ extern "C" {
  *
  *   Must not be NULL.
  */
-#ifndef _di_fss_read_process_normal_at_line_
-  extern void fss_read_process_normal_at_line(void * const main, const f_number_unsigned_t at, const f_number_unsigneds_t delimits_object, const f_number_unsigneds_t delimits_content, f_number_unsigned_t * const line);
-#endif // _di_fss_read_process_normal_at_line_
+#ifndef _di_fss_read_process_at_line_
+  extern void fss_read_process_at_line(void * const main, const f_number_unsigned_t at, const f_number_unsigneds_t delimits_object, const f_number_unsigneds_t delimits_content, f_number_unsigned_t * const line);
+#endif // _di_fss_read_process_at_line_
 
 /**
  * Process buffer according to "columns" parameter rules.
@@ -131,9 +131,9 @@ extern "C" {
  *
  * @see fss_read_signal_check()
  */
-#ifndef _di_fss_read_process_normal_columns_
-  extern void fss_read_process_normal_columns(void * const main, const bool names[]);
-#endif // _di_fss_read_process_normal_columns_
+#ifndef _di_fss_read_process_columns_
+  extern void fss_read_process_columns(void * const main, const bool names[]);
+#endif // _di_fss_read_process_columns_
 
 /**
  * Process buffer according to "name" parameter rules.
@@ -154,9 +154,9 @@ extern "C" {
  *
  * @see fss_read_signal_check()
  */
-#ifndef _di_fss_read_process_normal_name_
-  extern void fss_read_process_normal_name(void * const main, bool names[]);
-#endif // _di_fss_read_process_normal_name_
+#ifndef _di_fss_read_process_name_
+  extern void fss_read_process_name(void * const main, bool names[]);
+#endif // _di_fss_read_process_name_
 
 /**
  * Process buffer according to "total" parameter rules.
@@ -179,9 +179,9 @@ extern "C" {
  *
  * @see fss_read_signal_check()
  */
-#ifndef _di_fss_read_process_normal_total_
-  extern void fss_read_process_normal_total(void * const main, const bool names[]);
-#endif // _di_fss_read_process_normal_total_
+#ifndef _di_fss_read_process_total_
+  extern void fss_read_process_total(void * const main, const bool names[]);
+#endif // _di_fss_read_process_total_
 
 /**
  * Process buffer according to "total" parameter rules.
@@ -204,12 +204,12 @@ extern "C" {
  *
  * @see fss_read_signal_check()
  */
-#ifndef _di_fss_read_process_normal_total_multiple_
-  extern void fss_read_process_normal_total_multiple(void * const main, const bool names[]);
-#endif // _di_fss_read_process_normal_total_multiple_
+#ifndef _di_fss_read_process_total_multiple_
+  extern void fss_read_process_total_multiple(void * const main, const bool names[]);
+#endif // _di_fss_read_process_total_multiple_
 
 #ifdef __cplusplus
 } // extern "C"
 #endif
 
-#endif // _fss_read_process_normal_h
+#endif // _fss_read_process_h

diff --git a/level_3/fss_read/c/payload/main.c b/level_3/fss_read/c/payload/main.c
index 16efe0ce2e56f8e38a9912c784f019e01eb7e705..7643d739336b98645c5bc799a433357e974ab5fb 100644 (file)
--- a/level_3/fss_read/c/payload/main.c
+++ b/level_3/fss_read/c/payload/main.c
@@ -26,14 +26,14 @@ int main(const int argc, const f_string_t *argv, const f_string_t *envp) {
 
   data.callback.process_help = &fss_read_payload_process_help;
   data.callback.process_last_line = &fss_read_process_last_line;
-  data.callback.process_normal = &fss_read_process_normal;
+  data.callback.process = &fss_read_process;
 
-  data.callback.process_at = &fss_read_process_normal_at;
-  data.callback.process_at_line = &fss_read_process_normal_at_line;
-  data.callback.process_columns = &fss_read_process_normal_columns;
+  data.callback.process_at = &fss_read_process_at;
+  data.callback.process_at_line = &fss_read_process_at_line;
+  data.callback.process_columns = &fss_read_process_columns;
   data.callback.process_load = &fss_read_payload_process_load;
-  data.callback.process_name = &fss_read_process_normal_name;
-  data.callback.process_total = &fss_read_process_normal_total_multiple;
+  data.callback.process_name = &fss_read_process_name;
+  data.callback.process_total = &fss_read_process_total_multiple;
 
   data.callback.print_at = &fss_read_print_at;
   data.callback.print_content = &fss_read_payload_print_content;