Update: Move the program data into the main for fss_basic_write.

Move parameter initialization and deallocation for FLL program data into main.c.

diff --git a/level_3/fss_basic_write/c/common.c b/level_3/fss_basic_write/c/common.c
index a26044baa50f956ba65dc271d4f44607f4b6d2e8..f417c1f47882e0e80b18783460ecce7d6ff5594e 100644 (file)
--- a/level_3/fss_basic_write/c/common.c
+++ b/level_3/fss_basic_write/c/common.c
@@ -42,13 +42,6 @@ extern "C" {
   const f_string_static_t fss_basic_write_long_trim_s = macro_f_string_static_t_initialize(FSS_BASIC_WRITE_long_trim_s, 0, FSS_BASIC_WRITE_long_trim_s_length);
 #endif // _di_fss_basic_write_program_parameters_
 
-#ifndef _di_fss_basic_write_main_delete_
-  f_status_t fss_basic_write_main_delete(fll_program_data_t * const main) {
-
-    return fll_program_data_delete(main);
-  }
-#endif // _di_fss_basic_write_main_delete_
-
 #ifdef __cplusplus
 } // extern "C"
 #endif

diff --git a/level_3/fss_basic_write/c/common.h b/level_3/fss_basic_write/c/common.h
index 823433c13e6822465c97e8e449fcb42ccc5cb0e0..a9afd719180d2ed760a8a1b67937eb477bcb4fe9 100644 (file)
--- a/level_3/fss_basic_write/c/common.h
+++ b/level_3/fss_basic_write/c/common.h
@@ -201,24 +201,6 @@ extern "C" {
   #define fss_basic_write_total_parameters_d 18
 #endif // _di_fss_basic_write_parameters_
 
-/**
- * Deallocate main.
- *
- * Be sure to call this after executing fss_basic_write_main().
- *
- * @param main
- *   The main program data.
- *
- * @return
- *   F_none on success.
- *   Status codes (with error bit) are returned on any problem.
- *
- * @see fss_basic_write_main()
- */
-#ifndef _di_fss_basic_write_main_delete_
-  extern f_status_t fss_basic_write_main_delete(fll_program_data_t * const main);
-#endif // _di_fss_basic_write_main_delete_
-
 #ifdef __cplusplus
 } // extern "C"
 #endif

diff --git a/level_3/fss_basic_write/c/fss_basic_write.c b/level_3/fss_basic_write/c/fss_basic_write.c
index b9a980631f8376da8849f122e37cd1f33b3b97b2..b89a70aefc669c15f6e534234d87b36e6c332073 100644 (file)
--- a/level_3/fss_basic_write/c/fss_basic_write.c
+++ b/level_3/fss_basic_write/c/fss_basic_write.c
@@ -61,10 +61,6 @@ extern "C" {
 
     f_status_t status = F_none;
 
-    f_console_parameter_t parameters[] = fss_basic_write_console_parameter_t_initialize;
-    main->parameters.array = parameters;
-    main->parameters.used = fss_basic_write_total_parameters_d;
-
     {
       f_console_parameter_id_t ids[3] = { fss_basic_write_parameter_no_color_e, fss_basic_write_parameter_light_e, fss_basic_write_parameter_dark_e };
       const f_console_parameter_ids_t choices = macro_f_console_parameter_ids_t_initialize(ids, 3);
@@ -91,11 +87,7 @@ extern "C" {
         fll_program_parameter_process_empty(&main->context, sets);
       }
 
-      if (F_status_is_error(status)) {
-        fss_basic_write_main_delete(main);
-
-        return F_status_set_error(status);
-      }
+      if (F_status_is_error(status)) return status;
     }
 
     // Identify priority of verbosity related parameters.
@@ -105,12 +97,7 @@ extern "C" {
       const f_console_parameter_ids_t choices = macro_f_console_parameter_ids_t_initialize(ids, 4);
 
       status = f_console_parameter_prioritize_right(main->parameters, choices, &choice);
-
-      if (F_status_is_error(status)) {
-        fss_basic_write_main_delete(main);
-
-        return status;
-      }
+      if (F_status_is_error(status)) return status;
 
       if (choice == fss_basic_write_parameter_verbosity_quiet_e) {
         main->output.verbosity = f_console_verbosity_quiet_e;
@@ -141,16 +128,12 @@ extern "C" {
     if (main->parameters.array[fss_basic_write_parameter_help_e].result == f_console_result_found_e) {
       fss_basic_write_print_help(main->output.to, main->context);
 
-      fss_basic_write_main_delete(main);
-
       return status;
     }
 
     if (main->parameters.array[fss_basic_write_parameter_version_e].result == f_console_result_found_e) {
       fll_program_print_version(main->output.to, fss_basic_write_program_version_s);
 
-      fss_basic_write_main_delete(main);
-
       return status;
     }
 
@@ -504,7 +487,6 @@ extern "C" {
     }
 
     f_string_dynamic_resize(0, &buffer);
-    fss_basic_write_main_delete(main);
 
     return status;
   }

diff --git a/level_3/fss_basic_write/c/fss_basic_write.h b/level_3/fss_basic_write/c/fss_basic_write.h
index 570cbd893862638a6e749adf9810f8aa6eb8b967..1be468a44231fb9b581175f1a2ce9840d7012953 100644 (file)
--- a/level_3/fss_basic_write/c/fss_basic_write.h
+++ b/level_3/fss_basic_write/c/fss_basic_write.h
@@ -65,8 +65,6 @@ extern "C" {
 /**
  * Execute main program.
  *
- * Be sure to call fss_basic_write_main_delete() after executing this.
- *
  * If main.signal is non-zero, then this blocks and handles the following signals:
  *   - F_signal_abort
  *   - F_signal_broken_pipe
@@ -83,8 +81,6 @@ extern "C" {
  * @return
  *   F_none on success.
  *   Status codes (with error bit) are returned on any problem.
- *
- * @see fss_basic_write_main_delete()
  */
 #ifndef _di_fss_basic_write_main_
   extern f_status_t fss_basic_write_main(fll_program_data_t * const main, const f_console_arguments_t *arguments);

diff --git a/level_3/fss_basic_write/c/main.c b/level_3/fss_basic_write/c/main.c
index 649005dbfec1e4222a352c5b5a6577dbf6ce396c..9a91620ffcc360b7a8f43821ede576f0652a4710 100644 (file)
--- a/level_3/fss_basic_write/c/main.c
+++ b/level_3/fss_basic_write/c/main.c
@@ -5,6 +5,10 @@ int main(const int argc, const f_string_t *argv, const f_string_t *envp) {
   const f_console_arguments_t arguments = macro_f_console_arguments_t_initialize(argc, argv, envp);
   fll_program_data_t data = fll_program_data_t_initialize;
 
+  f_console_parameter_t parameters[] = fss_basic_write_console_parameter_t_initialize;
+  data.parameters.array = parameters;
+  data.parameters.used = fss_basic_write_total_parameters_d;
+
   if (f_pipe_input_exists()) {
     data.process_pipe = F_true;
   }
@@ -13,6 +17,8 @@ int main(const int argc, const f_string_t *argv, const f_string_t *envp) {
 
   const f_status_t status = fss_basic_write_main(&data, &arguments);
 
+  fll_program_data_delete(&data);
+
   fll_program_standard_setdown(&data.signal);
 
   if (F_status_is_error(status)) return 1;