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

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

diff --git a/level_3/fss_status_code/c/common.c b/level_3/fss_status_code/c/common.c
index 3b5d98066f2acd2926007599bd855d8583f62d58..143dc8f2f2a4ce3d207e0b7be8d125f9aa26eb2e 100644 (file)
--- a/level_3/fss_status_code/c/common.c
+++ b/level_3/fss_status_code/c/common.c
@@ -29,13 +29,6 @@ extern "C" {
   const f_string_static_t fss_status_code_long_number_s = macro_f_string_static_t_initialize(FSS_STATUS_CODE_long_number_s, 0, FSS_STATUS_CODE_long_number_s_length);
 #endif // _di_fss_status_code_parameters_
 
-#ifndef _di_fss_status_code_main_delete_
-  f_status_t fss_status_code_main_delete(fll_program_data_t * const main) {
-
-    return fll_program_data_delete(main);
-  }
-#endif // _di_fss_status_code_main_delete_
-
 #ifdef __cplusplus
 } // extern "C"
 #endif

diff --git a/level_3/fss_status_code/c/common.h b/level_3/fss_status_code/c/common.h
index 1de0d39a8e83095ef20019b509708350b6fe4251..6e57651f806f9111af598db4be57876ae9eb95c9 100644 (file)
--- a/level_3/fss_status_code/c/common.h
+++ b/level_3/fss_status_code/c/common.h
@@ -147,25 +147,6 @@ extern "C" {
   #define fss_status_code_total_parameters_d 13
 #endif // _di_fss_status_code_defines_
 
-/**
- * Deallocate main.
- *
- * Be sure to call this after executing fss_status_code_main().
- *
- * @param main
- *   The main program data.
- *
- * @return
- *   F_none on success.
- *
- *   Status codes (with error bit) are returned on any problem.
- *
- * @see fss_status_code_main()
- */
-#ifndef _di_fss_status_code_main_delete_
-  extern f_status_t fss_status_code_main_delete(fll_program_data_t * const main);
-#endif // _di_fss_status_code_main_delete_
-
 #ifdef __cplusplus
 } // extern "C"
 #endif

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 adee5288fe786c28d5149c4c91b3c261c610b233..3b92fab051edfe3f10073f6802b9cebf9d4b4f92 100644 (file)
--- a/level_3/fss_status_code/c/fss_status_code.c
+++ b/level_3/fss_status_code/c/fss_status_code.c
@@ -43,10 +43,6 @@ extern "C" {
 
     f_status_t status = F_none;
 
-    f_console_parameter_t parameters[] = fss_status_code_console_parameter_t_initialize;
-    main->parameters.array = parameters;
-    main->parameters.used = fss_status_code_total_parameters_d;
-
     {
       f_console_parameter_id_t ids[3] = { fss_status_code_parameter_no_color_e, fss_status_code_parameter_light_e, fss_status_code_parameter_dark_e };
       const f_console_parameter_ids_t choices = macro_f_console_parameter_ids_t_initialize(ids, 3);
@@ -73,11 +69,7 @@ extern "C" {
         fll_program_parameter_process_empty(&main->context, sets);
       }
 
-      if (F_status_is_error(status)) {
-        fss_status_code_main_delete(main);
-
-        return F_status_set_error(status);
-      }
+      if (F_status_is_error(status)) return F_status_set_error(status);
     }
 
     // Identify priority of verbosity related parameters.
@@ -88,11 +80,7 @@ extern "C" {
 
       status = f_console_parameter_prioritize_right(main->parameters, choices, &choice);
 
-      if (F_status_is_error(status)) {
-        fss_status_code_main_delete(main);
-
-        return status;
-      }
+      if (F_status_is_error(status)) return status;
 
       if (choice == fss_status_code_parameter_verbosity_quiet_e) {
         main->output.verbosity = f_console_verbosity_quiet_e;
@@ -123,16 +111,12 @@ extern "C" {
     if (main->parameters.array[fss_status_code_parameter_help_e].result == f_console_result_found_e) {
       fss_status_code_print_help(main->output.to, main->context);
 
-      fss_status_code_main_delete(main);
-
       return F_none;
     }
 
     if (main->parameters.array[fss_status_code_parameter_version_e].result == f_console_result_found_e) {
       fll_program_print_version(main->output.to, fss_status_code_program_version_s);
 
-      fss_status_code_main_delete(main);
-
       return F_none;
     }
 
@@ -148,8 +132,6 @@ extern "C" {
 
         funlockfile(main->error.to.stream);
 
-        fss_status_code_main_delete(main);
-
         return F_status_set_error(status);
       }
 
@@ -164,8 +146,6 @@ extern "C" {
 
         funlockfile(main->error.to.stream);
 
-        fss_status_code_main_delete(main);
-
         return F_status_set_error(status);
       }
     }
@@ -180,16 +160,12 @@ extern "C" {
 
       funlockfile(main->error.to.stream);
 
-      fss_status_code_main_delete(main);
-
       return F_status_set_error(status);
     }
 
     if (main->parameters.remaining.used == 0 && !main->process_pipe) {
       fll_print_format("%[You failed to specify an error code.%]%r", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s);
 
-      fss_status_code_main_delete(main);
-
       return F_status_set_error(F_parameter);
     }
 
@@ -294,8 +270,6 @@ extern "C" {
       }
     }
 
-    fss_status_code_main_delete(main);
-
     return status;
   }
 #endif // _di_fss_status_code_main_

diff --git a/level_3/fss_status_code/c/main.c b/level_3/fss_status_code/c/main.c
index 11958bff1c6c6e24f41863c1866a63bd1874e2a9..4014fa90f4495160256dc3fb5cceb30143272a35 100644 (file)
--- a/level_3/fss_status_code/c/main.c
+++ b/level_3/fss_status_code/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_status_code_console_parameter_t_initialize;
+  data.parameters.array = parameters;
+  data.parameters.used = fss_status_code_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_status_code_main(&data, &arguments);
 
+  fll_program_data_delete(&data);
+
   fll_program_standard_setdown(&data.signal);
 
   if (F_status_is_error(status) || status == F_false) return 1;