Update: Use *_settings_load_call_t for callbacks.

Switch these callbacks to use the typedef design.

diff --git a/level_3/fss_read/c/main/common.c b/level_3/fss_read/c/main/common.c
index 14aed69f047216d0485ebe869b16ae323cf6cc04..169c2ea0b7ae6c7f2663cd3dcd16cd838a947f7f 100644 (file)
--- a/level_3/fss_read/c/main/common.c
+++ b/level_3/fss_read/c/main/common.c
@@ -41,7 +41,7 @@ extern "C" {
 #endif // _di_fss_read_ensure_quotes_length_
 
 #ifndef _di_fss_read_setting_load_
-  void fss_read_setting_load(const f_console_arguments_t arguments, fss_read_main_t * const main, void (*callback)(const f_console_arguments_t arguments, fss_read_main_t * const main)) {
+  void fss_read_setting_load(const f_console_arguments_t arguments, fss_read_main_t * const main, const fss_read_settings_load_call_t do_settings_load) {
 
     if (!main) return;
 
@@ -91,8 +91,8 @@ extern "C" {
       main->setting.flag |= fss_read_main_flag_copyright_d;
     }
 
-    if (callback) {
-      callback(arguments, main);
+    if (do_settings_load) {
+      do_settings_load(arguments, main);
       if (F_status_is_error(main->setting.state.status)) return;
 
       if (main->setting.state.status == F_done) {

diff --git a/level_3/fss_read/c/main/common.h b/level_3/fss_read/c/main/common.h
index b32fea96e298cc1dcd321fdc20c79324f77da1f3..4e30712bdbee222a8ba896a3fd0be54910d539f5 100644 (file)
--- a/level_3/fss_read/c/main/common.h
+++ b/level_3/fss_read/c/main/common.h
@@ -65,9 +65,10 @@ extern "C" {
  *
  *     Errors (with error bit) from: fss_read_setting_load_depth().
  *     Errors (with error bit) from: fss_read_signal_check()
- * @param callback
+ * @param do_settings_load
  *   (optional) Designate a function to call after performing the initial processing, but before printing help.
  *   If the function returns F_done, then this function immediately returns, resetting status to F_okay.
+ *
  *   Set to NULL to disable.
  *
  * @see f_console_parameter_process()
@@ -79,7 +80,7 @@ extern "C" {
  * @see fss_read_signal_check()
  */
 #ifndef _di_fss_read_setting_load_
-  extern void fss_read_setting_load(const f_console_arguments_t arguments, fss_read_main_t * const main, void (*callback)(const f_console_arguments_t arguments, fss_read_main_t * const main));
+  extern void fss_read_setting_load(const f_console_arguments_t arguments, fss_read_main_t * const main, const fss_read_settings_load_call_t do_settings_load);
 #endif // _di_fss_read_setting_load_
 
 /**

diff --git a/level_3/fss_read/c/main/common/type.h b/level_3/fss_read/c/main/common/type.h
index 24cdad534b9f3b55c08d80a5ca5cb54b40032a70..6a1a1446907878e5bdda6ac322fc2cae87b42c8f 100644 (file)
--- a/level_3/fss_read/c/main/common/type.h
+++ b/level_3/fss_read/c/main/common/type.h
@@ -334,6 +334,8 @@ extern "C" {
  *   - setting: The settings data.
  */
 #ifndef _di_fss_read_main_t_
+  typedef void (*fss_read_settings_load_call_t)(const f_console_arguments_t arguments, fss_read_main_t * const main);
+
   struct fss_read_main_t_ {
     fss_read_cache_t cache;
     fss_read_call_t call;

diff --git a/level_3/iki_read/c/main/common.c b/level_3/iki_read/c/main/common.c
index 033f074ffd0e84a7aa53cfa6b1e960f066e0dee6..eca54c23d48a6a505e6f4edceccd5dc5b5ce5f81 100644 (file)
--- a/level_3/iki_read/c/main/common.c
+++ b/level_3/iki_read/c/main/common.c
@@ -5,7 +5,7 @@ extern "C" {
 #endif
 
 #ifndef _di_iki_read_setting_load_
-  void iki_read_setting_load(const f_console_arguments_t arguments, iki_read_main_t * const main, void (*callback)(const f_console_arguments_t arguments, iki_read_main_t * const main)) {
+  void iki_read_setting_load(const f_console_arguments_t arguments, iki_read_main_t * const main, const iki_read_settings_load_call_t do_settings_load) {
 
     if (!main) return;
 
@@ -43,8 +43,8 @@ extern "C" {
       return;
     }
 
-    if (callback) {
-      callback(arguments, main);
+    if (do_settings_load) {
+      do_settings_load(arguments, main);
       if (F_status_is_error(main->setting.state.status)) return;
 
       if (main->setting.state.status == F_done) {

diff --git a/level_3/iki_read/c/main/common.h b/level_3/iki_read/c/main/common.h
index 029697b958a0e3838bc517c56f7bdd92e297812b..2545bf82ac5512f4495340330e0320aa2dd1993b 100644 (file)
--- a/level_3/iki_read/c/main/common.h
+++ b/level_3/iki_read/c/main/common.h
@@ -37,9 +37,10 @@ extern "C" {
  *     Errors (with error bit) from: f_string_dynamic_append().
  *     Errors (with error bit) from: fll_program_parameter_process_context().
  *     Errors (with error bit) from: fll_program_parameter_process_verbosity_standard().
- * @param callback
+ * @param do_settings_load
  *   (optional) Designate a function to call after performing the initial processing, but before printing help.
  *   If the function returns F_done, then this function immediately returns, resetting status to F_okay.
+ *
  *   Set to NULL to disable.
  *
  * @see f_console_parameter_process()
@@ -50,7 +51,7 @@ extern "C" {
  * @see fll_program_parameter_process_verbosity_standard()
  */
 #ifndef _di_iki_read_setting_load_
-  extern void iki_read_setting_load(const f_console_arguments_t arguments, iki_read_main_t * const main, void (*callback)(const f_console_arguments_t arguments, iki_read_main_t * const main));
+  extern void iki_read_setting_load(const f_console_arguments_t arguments, iki_read_main_t * const main, const iki_read_settings_load_call_t do_settings_load);
 #endif // _di_iki_read_setting_load_
 
 /**

diff --git a/level_3/iki_read/c/main/common/type.h b/level_3/iki_read/c/main/common/type.h
index d9e54aaaed9a83dd77576cf298dd4a04c1bd2c61..1576c76c8f6259710557abf1763a07c3e710d1c2 100644 (file)
--- a/level_3/iki_read/c/main/common/type.h
+++ b/level_3/iki_read/c/main/common/type.h
@@ -59,6 +59,7 @@ extern "C" {
  *   - delete_data: Delete the IKI/EKI data.
  */
 #ifndef _di_iki_read_callback_t_
+  typedef void (*iki_read_settings_load_call_t)(const f_console_arguments_t arguments, iki_read_main_t * const main);
   typedef void (*iki_read_main_call_t) (iki_read_main_t * const main);
   typedef void (*iki_read_print_data_call_t) (fl_print_t * const print, const f_number_unsigned_t index);
   typedef void (*iki_read_process_buffer_ranges_call_t) (iki_read_main_t * const main, f_range_t * const range_buffer);

diff --git a/level_3/iki_write/c/main/common.c b/level_3/iki_write/c/main/common.c
index 3fe102848985e1caa004d41eceb69e5511d31513..e3b1610444c576d9394449397d3d1cc5edf721c1 100644 (file)
--- a/level_3/iki_write/c/main/common.c
+++ b/level_3/iki_write/c/main/common.c
@@ -5,7 +5,7 @@ extern "C" {
 #endif
 
 #ifndef _di_iki_write_setting_load_
-  void iki_write_setting_load(const f_console_arguments_t arguments, iki_write_main_t * const main, void (*callback)(const f_console_arguments_t arguments, iki_write_main_t * const main)) {
+  void iki_write_setting_load(const f_console_arguments_t arguments, iki_write_main_t * const main, const iki_write_settings_load_call_t do_settings_load) {
 
     if (!main) return;
 
@@ -43,8 +43,8 @@ extern "C" {
       return;
     }
 
-    if (callback) {
-      callback(arguments, main);
+    if (do_settings_load) {
+      do_settings_load(arguments, main);
       if (F_status_is_error(main->setting.state.status)) return;
 
       if (main->setting.state.status == F_done) {

diff --git a/level_3/iki_write/c/main/common.h b/level_3/iki_write/c/main/common.h
index aff245ce22e1a9d5246f0b3445b9d73f4c1cdc90..18624962ead7c75a979fd625c7f01252aa055ae4 100644 (file)
--- a/level_3/iki_write/c/main/common.h
+++ b/level_3/iki_write/c/main/common.h
@@ -35,9 +35,10 @@ extern "C" {
  *     Errors (with error bit) from: f_file_stream_open().
  *     Errors (with error bit) from: fll_program_parameter_process_context().
  *     Errors (with error bit) from: fll_program_parameter_process_verbosity_standard().
- * @param callback
+ * @param do_settings_load
  *   (optional) Designate a function to call after performing the initial processing, but before printing help.
  *   If the function returns F_done, then this function immediately returns, resetting status to F_okay.
+ *
  *   Set to NULL to disable.
  *
  * @see f_console_parameter_process()
@@ -46,7 +47,7 @@ extern "C" {
  * @see fll_program_parameter_process_verbosity_standard()
  */
 #ifndef _di_iki_write_setting_load_
-  extern void iki_write_setting_load(const f_console_arguments_t arguments, iki_write_main_t * const main, void (*callback)(const f_console_arguments_t arguments, iki_write_main_t * const main));
+  extern void iki_write_setting_load(const f_console_arguments_t arguments, iki_write_main_t * const main, const iki_write_settings_load_call_t do_settings_load);
 #endif // _di_iki_write_setting_load_
 
 #ifdef __cplusplus

diff --git a/level_3/iki_write/c/main/common/type.h b/level_3/iki_write/c/main/common/type.h
index 3454f7cc2fe49580d7c999c8c0f35ac92a48f73c..3f2f123cb6d1fe658bdfbee499c52b33a04c3ad9 100644 (file)
--- a/level_3/iki_write/c/main/common/type.h
+++ b/level_3/iki_write/c/main/common/type.h
@@ -60,6 +60,7 @@ extern "C" {
  *   - process_objects_content: Process an Objects and Content set.
  */
 #ifndef _di_iki_write_call_t_
+  typedef void (*iki_write_settings_load_call_t)(const f_console_arguments_t arguments, iki_write_main_t * const main);
   typedef void (*iki_write_load_objects_content_pipe_call_t)(void * const main, const f_range_t range, uint8_t * const pipe_state);
   typedef void (*iki_write_process_objects_content_call_t)(void * const main, const f_string_statics_t objects, const f_string_static_t content);