Update: With latest FLL changes to fll_program.

diff --git a/sources/c/program/control/main/common.c b/sources/c/program/control/main/common.c
index 7513bd885d2e0d038794ec14057054077e5e1cdb..8c8e1c70a8022e76f9e8eb0068d27c12459ed80b 100644 (file)
--- a/sources/c/program/control/main/common.c
+++ b/sources/c/program/control/main/common.c
@@ -37,25 +37,25 @@ extern "C" {
       return;
     }
 
-    if (main->program.parameters.array[f_console_standard_parameter_help_e].result & f_console_result_found_e) {
+    if (main->program.parameters.array[f_console_standard_parameter_help_e].result & f_console_result_found_d) {
       main->setting.flag |= control_main_flag_help_d;
 
       return;
     }
 
-    if (main->program.parameters.array[f_console_standard_parameter_version_e].result & f_console_result_found_e) {
+    if (main->program.parameters.array[f_console_standard_parameter_version_e].result & f_console_result_found_d) {
       main->setting.flag |= control_main_flag_version_e;
 
       return;
     }
 
-    if (main->program.parameters.array[f_console_standard_parameter_copyright_e].result & f_console_result_found_e) {
+    if (main->program.parameters.array[f_console_standard_parameter_copyright_e].result & f_console_result_found_d) {
       main->setting.flag |= control_main_flag_copyright_d;
 
       return;
     }
 
-    if (main->program.parameters.array[control_parameter_return_e].result & f_console_result_found_e) {
+    if (main->program.parameters.array[control_parameter_return_e].result & f_console_result_found_d) {
       main->setting.flag |= control_main_flag_return_d;
 
       return;
@@ -71,7 +71,7 @@ extern "C" {
     }
 
     // The settings path is statically allocated.
-    if (main->program.parameters.array[control_parameter_settings_e].result & f_console_result_value_e) {
+    if (main->program.parameters.array[control_parameter_settings_e].result & f_console_result_value_d) {
       index = main->program.parameters.array[control_parameter_settings_e].values.array[main->program.parameters.array[control_parameter_settings_e].values.used - 1];
 
       main->setting.path_settings.string = main->program.parameters.arguments.array[index].string;
@@ -167,7 +167,7 @@ extern "C" {
     }
 
     // The settings path is statically allocated, except when read from the settings file.
-    if (main->program.parameters.array[control_parameter_socket_e].result & f_console_result_value_e) {
+    if (main->program.parameters.array[control_parameter_socket_e].result & f_console_result_value_d) {
       index = main->program.parameters.array[control_parameter_settings_e].values.array[main->program.parameters.array[control_parameter_settings_e].values.used - 1];
 
       main->setting.path_socket.string = main->program.parameters.arguments.array[index].string;
@@ -238,7 +238,7 @@ extern "C" {
 
         for (i = 0; i < 3; ++i) {
 
-          if (append_ids[i] && main->program.parameters.array[append_ids[i]].result & f_console_result_value_e) {
+          if (append_ids[i] && main->program.parameters.array[append_ids[i]].result & f_console_result_value_d) {
             index = main->program.parameters.array[append_ids[i]].values.array[main->program.parameters.array[append_ids[i]].values.used - 1];
 
             main->setting.state.status = f_string_dynamic_append(main->program.parameters.arguments.array[index], &main->setting.path_socket);
@@ -253,7 +253,7 @@ extern "C" {
           if (F_status_is_error(main->setting.state.status)) {
             control_print_error(
               &main->program.error,
-              ((append_ids[i] && main->program.parameters.array[append_ids[i]].result & f_console_result_value_e) || !append_hass[i])
+              ((append_ids[i] && main->program.parameters.array[append_ids[i]].result & f_console_result_value_d) || !append_hass[i])
                 ? macro_control_f(f_string_dynamic_append)
                 : macro_control_f(f_string_dynamic_partial_append_nulless)
             );
@@ -331,7 +331,7 @@ extern "C" {
 
       for (i = 0; i < 3; ++i) {
 
-        if (main->program.parameters.array[ids[i]].result & f_console_result_found_e) {
+        if (main->program.parameters.array[ids[i]].result & f_console_result_found_d) {
           main->setting.state.status = F_status_set_error(F_parameter);
 
           if (error_printed_not) {
@@ -340,7 +340,7 @@ extern "C" {
 
           control_print_error_parameter_value_not(&main->program.error, names[i]);
         }
-        else if (main->program.parameters.array[ids[i]].result & f_console_result_value_e) {
+        else if (main->program.parameters.array[ids[i]].result & f_console_result_value_d) {
           index = main->program.parameters.array[ids[i]].values.array[main->program.parameters.array[ids[i]].values.used - 1];
 
           if (!main->program.parameters.arguments.array[index].used) {

diff --git a/sources/c/program/control/main/common/enumeration.h b/sources/c/program/control/main/common/enumeration.h
index eb86b554d9f62e88ea68543175cc06a84386b608..18d70e0e045f643ec068e1fc069a84e549b3976f 100644 (file)
--- a/sources/c/program/control/main/common/enumeration.h
+++ b/sources/c/program/control/main/common/enumeration.h
@@ -85,10 +85,10 @@ extern "C" {
     { \
       macro_fll_program_console_parameter_standard_initialize, \
       \
-      macro_f_console_parameter_t_initialize_3(control_short_name_s,     control_long_name_s,     1, f_console_flag_normal_e), \
-      macro_f_console_parameter_t_initialize_3(control_short_return_s,   control_long_return_s,   1, f_console_flag_normal_e), \
-      macro_f_console_parameter_t_initialize_3(control_short_settings_s, control_long_settings_s, 1, f_console_flag_normal_e), \
-      macro_f_console_parameter_t_initialize_3(control_short_socket_s,   control_long_socket_s,   1, f_console_flag_normal_e), \
+      macro_f_console_parameter_t_initialize_3(control_short_name_s,     control_long_name_s,     1, f_console_flag_normal_d), \
+      macro_f_console_parameter_t_initialize_3(control_short_return_s,   control_long_return_s,   1, f_console_flag_normal_d), \
+      macro_f_console_parameter_t_initialize_3(control_short_settings_s, control_long_settings_s, 1, f_console_flag_normal_d), \
+      macro_f_console_parameter_t_initialize_3(control_short_socket_s,   control_long_socket_s,   1, f_console_flag_normal_d), \
     }
 
   #define control_parameter_total_d (f_console_parameter_state_type_total_d + 4)