From 19a1904fd8ed9675eae27ee3ac05bddc2c68fc47 Mon Sep 17 00:00:00 2001 From: Kevin Day Date: Fri, 6 Jan 2023 22:53:37 -0600 Subject: [PATCH] Cleanup: Fake program has incorrectly named variables. The variables with 'build_sources_settings' should not have an 's' on the end. The variables with 'build_process_post_s' and 'build_process_pre_s' should not have an '_s' on the end except for when it is a string. --- level_3/fake/c/private-build-load.c | 2 +- level_3/fake/c/private-common.c | 6 +++--- level_3/fake/c/private-common.h | 14 +++++++------- level_3/fake/c/private-fake-path_generate.c | 12 +++++++----- level_3/fake/c/private-make-operate.c | 2 +- level_3/fake/c/private-skeleton.c | 4 ++-- 6 files changed, 21 insertions(+), 19 deletions(-) diff --git a/level_3/fake/c/private-build-load.c b/level_3/fake/c/private-build-load.c index e1b0597..ded2b2c 100644 --- a/level_3/fake/c/private-build-load.c +++ b/level_3/fake/c/private-build-load.c @@ -311,7 +311,7 @@ extern "C" { fake_build_setting_name_build_sources_program_shared_s, fake_build_setting_name_build_sources_program_static_s, fake_build_setting_name_build_sources_script_s, - fake_build_setting_name_build_sources_settings_s, + fake_build_setting_name_build_sources_setting_s, fake_build_setting_name_build_static_s, fake_build_setting_name_defines_s, fake_build_setting_name_defines_library_s, diff --git a/level_3/fake/c/private-common.c b/level_3/fake/c/private-common.c index 74b9df1..ee1e225 100644 --- a/level_3/fake/c/private-common.c +++ b/level_3/fake/c/private-common.c @@ -41,7 +41,7 @@ extern "C" { const f_string_static_t fake_build_setting_name_build_sources_program_shared_s = macro_f_string_static_t_initialize(FAKE_build_setting_name_build_sources_program_shared_s, 0, FAKE_build_setting_name_build_sources_program_shared_s_length); const f_string_static_t fake_build_setting_name_build_sources_program_static_s = macro_f_string_static_t_initialize(FAKE_build_setting_name_build_sources_program_static_s, 0, FAKE_build_setting_name_build_sources_program_static_s_length); const f_string_static_t fake_build_setting_name_build_sources_script_s = macro_f_string_static_t_initialize(FAKE_build_setting_name_build_sources_script_s, 0, FAKE_build_setting_name_build_sources_script_s_length); - const f_string_static_t fake_build_setting_name_build_sources_settings_s = macro_f_string_static_t_initialize(FAKE_build_setting_name_build_sources_settings_s, 0, FAKE_build_setting_name_build_sources_settings_s_length); + const f_string_static_t fake_build_setting_name_build_sources_setting_s = macro_f_string_static_t_initialize(FAKE_build_setting_name_build_sources_setting_s, 0, FAKE_build_setting_name_build_sources_setting_s_length); const f_string_static_t fake_build_setting_name_build_static_s = macro_f_string_static_t_initialize(FAKE_build_setting_name_build_static_s, 0, FAKE_build_setting_name_build_static_s_length); const f_string_static_t fake_build_setting_name_defines_s = macro_f_string_static_t_initialize(FAKE_build_setting_name_defines_s, 0, FAKE_build_setting_name_defines_s_length); const f_string_static_t fake_build_setting_name_defines_library_s = macro_f_string_static_t_initialize(FAKE_build_setting_name_defines_library_s, 0, FAKE_build_setting_name_defines_library_s_length); @@ -369,8 +369,8 @@ extern "C" { f_string_dynamic_resize(0, &data->file_data_build_defines); f_string_dynamic_resize(0, &data->file_data_build_dependencies); - f_string_dynamic_resize(0, &data->file_data_build_process_post_s); - f_string_dynamic_resize(0, &data->file_data_build_process_pre_s); + f_string_dynamic_resize(0, &data->file_data_build_process_post); + f_string_dynamic_resize(0, &data->file_data_build_process_pre); f_string_dynamic_resize(0, &data->file_data_build_fakefile); f_string_dynamic_resize(0, &data->file_data_build_settings); diff --git a/level_3/fake/c/private-common.h b/level_3/fake/c/private-common.h index a7a35ac..3512f80 100644 --- a/level_3/fake/c/private-common.h +++ b/level_3/fake/c/private-common.h @@ -68,8 +68,8 @@ extern "C" { * file_data_build_defines: The defines build file data. * file_data_build_dependencies: The dependencies build file data. * file_data_build_fakefile: The fakefile build file data. - * file_data_build_process_post_s: The process_post_s build file data. - * file_data_build_process_pre_s: The process_pre_s build file data. + * file_data_build_process_post: The process_post_s build file data. + * file_data_build_process_pre: The process_pre_s build file data. * file_data_build_settings: The settings build file data. * * file_documents_readme: The documents readme file data. @@ -135,8 +135,8 @@ extern "C" { f_string_dynamic_t file_data_build_defines; f_string_dynamic_t file_data_build_dependencies; f_string_dynamic_t file_data_build_fakefile; - f_string_dynamic_t file_data_build_process_post_s; - f_string_dynamic_t file_data_build_process_pre_s; + f_string_dynamic_t file_data_build_process_post; + f_string_dynamic_t file_data_build_process_pre; f_string_dynamic_t file_data_build_settings; f_string_dynamic_t file_documents_readme; @@ -612,7 +612,7 @@ extern "C" { #define FAKE_build_setting_name_build_sources_program_shared_s "build_sources_program_shared" #define FAKE_build_setting_name_build_sources_program_static_s "build_sources_program_static" #define FAKE_build_setting_name_build_sources_script_s "build_sources_script" - #define FAKE_build_setting_name_build_sources_settings_s "build_sources_setting" + #define FAKE_build_setting_name_build_sources_setting_s "build_sources_setting" #define FAKE_build_setting_name_build_static_s "build_static" #define FAKE_build_setting_name_defines_s "defines" #define FAKE_build_setting_name_defines_library_s "defines_library" @@ -707,7 +707,7 @@ extern "C" { #define FAKE_build_setting_name_build_sources_program_shared_s_length 28 #define FAKE_build_setting_name_build_sources_program_static_s_length 28 #define FAKE_build_setting_name_build_sources_script_s_length 20 - #define FAKE_build_setting_name_build_sources_settings_s_length 22 + #define FAKE_build_setting_name_build_sources_setting_s_length 21 #define FAKE_build_setting_name_build_static_s_length 12 #define FAKE_build_setting_name_environment_s_length 11 #define FAKE_build_setting_name_defines_s_length 7 @@ -802,7 +802,7 @@ extern "C" { extern const f_string_static_t fake_build_setting_name_build_sources_program_shared_s; extern const f_string_static_t fake_build_setting_name_build_sources_program_static_s; extern const f_string_static_t fake_build_setting_name_build_sources_script_s; - extern const f_string_static_t fake_build_setting_name_build_sources_settings_s; + extern const f_string_static_t fake_build_setting_name_build_sources_setting_s; extern const f_string_static_t fake_build_setting_name_build_static_s; extern const f_string_static_t fake_build_setting_name_defines_s; extern const f_string_static_t fake_build_setting_name_defines_library_s; diff --git a/level_3/fake/c/private-fake-path_generate.c b/level_3/fake/c/private-fake-path_generate.c index 18cc70f..486556e 100644 --- a/level_3/fake/c/private-fake-path_generate.c +++ b/level_3/fake/c/private-fake-path_generate.c @@ -13,6 +13,8 @@ extern "C" { uint8_t i = 0; { + uint8_t j = 0; + const f_string_dynamic_t *parameters_source[] = { &data->path_build, &data->path_data, @@ -46,7 +48,7 @@ extern "C" { for (i = 0; i < 2; ++i) { // Initialize all string lengths to 0. - for (uint8_t j = 0; j < parameters_size[i]; ++j) { + for (j = 0; j < parameters_size[i]; ++j) { parameters_value[i][j]->used = 0; } // for @@ -140,8 +142,8 @@ extern "C" { &data->file_data_build_defines, &data->file_data_build_dependencies, &data->file_data_build_fakefile, - &data->file_data_build_process_post_s, - &data->file_data_build_process_pre_s, + &data->file_data_build_process_post, + &data->file_data_build_process_pre, &data->file_data_build_settings, }; @@ -209,8 +211,8 @@ extern "C" { &data->path_build_programs_static, &data->file_data_build_defines, &data->file_data_build_dependencies, - &data->file_data_build_process_post_s, - &data->file_data_build_process_pre_s, + &data->file_data_build_process_post, + &data->file_data_build_process_pre, &data->file_data_build_fakefile, &data->file_data_build_settings, &data->file_documents_readme, diff --git a/level_3/fake/c/private-make-operate.c b/level_3/fake/c/private-make-operate.c index f80e96b..479366a 100644 --- a/level_3/fake/c/private-make-operate.c +++ b/level_3/fake/c/private-make-operate.c @@ -960,7 +960,7 @@ extern "C" { fake_build_setting_name_build_sources_program_s, fake_build_setting_name_build_sources_program_shared_s, fake_build_setting_name_build_sources_program_static_s, - fake_build_setting_name_build_sources_settings_s, + fake_build_setting_name_build_sources_setting_s, fake_build_setting_name_build_sources_script_s, fake_build_setting_name_defines_s, fake_build_setting_name_defines_library_s, diff --git a/level_3/fake/c/private-skeleton.c b/level_3/fake/c/private-skeleton.c index c99a9b2..a68b6a8 100644 --- a/level_3/fake/c/private-skeleton.c +++ b/level_3/fake/c/private-skeleton.c @@ -101,11 +101,11 @@ extern "C" { } if (F_status_is_error_not(status)) { - status = fake_skeleton_operate_file_create(data, data->file_data_build_process_post_s, F_true, fake_make_skeleton_content_process_post_s); + status = fake_skeleton_operate_file_create(data, data->file_data_build_process_post, F_true, fake_make_skeleton_content_process_post_s); } if (F_status_is_error_not(status)) { - status = fake_skeleton_operate_file_create(data, data->file_data_build_process_pre_s, F_true, fake_make_skeleton_content_process_pre_s); + status = fake_skeleton_operate_file_create(data, data->file_data_build_process_pre, F_true, fake_make_skeleton_content_process_pre_s); } if (F_status_is_error_not(status)) { -- 1.8.3.1