From d5d154457e81ee0b67f8f7bd7b007d39ad885ad7 Mon Sep 17 00:00:00 2001 From: Kevin Day Date: Sun, 28 Jul 2019 23:07:16 -0500 Subject: [PATCH] Update: replace f_const with const The typedef f_const is no longer used in place of const. --- level_3/firewall/c/main.c | 2 +- level_3/fss_basic_list_read/c/main.c | 2 +- level_3/fss_basic_list_write/c/main.c | 2 +- level_3/fss_basic_read/c/main.c | 2 +- level_3/fss_basic_write/c/main.c | 2 +- level_3/fss_extended_read/c/main.c | 2 +- level_3/fss_extended_write/c/main.c | 2 +- level_3/fss_return_code/c/main.c | 2 +- level_3/init/c/init.c | 6 +++--- level_3/init/c/init.h | 6 +++--- level_3/init/c/main.c | 2 +- level_3/init/c/private-init.c | 4 ++-- level_3/init/c/private-init.h | 2 +- level_3/return_code/c/main.c | 2 +- 14 files changed, 19 insertions(+), 19 deletions(-) diff --git a/level_3/firewall/c/main.c b/level_3/firewall/c/main.c index d49f11e..fcae1ee 100644 --- a/level_3/firewall/c/main.c +++ b/level_3/firewall/c/main.c @@ -1,7 +1,7 @@ #include #include -int main(f_const f_s_int argc, f_const f_string argv[]) { +int main(const f_s_int argc, const f_string argv[]) { firewall_data data = firewall_data_initialize; if (f_error_is_error(firewall_main(argc, argv, &data))) { diff --git a/level_3/fss_basic_list_read/c/main.c b/level_3/fss_basic_list_read/c/main.c index 5f5130f..9b2cc1c 100644 --- a/level_3/fss_basic_list_read/c/main.c +++ b/level_3/fss_basic_list_read/c/main.c @@ -1,6 +1,6 @@ #include -int main(f_const f_array_length argc, f_const f_string argv[]) { +int main(const f_array_length argc, const f_string argv[]) { fss_basic_list_read_data data = fss_basic_list_read_data_initialize; if (f_pipe_exists()) { diff --git a/level_3/fss_basic_list_write/c/main.c b/level_3/fss_basic_list_write/c/main.c index 5132d14..88d1dc4 100644 --- a/level_3/fss_basic_list_write/c/main.c +++ b/level_3/fss_basic_list_write/c/main.c @@ -1,6 +1,6 @@ #include -int main(f_const f_array_length argc, f_const f_string argv[]) { +int main(const f_array_length argc, const f_string argv[]) { fss_basic_list_write_data data = fss_basic_list_write_data_initialize; if (f_pipe_exists()) { diff --git a/level_3/fss_basic_read/c/main.c b/level_3/fss_basic_read/c/main.c index a8826cd..245e51f 100644 --- a/level_3/fss_basic_read/c/main.c +++ b/level_3/fss_basic_read/c/main.c @@ -1,6 +1,6 @@ #include -int main(f_const f_array_length argc, f_const f_string argv[]) { +int main(const f_array_length argc, const f_string argv[]) { fss_basic_read_data data = fss_basic_read_data_initialize; if (f_pipe_exists()) { diff --git a/level_3/fss_basic_write/c/main.c b/level_3/fss_basic_write/c/main.c index 3af35be..1b0d77c 100644 --- a/level_3/fss_basic_write/c/main.c +++ b/level_3/fss_basic_write/c/main.c @@ -1,6 +1,6 @@ #include -int main(f_const f_array_length argc, f_const f_string argv[]) { +int main(const f_array_length argc, const f_string argv[]) { fss_basic_write_data data = fss_basic_write_data_initialize; if (f_pipe_exists()) { diff --git a/level_3/fss_extended_read/c/main.c b/level_3/fss_extended_read/c/main.c index ee3ed39..51420d1 100644 --- a/level_3/fss_extended_read/c/main.c +++ b/level_3/fss_extended_read/c/main.c @@ -1,6 +1,6 @@ #include -int main(f_const f_array_length argc, f_const f_string argv[]) { +int main(const f_array_length argc, const f_string argv[]) { fss_extended_read_data data = fss_extended_read_data_initialize; if (f_pipe_exists()) { diff --git a/level_3/fss_extended_write/c/main.c b/level_3/fss_extended_write/c/main.c index 969fc3c..e209051 100644 --- a/level_3/fss_extended_write/c/main.c +++ b/level_3/fss_extended_write/c/main.c @@ -1,6 +1,6 @@ #include -int main(f_const f_array_length argc, f_const f_string argv[]) { +int main(const f_array_length argc, const f_string argv[]) { fss_extended_write_data data = fss_extended_write_data_initialize; if (f_pipe_exists()) { diff --git a/level_3/fss_return_code/c/main.c b/level_3/fss_return_code/c/main.c index 9045889..2291ea5 100644 --- a/level_3/fss_return_code/c/main.c +++ b/level_3/fss_return_code/c/main.c @@ -1,6 +1,6 @@ #include -int main(f_const f_array_length argc, f_const f_string argv[]) { +int main(const f_array_length argc, const f_string argv[]) { fss_return_code_data data = fss_return_code_data_initialize; if (f_pipe_exists()) { diff --git a/level_3/init/c/init.c b/level_3/init/c/init.c index 81496e9..9604025 100644 --- a/level_3/init/c/init.c +++ b/level_3/init/c/init.c @@ -13,7 +13,7 @@ extern "C" { // version printed may be used by scripts, so this will only print the version number and a newline, no extra information or colors #ifndef _di_init_print_version_ - f_return_status init_print_version(f_const init_argument argument) { + f_return_status init_print_version(const init_argument argument) { printf("%s\n", init_version); return f_none; @@ -21,7 +21,7 @@ extern "C" { #endif // _di_init_print_version_ #ifndef _di_init_print_help_ - f_return_status init_print_help(f_const init_argument argument) { + f_return_status init_print_help(const init_argument argument) { printf("\n"); fl_print_color(f_standard_output, argument.context.title, argument.context.reset, " %s", init_name_long); @@ -99,7 +99,7 @@ extern "C" { #endif // _di_init_print_help_ #ifndef _di_init_main_ - f_return_status init_main(f_const f_s_int argc, f_const f_string argv[], init_argument *argument) { + f_return_status init_main(const f_s_int argc, const f_string argv[], init_argument *argument) { f_status status = f_none; f_status status2 = f_none; f_autochar run_level[init_kernel_runlevel_buffer]; diff --git a/level_3/init/c/init.h b/level_3/init/c/init.h index ecbcb65..7567fa2 100644 --- a/level_3/init/c/init.h +++ b/level_3/init/c/init.h @@ -212,15 +212,15 @@ extern "C" { #endif // _di_init_argument_ #ifndef _di_init_print_version_ - f_extern f_return_status init_print_version(f_const init_argument data); + f_extern f_return_status init_print_version(const init_argument data); #endif // _di_init_print_version_ #ifndef _di_init_print_help_ - f_extern f_return_status init_print_help(f_const init_argument data); + f_extern f_return_status init_print_help(const init_argument data); #endif // _di_init_print_help_ #ifndef _di_init_main_ - f_extern f_return_status init_main(f_const f_s_int argc, f_const f_string argv[], init_argument *data); + f_extern f_return_status init_main(const f_s_int argc, const f_string argv[], init_argument *data); #endif // _di_init_main_ #ifdef __cplusplus diff --git a/level_3/init/c/main.c b/level_3/init/c/main.c index 0d78d61..27fe671 100644 --- a/level_3/init/c/main.c +++ b/level_3/init/c/main.c @@ -1,6 +1,6 @@ #include -int main(f_const f_s_int argc, f_const f_string argv[]) { +int main(const f_s_int argc, const f_string argv[]) { init_argument data = init_argument_initialize; return init_main(argc, argv, &data); diff --git a/level_3/init/c/private-init.c b/level_3/init/c/private-init.c index 648275d..026fb75 100644 --- a/level_3/init/c/private-init.c +++ b/level_3/init/c/private-init.c @@ -5,7 +5,7 @@ #include "private-init.h" #ifndef _di_init_rule_buffer_ - f_return_status init_rule_buffer(f_const f_string filename, f_dynamic_string *buffer, f_fss_objects *objects, f_fss_contents *contents) { + f_return_status init_rule_buffer(const f_string filename, f_dynamic_string *buffer, f_fss_objects *objects, f_fss_contents *contents) { f_file file = f_file_initialize; f_status status = f_none; f_file_position file_position = f_file_position_initialize; @@ -94,7 +94,7 @@ #endif // _di_init_rule_buffer_ #ifndef _di_init_rules_process_main_ - f_return_status init_rules_process_main(f_const init_data) { + f_return_status init_rules_process_main(const init_data) { f_status status = f_none; f_status status2 = f_none; diff --git a/level_3/init/c/private-init.h b/level_3/init/c/private-init.h index 745c8cf..e749973 100644 --- a/level_3/init/c/private-init.h +++ b/level_3/init/c/private-init.h @@ -324,7 +324,7 @@ typedef struct { #define init_path_processes_mounts init_paths_processes "mounts" #ifndef _di_init_rule_buffer_ - f_return_status init_rule_buffer(f_const f_string filename, f_dynamic_string *buffer, f_fss_objects *objects, f_fss_contents *contents) f_gcc_attribute_visibility_internal; + f_return_status init_rule_buffer(const f_string filename, f_dynamic_string *buffer, f_fss_objects *objects, f_fss_contents *contents) f_gcc_attribute_visibility_internal; #endif // _di_init_rule_buffer_ #ifndef _di_init_handler_child_services_ diff --git a/level_3/return_code/c/main.c b/level_3/return_code/c/main.c index 639ef61..13218b8 100644 --- a/level_3/return_code/c/main.c +++ b/level_3/return_code/c/main.c @@ -1,6 +1,6 @@ #include -int main(f_const f_array_length argc, f_const f_string argv[]) { +int main(const f_array_length argc, const f_string argv[]) { return_code_data data = return_code_data_initialize; if (f_pipe_exists()) { -- 1.8.3.1