From 74830d9898f6f3b4af85edaefdb348e6dd98aab4 Mon Sep 17 00:00:00 2001 From: Kevin Day Date: Sun, 13 Sep 2020 16:17:24 -0500 Subject: [PATCH] Cleanup: rename F_status_is_not_error() to F_status_is_error_not() (and similar). Also utilize F_status_is_error_not() over F_status_is_fine() in Featureless Make. --- level_0/f_directory/c/directory_type.h | 28 ++++++------ level_0/f_status/c/status.h | 7 +-- level_1/fl_color/c/color.c | 24 +++++----- level_1/fl_color/c/color.h | 80 +++++++++++++++++----------------- level_2/fll_execute/c/execute.c | 4 +- level_3/fake/c/fake.c | 8 ++-- level_3/fake/c/private-build.c | 68 ++++++++++++++--------------- level_3/fake/c/private-fake.c | 4 +- level_3/fake/c/private-make.c | 55 +++++++++++------------ level_3/fake/c/private-skeleton.c | 14 +++--- level_3/firewall/c/firewall.c | 10 ++--- level_3/firewall/c/private-firewall.c | 4 +- level_3/init/c/private-init.c | 4 +- 13 files changed, 156 insertions(+), 154 deletions(-) diff --git a/level_0/f_directory/c/directory_type.h b/level_0/f_directory/c/directory_type.h index 9393d23..89b7af3 100644 --- a/level_0/f_directory/c/directory_type.h +++ b/level_0/f_directory/c/directory_type.h @@ -50,23 +50,23 @@ extern "C" { #define f_macro_directory_listing_t_delete(status, listing) \ f_macro_string_dynamics_t_delete(status, listing.block) \ - if (F_status_is_not_error(status)) f_macro_string_dynamics_t_delete(status, listing.character) \ - if (F_status_is_not_error(status)) f_macro_string_dynamics_t_delete(status, listing.directory) \ - if (F_status_is_not_error(status)) f_macro_string_dynamics_t_delete(status, listing.regular) \ - if (F_status_is_not_error(status)) f_macro_string_dynamics_t_delete(status, listing.link) \ - if (F_status_is_not_error(status)) f_macro_string_dynamics_t_delete(status, listing.fifo) \ - if (F_status_is_not_error(status)) f_macro_string_dynamics_t_delete(status, listing.socket) \ - if (F_status_is_not_error(status)) f_macro_string_dynamics_t_delete(status, listing.unknown) + if (F_status_is_error_not(status)) f_macro_string_dynamics_t_delete(status, listing.character) \ + if (F_status_is_error_not(status)) f_macro_string_dynamics_t_delete(status, listing.directory) \ + if (F_status_is_error_not(status)) f_macro_string_dynamics_t_delete(status, listing.regular) \ + if (F_status_is_error_not(status)) f_macro_string_dynamics_t_delete(status, listing.link) \ + if (F_status_is_error_not(status)) f_macro_string_dynamics_t_delete(status, listing.fifo) \ + if (F_status_is_error_not(status)) f_macro_string_dynamics_t_delete(status, listing.socket) \ + if (F_status_is_error_not(status)) f_macro_string_dynamics_t_delete(status, listing.unknown) #define f_macro_directory_listing_t_destroy(status, listing) \ f_macro_string_dynamics_t_destroy(status, listing.block) \ - if (F_status_is_not_error(status)) f_macro_string_dynamics_t_destroy(status, listing.character) \ - if (F_status_is_not_error(status)) f_macro_string_dynamics_t_destroy(status, listing.directory) \ - if (F_status_is_not_error(status)) f_macro_string_dynamics_t_destroy(status, listing.regular) \ - if (F_status_is_not_error(status)) f_macro_string_dynamics_t_destroy(status, listing.link) \ - if (F_status_is_not_error(status)) f_macro_string_dynamics_t_destroy(status, listing.fifo) \ - if (F_status_is_not_error(status)) f_macro_string_dynamics_t_destroy(status, listing.socket) \ - if (F_status_is_not_error(status)) f_macro_string_dynamics_t_delete(status, listing.unknown) + if (F_status_is_error_not(status)) f_macro_string_dynamics_t_destroy(status, listing.character) \ + if (F_status_is_error_not(status)) f_macro_string_dynamics_t_destroy(status, listing.directory) \ + if (F_status_is_error_not(status)) f_macro_string_dynamics_t_destroy(status, listing.regular) \ + if (F_status_is_error_not(status)) f_macro_string_dynamics_t_destroy(status, listing.link) \ + if (F_status_is_error_not(status)) f_macro_string_dynamics_t_destroy(status, listing.fifo) \ + if (F_status_is_error_not(status)) f_macro_string_dynamics_t_destroy(status, listing.socket) \ + if (F_status_is_error_not(status)) f_macro_string_dynamics_t_delete(status, listing.unknown) #define f_macro_directory_listing_t_delete_simple(listing) \ f_macro_string_dynamics_t_delete_simple(listing.block) \ diff --git a/level_0/f_status/c/status.h b/level_0/f_status/c/status.h index 4424e30..f8f180c 100644 --- a/level_0/f_status/c/status.h +++ b/level_0/f_status/c/status.h @@ -37,9 +37,10 @@ extern "C" { #define F_status_is_signal(status) (status & F_status_bit_signal) #define F_status_is_warning(status) (status & F_status_bit_warning) - #define F_status_is_not_error(status) ((status & F_status_bit_error) == 0) - #define F_status_is_not_signal(status) ((status & F_status_bit_signal) == 0) - #define F_status_is_not_warning(status) ((status & F_status_bit_warning) == 0) + #define F_status_is_error_not(status) ((status & F_status_bit_error) == 0) + #define F_status_is_fine_not(status) (status & F_status_mask_code) + #define F_status_is_signal_not(status) ((status & F_status_bit_signal) == 0) + #define F_status_is_warning_not(status) ((status & F_status_bit_warning) == 0) #define F_status_set_error(status) (status | F_status_bit_error) #define F_status_set_signal(status) (status | F_status_bit_signal) diff --git a/level_1/fl_color/c/color.c b/level_1/fl_color/c/color.c index 866f2c6..f33cea9 100644 --- a/level_1/fl_color/c/color.c +++ b/level_1/fl_color/c/color.c @@ -277,24 +277,24 @@ extern "C" { if (use_light_colors) { status = fl_macro_color_save_1(&context->reset, context->color_format, context->color_list.reset); - if (F_status_is_not_error(status)) status = fl_macro_color_save_1(&context->warning, context->color_format, context->color_list.yellow); - if (F_status_is_not_error(status)) status = fl_macro_color_save_2(&context->error, context->color_format, context->color_list.bold, context->color_list.red); - if (F_status_is_not_error(status)) status = fl_macro_color_save_2(&context->title, context->color_format, context->color_list.bold, context->color_list.blue); - if (F_status_is_not_error(status)) status = fl_macro_color_save_1(&context->notable, context->color_format, context->color_list.bold); - if (F_status_is_not_error(status)) status = fl_macro_color_save_1(&context->important, context->color_format, context->color_list.blue); - if (F_status_is_not_error(status)) status = fl_macro_color_save_1(&context->standout, context->color_format, context->color_list.purple); + if (F_status_is_error_not(status)) status = fl_macro_color_save_1(&context->warning, context->color_format, context->color_list.yellow); + if (F_status_is_error_not(status)) status = fl_macro_color_save_2(&context->error, context->color_format, context->color_list.bold, context->color_list.red); + if (F_status_is_error_not(status)) status = fl_macro_color_save_2(&context->title, context->color_format, context->color_list.bold, context->color_list.blue); + if (F_status_is_error_not(status)) status = fl_macro_color_save_1(&context->notable, context->color_format, context->color_list.bold); + if (F_status_is_error_not(status)) status = fl_macro_color_save_1(&context->important, context->color_format, context->color_list.blue); + if (F_status_is_error_not(status)) status = fl_macro_color_save_1(&context->standout, context->color_format, context->color_list.purple); context->mode = f_color_mode_light; } else { status = fl_macro_color_save_1(&context->reset, context->color_format, context->color_list.reset); - if (F_status_is_not_error(status)) status = fl_macro_color_save_1(&context->warning, context->color_format, context->color_list.yellow); - if (F_status_is_not_error(status)) status = fl_macro_color_save_2(&context->error, context->color_format, context->color_list.bold, context->color_list.red); - if (F_status_is_not_error(status)) status = fl_macro_color_save_2(&context->title, context->color_format, context->color_list.bold, context->color_list.yellow); - if (F_status_is_not_error(status)) status = fl_macro_color_save_1(&context->notable, context->color_format, context->color_list.bold); - if (F_status_is_not_error(status)) status = fl_macro_color_save_2(&context->important, context->color_format, context->color_list.bold, context->color_list.green); - if (F_status_is_not_error(status)) status = fl_macro_color_save_1(&context->standout, context->color_format, context->color_list.green); + if (F_status_is_error_not(status)) status = fl_macro_color_save_1(&context->warning, context->color_format, context->color_list.yellow); + if (F_status_is_error_not(status)) status = fl_macro_color_save_2(&context->error, context->color_format, context->color_list.bold, context->color_list.red); + if (F_status_is_error_not(status)) status = fl_macro_color_save_2(&context->title, context->color_format, context->color_list.bold, context->color_list.yellow); + if (F_status_is_error_not(status)) status = fl_macro_color_save_1(&context->notable, context->color_format, context->color_list.bold); + if (F_status_is_error_not(status)) status = fl_macro_color_save_2(&context->important, context->color_format, context->color_list.bold, context->color_list.green); + if (F_status_is_error_not(status)) status = fl_macro_color_save_1(&context->standout, context->color_format, context->color_list.green); context->mode = f_color_mode_dark; } diff --git a/level_1/fl_color/c/color.h b/level_1/fl_color/c/color.h index 18ba81e..ec060eb 100644 --- a/level_1/fl_color/c/color.h +++ b/level_1/fl_color/c/color.h @@ -48,36 +48,36 @@ extern "C" { #define fl_macro_color_context_t_new(status, color_context) \ f_macro_string_dynamic_t_new(status, color_context.reset, f_color_max_size + 1); \ - if (F_status_is_not_error(status)) f_macro_string_dynamic_t_resize(status, color_context.warning, f_color_max_size + 1); \ - if (F_status_is_not_error(status)) f_macro_string_dynamic_t_resize(status, color_context.error, f_color_max_size + 1); \ - if (F_status_is_not_error(status)) f_macro_string_dynamic_t_resize(status, color_context.title, f_color_max_size + 1); \ - if (F_status_is_not_error(status)) f_macro_string_dynamic_t_resize(status, color_context.notable, f_color_max_size + 1); \ - if (F_status_is_not_error(status)) f_macro_string_dynamic_t_resize(status, color_context.important, f_color_max_size + 1); \ - if (F_status_is_not_error(status)) f_macro_string_dynamic_t_resize(status, color_context.standout, f_color_max_size + 1); \ - if (F_status_is_not_error(status)) f_macro_string_dynamic_t_resize(status, color_context.normal, f_color_max_size + 1); \ - if (F_status_is_not_error(status)) f_macro_string_dynamic_t_resize(status, color_context.normal_reset, f_color_max_size + 1); + if (F_status_is_error_not(status)) f_macro_string_dynamic_t_resize(status, color_context.warning, f_color_max_size + 1); \ + if (F_status_is_error_not(status)) f_macro_string_dynamic_t_resize(status, color_context.error, f_color_max_size + 1); \ + if (F_status_is_error_not(status)) f_macro_string_dynamic_t_resize(status, color_context.title, f_color_max_size + 1); \ + if (F_status_is_error_not(status)) f_macro_string_dynamic_t_resize(status, color_context.notable, f_color_max_size + 1); \ + if (F_status_is_error_not(status)) f_macro_string_dynamic_t_resize(status, color_context.important, f_color_max_size + 1); \ + if (F_status_is_error_not(status)) f_macro_string_dynamic_t_resize(status, color_context.standout, f_color_max_size + 1); \ + if (F_status_is_error_not(status)) f_macro_string_dynamic_t_resize(status, color_context.normal, f_color_max_size + 1); \ + if (F_status_is_error_not(status)) f_macro_string_dynamic_t_resize(status, color_context.normal_reset, f_color_max_size + 1); #define fl_macro_color_context_t_delete(status, color_context) \ f_macro_string_dynamic_t_delete(status, color_context.reset); \ - if (F_status_is_not_error(status)) f_macro_string_dynamic_t_delete(status, color_context.warning); \ - if (F_status_is_not_error(status)) f_macro_string_dynamic_t_delete(status, color_context.error); \ - if (F_status_is_not_error(status)) f_macro_string_dynamic_t_delete(status, color_context.title); \ - if (F_status_is_not_error(status)) f_macro_string_dynamic_t_delete(status, color_context.notable); \ - if (F_status_is_not_error(status)) f_macro_string_dynamic_t_delete(status, color_context.important); \ - if (F_status_is_not_error(status)) f_macro_string_dynamic_t_delete(status, color_context.standout); \ - if (F_status_is_not_error(status)) f_macro_string_dynamic_t_delete(status, color_context.normal); \ - if (F_status_is_not_error(status)) f_macro_string_dynamic_t_delete(status, color_context.normal_reset); + if (F_status_is_error_not(status)) f_macro_string_dynamic_t_delete(status, color_context.warning); \ + if (F_status_is_error_not(status)) f_macro_string_dynamic_t_delete(status, color_context.error); \ + if (F_status_is_error_not(status)) f_macro_string_dynamic_t_delete(status, color_context.title); \ + if (F_status_is_error_not(status)) f_macro_string_dynamic_t_delete(status, color_context.notable); \ + if (F_status_is_error_not(status)) f_macro_string_dynamic_t_delete(status, color_context.important); \ + if (F_status_is_error_not(status)) f_macro_string_dynamic_t_delete(status, color_context.standout); \ + if (F_status_is_error_not(status)) f_macro_string_dynamic_t_delete(status, color_context.normal); \ + if (F_status_is_error_not(status)) f_macro_string_dynamic_t_delete(status, color_context.normal_reset); #define fl_macro_color_context_t_destroy(status, color_context, size) \ f_macro_string_dynamic_t_destroy(status, color_context.reset); \ - if (F_status_is_not_error(status)) f_macro_string_dynamic_t_destroy(status, color_context.warning, size); \ - if (F_status_is_not_error(status)) f_macro_string_dynamic_t_destroy(status, color_context.error, size); \ - if (F_status_is_not_error(status)) f_macro_string_dynamic_t_destroy(status, color_context.title, size); \ - if (F_status_is_not_error(status)) f_macro_string_dynamic_t_destroy(status, color_context.notable, size); \ - if (F_status_is_not_error(status)) f_macro_string_dynamic_t_destroy(status, color_context.important, size); \ - if (F_status_is_not_error(status)) f_macro_string_dynamic_t_destroy(status, color_context.standout, size); \ - if (F_status_is_not_error(status)) f_macro_string_dynamic_t_destroy(status, color_context.normal); \ - if (F_status_is_not_error(status)) f_macro_string_dynamic_t_destroy(status, color_context.normal_reset); + if (F_status_is_error_not(status)) f_macro_string_dynamic_t_destroy(status, color_context.warning, size); \ + if (F_status_is_error_not(status)) f_macro_string_dynamic_t_destroy(status, color_context.error, size); \ + if (F_status_is_error_not(status)) f_macro_string_dynamic_t_destroy(status, color_context.title, size); \ + if (F_status_is_error_not(status)) f_macro_string_dynamic_t_destroy(status, color_context.notable, size); \ + if (F_status_is_error_not(status)) f_macro_string_dynamic_t_destroy(status, color_context.important, size); \ + if (F_status_is_error_not(status)) f_macro_string_dynamic_t_destroy(status, color_context.standout, size); \ + if (F_status_is_error_not(status)) f_macro_string_dynamic_t_destroy(status, color_context.normal); \ + if (F_status_is_error_not(status)) f_macro_string_dynamic_t_destroy(status, color_context.normal_reset); #define fl_macro_color_context_t_delete_simple(color_context) \ f_macro_string_dynamic_t_delete_simple(color_context.reset); \ @@ -103,25 +103,25 @@ extern "C" { #define fl_macro_color_context_t_resize(status, color_context) \ f_macro_string_dynamic_t_resize(status, color_context.reset, f_color_max_size + 1); \ - if (F_status_is_not_error(status)) f_macro_string_dynamic_t_resize(status, color_context.warning, f_color_max_size + 1); \ - if (F_status_is_not_error(status)) f_macro_string_dynamic_t_resize(status, color_context.error, f_color_max_size + 1); \ - if (F_status_is_not_error(status)) f_macro_string_dynamic_t_resize(status, color_context.title, f_color_max_size + 1); \ - if (F_status_is_not_error(status)) f_macro_string_dynamic_t_resize(status, color_context.notable, f_color_max_size + 1); \ - if (F_status_is_not_error(status)) f_macro_string_dynamic_t_resize(status, color_context.important, f_color_max_size + 1); \ - if (F_status_is_not_error(status)) f_macro_string_dynamic_t_resize(status, color_context.standout, f_color_max_size + 1); \ - if (F_status_is_not_error(status)) f_macro_string_dynamic_t_resize(status, color_context.normal, f_color_max_size + 1); \ - if (F_status_is_not_error(status)) f_macro_string_dynamic_t_resize(status, color_context.normal_reset, f_color_max_size + 1); + if (F_status_is_error_not(status)) f_macro_string_dynamic_t_resize(status, color_context.warning, f_color_max_size + 1); \ + if (F_status_is_error_not(status)) f_macro_string_dynamic_t_resize(status, color_context.error, f_color_max_size + 1); \ + if (F_status_is_error_not(status)) f_macro_string_dynamic_t_resize(status, color_context.title, f_color_max_size + 1); \ + if (F_status_is_error_not(status)) f_macro_string_dynamic_t_resize(status, color_context.notable, f_color_max_size + 1); \ + if (F_status_is_error_not(status)) f_macro_string_dynamic_t_resize(status, color_context.important, f_color_max_size + 1); \ + if (F_status_is_error_not(status)) f_macro_string_dynamic_t_resize(status, color_context.standout, f_color_max_size + 1); \ + if (F_status_is_error_not(status)) f_macro_string_dynamic_t_resize(status, color_context.normal, f_color_max_size + 1); \ + if (F_status_is_error_not(status)) f_macro_string_dynamic_t_resize(status, color_context.normal_reset, f_color_max_size + 1); #define fl_macro_color_context_t_adjust(status, color_context) \ f_macro_string_dynamic_t_adjust(status, color_context.reset, f_color_max_size + 1); \ - if (F_status_is_not_error(status)) f_macro_string_dynamic_t_resize(status, color_context.warning, f_color_max_size + 1); \ - if (F_status_is_not_error(status)) f_macro_string_dynamic_t_resize(status, color_context.error, f_color_max_size + 1); \ - if (F_status_is_not_error(status)) f_macro_string_dynamic_t_resize(status, color_context.title, f_color_max_size + 1); \ - if (F_status_is_not_error(status)) f_macro_string_dynamic_t_resize(status, color_context.notable, f_color_max_size + 1); \ - if (F_status_is_not_error(status)) f_macro_string_dynamic_t_resize(status, color_context.important, f_color_max_size + 1); \ - if (F_status_is_not_error(status)) f_macro_string_dynamic_t_resize(status, color_context.standout, f_color_max_size + 1); \ - if (F_status_is_not_error(status)) f_macro_string_dynamic_t_resize(status, color_context.normal, f_color_max_size + 1); \ - if (F_status_is_not_error(status)) f_macro_string_dynamic_t_resize(status, color_context.normal_reset, f_color_max_size + 1); + if (F_status_is_error_not(status)) f_macro_string_dynamic_t_resize(status, color_context.warning, f_color_max_size + 1); \ + if (F_status_is_error_not(status)) f_macro_string_dynamic_t_resize(status, color_context.error, f_color_max_size + 1); \ + if (F_status_is_error_not(status)) f_macro_string_dynamic_t_resize(status, color_context.title, f_color_max_size + 1); \ + if (F_status_is_error_not(status)) f_macro_string_dynamic_t_resize(status, color_context.notable, f_color_max_size + 1); \ + if (F_status_is_error_not(status)) f_macro_string_dynamic_t_resize(status, color_context.important, f_color_max_size + 1); \ + if (F_status_is_error_not(status)) f_macro_string_dynamic_t_resize(status, color_context.standout, f_color_max_size + 1); \ + if (F_status_is_error_not(status)) f_macro_string_dynamic_t_resize(status, color_context.normal, f_color_max_size + 1); \ + if (F_status_is_error_not(status)) f_macro_string_dynamic_t_resize(status, color_context.normal_reset, f_color_max_size + 1); #endif // _di_fl_color_context_t_ /** diff --git a/level_2/fll_execute/c/execute.c b/level_2/fll_execute/c/execute.c index a9fc21c..5642e50 100644 --- a/level_2/fll_execute/c/execute.c +++ b/level_2/fll_execute/c/execute.c @@ -528,11 +528,11 @@ extern "C" { for (i = 0; i < paths.used; i++) { status = fl_string_append(program_name, program_name_length, &paths.array[i]); - if (F_status_is_not_error(status)) { + if (F_status_is_error_not(status)) { status = fl_string_dynamic_terminate(&paths.array[i]); } - if (F_status_is_not_error(status)) { + if (F_status_is_error_not(status)) { status = f_file_exists(paths.array[i].string); if (status == F_true) { diff --git a/level_3/fake/c/fake.c b/level_3/fake/c/fake.c index 807f379..868144e 100644 --- a/level_3/fake/c/fake.c +++ b/level_3/fake/c/fake.c @@ -236,7 +236,7 @@ extern "C" { status = fake_process_console_parameters(arguments, data); - if (F_status_is_not_error(status)) { + if (F_status_is_error_not(status)) { status = fake_path_generate(data); } @@ -267,7 +267,7 @@ extern "C" { validate_parameter_directories = F_false; } - if (F_status_is_not_error(status) && status != F_signal) { + if (F_status_is_error_not(status) && status != F_signal) { f_string_static_t stub = f_string_static_t_initialize; status = fake_build_operate(*data, stub); @@ -279,7 +279,7 @@ extern "C" { validate_parameter_directories = F_false; } - if (F_status_is_not_error(status) && status != F_signal) { + if (F_status_is_error_not(status) && status != F_signal) { status = fake_clean_operate(*data); } } @@ -289,7 +289,7 @@ extern "C" { validate_parameter_directories = F_false; } - if (F_status_is_not_error(status) && status != F_signal) { + if (F_status_is_error_not(status) && status != F_signal) { status = fake_make_operate(*data); } } diff --git a/level_3/fake/c/private-build.c b/level_3/fake/c/private-build.c index 2d8a4d9..5c40a23 100644 --- a/level_3/fake/c/private-build.c +++ b/level_3/fake/c/private-build.c @@ -50,7 +50,7 @@ extern "C" { if (data.path_work.used > 0) { f_string_length_t length = 0; - if (F_status_is_fine(*status)) { + if (F_status_is_error_not(*status)) { length = fake_build_parameter_library_include_length + data.path_work_includes.used; char string[length + 1]; @@ -63,7 +63,7 @@ extern "C" { *status = fll_execute_arguments_add(string, length, arguments); } - if (data_build.setting.search_shared && (is_shared || !data_build.setting.search_exclusive) && F_status_is_fine(*status)) { + if (data_build.setting.search_shared && (is_shared || !data_build.setting.search_exclusive) && F_status_is_error_not(*status)) { length = fake_build_parameter_library_link_path_length + data.path_work_libraries_shared.used; char string[length + 1]; @@ -76,7 +76,7 @@ extern "C" { *status = fll_execute_arguments_add(string, length, arguments); } - if (data_build.setting.search_static && (!is_shared || !data_build.setting.search_exclusive) && F_status_is_fine(*status)) { + if (data_build.setting.search_static && (!is_shared || !data_build.setting.search_exclusive) && F_status_is_error_not(*status)) { length = fake_build_parameter_library_link_path_length + data.path_work_libraries_static.used; char string[length + 1]; @@ -90,31 +90,31 @@ extern "C" { } } - if (F_status_is_fine(*status)) { + if (F_status_is_error_not(*status)) { for (f_array_length_t i = 0; i < data_build.setting.build_libraries.used; i++) { *status = fll_execute_arguments_add(data_build.setting.build_libraries.array[i].string, data_build.setting.build_libraries.array[i].used, arguments); if (F_status_is_error(*status)) break; } // for } - for (f_array_length_t i = 0; i < data_build.setting.flags_all.used && F_status_is_fine(*status); i++) { + for (f_array_length_t i = 0; i < data_build.setting.flags_all.used && F_status_is_error_not(*status); i++) { *status = fll_execute_arguments_add(data_build.setting.flags_all.array[i].string, data_build.setting.flags_all.array[i].used, arguments); if (F_status_is_error(*status)) break; } // for - for (f_array_length_t i = 0; i < data_build.setting.flags_shared.used && F_status_is_fine(*status); i++) { + for (f_array_length_t i = 0; i < data_build.setting.flags_shared.used && F_status_is_error_not(*status); i++) { *status = fll_execute_arguments_add(data_build.setting.flags_shared.array[i].string, data_build.setting.flags_shared.array[i].used, arguments); if (F_status_is_error(*status)) break; } // for if (is_library) { - for (f_array_length_t j = 0; j < data_build.setting.flags_library.used && F_status_is_fine(*status); j++) { + for (f_array_length_t j = 0; j < data_build.setting.flags_library.used && F_status_is_error_not(*status); j++) { *status = fll_execute_arguments_add(data_build.setting.flags_library.array[j].string, data_build.setting.flags_library.array[j].used, arguments); if (F_status_is_error(*status)) break; } // for } else { - for (f_array_length_t i = 0; i < data_build.setting.flags_program.used && F_status_is_fine(*status); i++) { + for (f_array_length_t i = 0; i < data_build.setting.flags_program.used && F_status_is_error_not(*status); i++) { *status = fll_execute_arguments_add(data_build.setting.flags_program.array[i].string, data_build.setting.flags_program.array[i].used, arguments); if (F_status_is_error(*status)) break; } // for @@ -124,7 +124,7 @@ extern "C" { f_string_length_t length = 0; f_array_length_t i = 0; - for (; i < data.define.used && F_status_is_fine(*status); i++) { + for (; i < data.define.used && F_status_is_error_not(*status); i++) { *status = fll_execute_arguments_add(data.define.array[i].string, data.define.array[i].used, arguments); if (F_status_is_error(*status)) break; } // for @@ -133,19 +133,19 @@ extern "C" { f_string_length_t length = 0; f_array_length_t i = 0; - for (; i < data_build.setting.defines_all.used && F_status_is_fine(*status); i++) { + for (; i < data_build.setting.defines_all.used && F_status_is_error_not(*status); i++) { *status = fll_execute_arguments_add(data_build.setting.defines_all.array[i].string, data_build.setting.defines_all.array[i].used, arguments); if (F_status_is_error(*status)) break; } // for if (is_shared) { - for (i = 0; i < data_build.setting.defines_shared.used && F_status_is_fine(*status); i++) { + for (i = 0; i < data_build.setting.defines_shared.used && F_status_is_error_not(*status); i++) { *status = fll_execute_arguments_add(data_build.setting.defines_shared.array[i].string, data_build.setting.defines_shared.array[i].used, arguments); if (F_status_is_error(*status)) break; } // for } else { - for (i = 0; i < data_build.setting.defines_static.used && F_status_is_fine(*status); i++) { + for (i = 0; i < data_build.setting.defines_static.used && F_status_is_error_not(*status); i++) { *status = fll_execute_arguments_add(data_build.setting.defines_static.array[i].string, data_build.setting.defines_static.array[i].used, arguments); if (F_status_is_error(*status)) break; } // for @@ -284,7 +284,7 @@ extern "C" { f_macro_string_dynamic_t_delete_simple(path_source); f_macro_string_dynamic_t_delete_simple(destination_file); - if (F_status_is_fine(*status)) { + if (F_status_is_error_not(*status)) { fake_build_touch(data, file_stage, status); } } @@ -390,7 +390,7 @@ extern "C" { *status = fll_execute_arguments_add(fake_other_operation_build, fake_other_operation_build_length, &arguments); // ensure console color mode is passed to the scripts so that they can also react to color mode. - if (F_status_is_not_error(*status) && data.context.mode != f_color_mode_none) { + if (F_status_is_error_not(*status) && data.context.mode != f_color_mode_none) { char argument[3] = { f_console_symbol_disable, 0, 0 }; if (data.context.mode == f_color_mode_dark) { @@ -407,7 +407,7 @@ extern "C" { } // ensure verbosity level is passed to the scripts so that they can also react to requested verbosity. - if (F_status_is_not_error(*status) && data.verbosity != fake_verbosity_normal) { + if (F_status_is_error_not(*status) && data.verbosity != fake_verbosity_normal) { char argument[3] = { f_console_symbol_disable, 0, 0 }; if (data.verbosity == fake_verbosity_quiet) { @@ -542,11 +542,11 @@ extern "C" { *status = fl_string_dynamic_append_nulless(data.path_data_build, &path); } - if (F_status_is_not_error(*status)) { + if (F_status_is_error_not(*status)) { *status = fl_string_dynamic_append_nulless(process_script, &path); } - if (F_status_is_not_error(*status)) { + if (F_status_is_error_not(*status)) { function = "fl_string_dynamic_terminate_after"; *status = fl_string_dynamic_terminate_after(&path); } @@ -873,7 +873,7 @@ extern "C" { *status = f_file_link(parameter_file_name_micro, parameter_file_path); - if (F_status_is_fine(*status) && data.verbosity == fake_verbosity_verbose) { + if (F_status_is_error_not(*status) && data.verbosity == fake_verbosity_verbose) { printf("Linked file '%s' to '%s'.%c", parameter_file_path, parameter_file_name_micro, f_string_eol[0]); } else if (F_status_is_error(*status)) { @@ -887,7 +887,7 @@ extern "C" { } } - if (F_status_is_fine(*status)) { + if (F_status_is_error_not(*status)) { f_string_length_t parameter_file_path_length = data.path_build_libraries_shared.used + parameter_file_name_length; char parameter_file_path[parameter_file_path_length + 1]; @@ -913,7 +913,7 @@ extern "C" { *status = f_file_link(parameter_file_name_micro, parameter_file_path); } - if (F_status_is_fine(*status) && data.verbosity == fake_verbosity_verbose) { + if (F_status_is_error_not(*status) && data.verbosity == fake_verbosity_verbose) { printf("Linked file '%s' to '", parameter_file_path); if (data_build.setting.version_target == fake_build_version_type_major) { @@ -969,7 +969,7 @@ extern "C" { *status = fll_execute_arguments_add(fake_build_parameter_object_link_arguments, fake_build_parameter_object_link_arguments_length, &arguments); - if (F_status_is_fine(*status)) { + if (F_status_is_error_not(*status)) { f_string_length_t destination_length = data.path_build_libraries_static.used + fake_build_parameter_library_name_prefix_length; destination_length += data_build.setting.project_name.used + fake_build_parameter_library_name_suffix_static_length; @@ -994,7 +994,7 @@ extern "C" { *status = fll_execute_arguments_add(destination, destination_length, &arguments); } - if (F_status_is_fine(*status)) { + if (F_status_is_error_not(*status)) { f_string_length_t source_length = 0; for (f_array_length_t i = 0; i < data_build.setting.build_sources_library.used; i++) { @@ -1067,7 +1067,7 @@ extern "C" { } // for } - if (F_status_is_fine(*status)) { + if (F_status_is_error_not(*status)) { fake_execute(data, data_build.environment, data_build.setting.build_indexer, arguments, status); } @@ -1075,7 +1075,7 @@ extern "C" { f_macro_string_dynamic_t_delete_simple(source_path); f_macro_string_dynamics_t_delete_simple(arguments); - if (F_status_is_fine(*status)) { + if (F_status_is_error_not(*status)) { fake_build_touch(data, file_stage, status); } } @@ -1123,7 +1123,7 @@ extern "C" { f_macro_string_dynamic_t_clear(part); } // for - if (F_status_is_not_error(*status)) { + if (F_status_is_error_not(*status)) { if (names.used + data_build.setting.environment.used > names.size) { if (names.used + data_build.setting.environment.used > f_array_length_t_size) { if (data.verbosity != fake_verbosity_quiet) { @@ -1196,7 +1196,7 @@ extern "C" { } } - if (F_status_is_not_error(*status) && environment->names.used + 1 > environment->names.size) { + if (F_status_is_error_not(*status) && environment->names.used + 1 > environment->names.size) { if (environment->names.size + f_memory_default_allocation_step > f_array_length_t_size) { if (environment->names.size + 1 > f_array_length_t_size) { *status = F_status_set_error(F_buffer_too_large); @@ -1284,7 +1284,7 @@ extern "C" { if (fake_signal_received(data)) { *status = F_status_set_error(F_signal); } - else if (F_status_is_fine(*status)) { + else if (F_status_is_error_not(*status)) { f_string_range_t range = f_macro_string_range_initialize(buffer.used); *status = fll_fss_extended_read(&buffer, &range, &objects, &contents, 0, 0); @@ -1303,7 +1303,7 @@ extern "C" { } // error when required settings are not specified. - if (F_status_is_not_error(*status)) { + if (F_status_is_error_not(*status)) { bool failed = F_false; f_string_static_t *settings[] = { @@ -2411,7 +2411,7 @@ extern "C" { f_macro_string_dynamic_t_delete_simple(destination_path); f_macro_string_dynamics_t_delete_simple(arguments); - if (F_status_is_fine(*status)) { + if (F_status_is_error_not(*status)) { fake_build_touch(data, file_stage, status); } } @@ -2586,7 +2586,7 @@ extern "C" { } // for } - if (F_status_is_fine(*status)) { + if (F_status_is_error_not(*status)) { f_string_length_t parameter_file_name_path_length = data.path_build_programs_shared.used + data_build.setting.project_name.used; char parameter_file_name_path[parameter_file_name_path_length + 1]; @@ -2612,7 +2612,7 @@ extern "C" { } // if project-specific library sources exist, then the -lproject_name needs to be added to the arguments. - if (F_status_is_fine(*status) && data_build.setting.build_sources_library.used > 0) { + if (F_status_is_error_not(*status) && data_build.setting.build_sources_library.used > 0) { f_string_length_t link_project_library_length = fake_build_parameter_library_link_file_length + data_build.setting.project_name.used; char link_project_library[link_project_library_length + 1]; @@ -2637,7 +2637,7 @@ extern "C" { f_macro_string_dynamics_t_delete_simple(arguments); - if (F_status_is_fine(*status)) { + if (F_status_is_error_not(*status)) { fake_build_touch(data, file_stage, status); } } @@ -2687,7 +2687,7 @@ extern "C" { } // for } - if (F_status_is_fine(*status)) { + if (F_status_is_error_not(*status)) { f_string_length_t source_library_length = data.path_build_libraries_static.used + fake_build_parameter_library_name_prefix_length + data_build.setting.project_name.used + fake_build_parameter_library_name_suffix_static_length; char source_library[source_library_length + 1]; @@ -2752,7 +2752,7 @@ extern "C" { f_macro_string_dynamics_t_delete_simple(arguments); - if (F_status_is_fine(*status)) { + if (F_status_is_error_not(*status)) { fake_build_touch(data, file_stage, status); } } diff --git a/level_3/fake/c/private-fake.c b/level_3/fake/c/private-fake.c index e429bc3..298c3e8 100644 --- a/level_3/fake/c/private-fake.c +++ b/level_3/fake/c/private-fake.c @@ -94,7 +94,7 @@ extern "C" { name_function = "f_file_size"; status = f_file_size(path_file, F_true, &size_file); - if (F_status_is_not_error(status)) { + if (F_status_is_error_not(status)) { if (size_file > fake_common_initial_buffer_max) { size_file = fake_common_initial_buffer_max; } @@ -122,7 +122,7 @@ extern "C" { return F_status_set_error(F_signal); } - if (F_status_is_not_error(status)) { + if (F_status_is_error_not(status)) { name_function = "f_file_read"; status = f_file_read(file, buffer); diff --git a/level_3/fake/c/private-make.c b/level_3/fake/c/private-make.c index 6225af7..6585478 100644 --- a/level_3/fake/c/private-make.c +++ b/level_3/fake/c/private-make.c @@ -324,24 +324,24 @@ extern "C" { f_macro_string_map_multis_t_new(*status, data_make->setting_make.parameter, f_memory_default_allocation_step); - if (F_status_is_fine(*status)) { + if (F_status_is_error_not(*status)) { data_make->setting_make.parameter.used = 1; function_name = "fl_string_append"; *status = fl_string_append(fake_make_setting_return, fake_make_setting_return_length, &data_make->setting_make.parameter.array[0].name); } - if (F_status_is_fine(*status)) { + if (F_status_is_error_not(*status)) { function_name = "fl_string_dynamic_terminate_after"; *status = fl_string_dynamic_terminate_after(&data_make->setting_make.parameter.array[0].name); } - if (F_status_is_fine(*status)) { + if (F_status_is_error_not(*status)) { function_name = "f_macro_string_dynamics_new"; f_macro_string_dynamics_new(*status, data_make->setting_make.parameter.array[0].value, 1); } - if (F_status_is_fine(*status)) { + if (F_status_is_error_not(*status)) { function_name = "fl_string_dynamic_terminate_after"; *status = fl_string_dynamic_terminate_after(&data_make->setting_make.parameter.array[0].value.array[0]); } @@ -546,12 +546,12 @@ extern "C" { function_name = "fl_string_dynamic_partial_append_nulless"; *status = fl_string_dynamic_partial_append_nulless(data_make->buffer, settings.contents.array[i].array[j], &data_make->setting_make.parameter.array[0].value.array[0]); - if (F_status_is_fine(*status)) { + if (F_status_is_error_not(*status)) { function_name = "fl_string_dynamic_terminate_after"; *status = fl_string_dynamic_terminate_after(&data_make->setting_make.parameter.array[0].value.array[0]); } - if (F_status_is_fine(*status) && j + 1 < settings.contents.array[i].used) { + if (F_status_is_error_not(*status) && j + 1 < settings.contents.array[i].used) { function_name = "fl_string_append_assure"; *status = fl_string_append_assure(" ", 1, &data_make->setting_make.parameter.array[0].value.array[0]); } @@ -585,7 +585,7 @@ extern "C" { *status = F_status_set_error(F_signal); } - if (F_status_is_fine(*status) && data_make->setting_make.load_build) { + if (F_status_is_error_not(*status) && data_make->setting_make.load_build) { f_string_static_t stub = f_string_static_t_initialize; fake_build_load_setting(data, stub, &data_make->setting_build, status); @@ -606,7 +606,7 @@ extern "C" { *status = fl_string_dynamic_partial_append(data_make->buffer, *range_compiler, &data_make->setting_build.build_compiler); } - if (F_status_is_fine(*status) && range_linker) { + if (F_status_is_error_not(*status) && range_linker) { data_make->setting_build.build_indexer.used = 0; *status = fl_string_dynamic_partial_append(data_make->buffer, *range_linker, &data_make->setting_build.build_indexer); } @@ -627,7 +627,7 @@ extern "C" { fake_build_load_setting_process(data, data.file_data_build_fakefile.string, data_make->buffer, settings.objects, settings.contents, &data_make->setting_build, status); } - if (F_status_is_not_error(*status) && settings.objects.used) { + if (F_status_is_error_not(*status) && settings.objects.used) { const f_string_t settings_name[] = { fake_make_setting_define, fake_make_setting_parameter, @@ -1084,7 +1084,7 @@ extern "C" { else { *status = fl_string_dynamic_partial_append_nulless(data_make->buffer, range, &arguments->array[arguments->used - 1]); - if (F_status_is_fine(*status)) { + if (F_status_is_error_not(*status)) { *status = fl_string_dynamic_terminate_after(&arguments->array[arguments->used - 1]); if (F_status_is_error(*status)) { fake_print_message(data, F_status_set_fine(*status), "fl_string_terminate_after", F_true, data_make->print); @@ -1381,13 +1381,13 @@ extern "C" { else { status = fl_string_dynamics_size_increase(f_memory_default_allocation_step, arguments); - if (F_status_is_fine(status)) { + if (F_status_is_error_not(status)) { status = fl_string_dynamic_append_nulless(value, &arguments->array[arguments->used]); - if (F_status_is_fine(status)) { + if (F_status_is_error_not(status)) { status = fl_string_dynamic_terminate_after(&arguments->array[arguments->used]); - if (F_status_is_fine(status)) { + if (F_status_is_error_not(status)) { arguments->used++; } } @@ -1396,7 +1396,7 @@ extern "C" { f_macro_string_dynamic_t_delete_simple(value); - if (F_status_is_fine(status)) { + if (F_status_is_error_not(status)) { return F_true; } @@ -1437,13 +1437,13 @@ extern "C" { else { status = fl_string_dynamics_size_increase(f_memory_default_allocation_step, arguments); - if (F_status_is_fine(status)) { + if (F_status_is_error_not(status)) { status = fl_string_dynamic_append_nulless(value, &arguments->array[arguments->used]); - if (F_status_is_fine(status)) { + if (F_status_is_error_not(status)) { status = fl_string_dynamic_terminate_after(&arguments->array[arguments->used]); - if (F_status_is_fine(status)) { + if (F_status_is_error_not(status)) { arguments->used++; } } @@ -1452,7 +1452,7 @@ extern "C" { f_macro_string_dynamic_t_delete_simple(value); - if (F_status_is_fine(status)) { + if (F_status_is_error_not(status)) { return F_true; } @@ -1657,7 +1657,7 @@ extern "C" { } } - if (F_status_is_fine(*status)) { + if (F_status_is_error_not(*status)) { operations[i] = operation; fake_make_operate_expand(data, section->name, operation, *operation_name, section->contents.array[i], section->quotedss.array[i], data_make, &arguments[i], status); @@ -1675,7 +1675,7 @@ extern "C" { fake_make_operate_validate(data, section->name, operation, *operation_name, arguments[i], &operation_if, data_make, section_stack, status); - if (F_status_is_fine(*status)) { + if (F_status_is_error_not(*status)) { if (operation_if == fake_make_operation_if_type_false) { operation_if = fake_make_operation_if_type_else_true_next; @@ -1828,7 +1828,7 @@ extern "C" { } // ensure an error is returned during recursion if the last known section operation failed, except for the main operation. - if (success == F_false && F_status_is_fine(*status) && section_stack->used > 1) { + if (success == F_false && F_status_is_error_not(*status) && section_stack->used > 1) { *status = F_status_set_error(F_failure); } @@ -2661,7 +2661,7 @@ extern "C" { status_number = fl_conversion_string_to_number_unsigned(arguments.array[i].string, &number_left, range); } - if (F_status_is_fine(status_number)) { + if (F_status_is_error_not(status_number)) { for (i = 2; i < arguments.used; i++, status_number = F_none, number_left = number_right, is_negative_left = is_negative_right) { if (arguments.array[i].used) { @@ -3174,7 +3174,7 @@ extern "C" { *status = f_file_touch(arguments.array[i].string, mode.regular, F_false); if (F_status_is_error(*status)) { - if (F_status_is_fine(fll_path_canonical(arguments.array[i].string, &data_make->path_cache))) { + if (F_status_is_error_not(fll_path_canonical(arguments.array[i].string, &data_make->path_cache))) { fake_print_message_file(data, F_status_set_fine(*status), "f_file_touch", data_make->path_cache.string, "touch", F_true, F_true, data_make->print); } else { @@ -3188,7 +3188,7 @@ extern "C" { *status = f_directory_touch(arguments.array[i].string, mode.directory); if (F_status_is_error(*status)) { - if (F_status_is_fine(fll_path_canonical(arguments.array[i].string, &data_make->path_cache))) { + if (F_status_is_error_not(fll_path_canonical(arguments.array[i].string, &data_make->path_cache))) { fake_print_message_file(data, F_status_set_fine(*status), "f_directory_touch", data_make->path_cache.string, "touch", F_false, F_true, data_make->print); } else { @@ -3237,7 +3237,7 @@ extern "C" { if (data_make->environment.names.used + 1 > data_make->environment.names.size) { f_macro_string_dynamics_resize(status, data_make->environment.names, data_make->environment.names.size + f_memory_default_allocation_step); - if (F_status_is_not_error(status)) { + if (F_status_is_error_not(status)) { f_macro_string_dynamics_resize(status, data_make->environment.values, data_make->environment.values.size + f_memory_default_allocation_step); } @@ -3365,6 +3365,7 @@ extern "C" { } status2 = fl_string_dynamic_terminate_after(&data_make->setting_make.parameter.array[0].value.array[0]); + if (F_status_is_error(status2)) { *status = status2; @@ -4202,7 +4203,7 @@ extern "C" { *operation_if = fake_make_operation_if_type_false_always_next; - if (F_status_is_fine(*status)) { + if (F_status_is_error_not(*status)) { if (F_status_set_fine(status_file) == F_false) { *status = F_status_set_error(F_failure); } @@ -4225,7 +4226,7 @@ extern "C" { *operation_if = fake_make_operation_if_type_false_always_next; - if (F_status_is_fine(*status)) { + if (F_status_is_error_not(*status)) { *status = F_status_set_error(status_file); } } diff --git a/level_3/fake/c/private-skeleton.c b/level_3/fake/c/private-skeleton.c index f997fa2..ee3a85d 100644 --- a/level_3/fake/c/private-skeleton.c +++ b/level_3/fake/c/private-skeleton.c @@ -70,7 +70,7 @@ extern "C" { status = F_status_set_error(F_signal); } - if (F_status_is_not_error(status)) { + if (F_status_is_error_not(status)) { content.string = fake_make_skeleton_content_defines; content.used = fake_make_skeleton_content_defines_length; content.size = content.used; @@ -80,7 +80,7 @@ extern "C" { content.used = 0; } - if (F_status_is_not_error(status)) { + if (F_status_is_error_not(status)) { content.string = fake_make_skeleton_content_dependencies; content.used = fake_make_skeleton_content_dependencies_length; content.size = content.used; @@ -94,7 +94,7 @@ extern "C" { } } - if (F_status_is_not_error(status)) { + if (F_status_is_error_not(status)) { status = fake_skeleton_operate_file_create(data, file_data_build_process_post, F_true, content); if (fake_signal_received(data)) { @@ -102,7 +102,7 @@ extern "C" { } } - if (F_status_is_not_error(status)) { + if (F_status_is_error_not(status)) { status = fake_skeleton_operate_file_create(data, file_data_build_process_pre, F_true, content); if (fake_signal_received(data)) { @@ -110,7 +110,7 @@ extern "C" { } } - if (F_status_is_not_error(status)) { + if (F_status_is_error_not(status)) { content.string = fake_make_skeleton_content_settings; content.used = fake_make_skeleton_content_settings_length; content.size = content.used; @@ -124,7 +124,7 @@ extern "C" { } } - if (F_status_is_not_error(status)) { + if (F_status_is_error_not(status)) { status = fake_skeleton_operate_file_create(data, data.file_documents_readme, F_false, content); if (fake_signal_received(data)) { @@ -132,7 +132,7 @@ extern "C" { } } - if (F_status_is_not_error(status)) { + if (F_status_is_error_not(status)) { content.string = fake_make_skeleton_content_fakefile; content.used = fake_make_skeleton_content_fakefile_length; content.size = content.used; diff --git a/level_3/firewall/c/firewall.c b/level_3/firewall/c/firewall.c index f4e3f77..1b0ea6c 100644 --- a/level_3/firewall/c/firewall.c +++ b/level_3/firewall/c/firewall.c @@ -215,7 +215,7 @@ extern "C" { fflush(f_type_output); } - if (F_status_is_not_error(status) && show_mangle) { + if (F_status_is_error_not(status) && show_mangle) { fl_color_print(f_type_output, data->context.standout, data->context.reset, "========================== "); fl_color_print(f_type_output, data->context.title, data->context.reset, "MANGLE"); fl_color_print_line(f_type_output, data->context.standout, data->context.reset, " =========================="); @@ -243,7 +243,7 @@ extern "C" { fflush(f_type_output); } - if (F_status_is_not_error(status) && show_ports) { + if (F_status_is_error_not(status) && show_ports) { fl_color_print(f_type_output, data->context.standout, data->context.reset, "========================== "); fl_color_print(f_type_output, data->context.title, data->context.reset, "FILTER"); fl_color_print_line(f_type_output, data->context.standout, data->context.reset, " =========================="); @@ -385,7 +385,7 @@ extern "C" { if (reserved.has_lock) { status = firewall_delete_chains(*data); - if (F_status_is_not_error(status)) { + if (F_status_is_error_not(status)) { status = firewall_default_lock(*data); } @@ -422,7 +422,7 @@ extern "C" { if (reserved.has_stop) { status = firewall_delete_chains(*data); - if (F_status_is_not_error(status)) { + if (F_status_is_error_not(status)) { status = firewall_default_lock(*data); } @@ -473,7 +473,7 @@ extern "C" { if (command == firewall_parameter_command_start) { status = firewall_delete_chains(*data); - if (F_status_is_not_error(status)) { + if (F_status_is_error_not(status)) { status = firewall_default_lock(*data); } diff --git a/level_3/firewall/c/private-firewall.c b/level_3/firewall/c/private-firewall.c index 628422e..e5817cf 100644 --- a/level_3/firewall/c/private-firewall.c +++ b/level_3/firewall/c/private-firewall.c @@ -1056,7 +1056,7 @@ f_return_status firewall_create_custom_chains(firewall_reserved_chains_t *reserv tool = firewall_program_iptables; status = fll_execute_program((f_string_t) firewall_tool_iptables, arguments, 0, &results); - if (F_status_is_not_error(status)) { + if (F_status_is_error_not(status)) { // print command when debugging. #ifdef _en_firewall_debug_ if (data->parameters[firewall_parameter_debug].result == f_console_result_found) { @@ -1433,7 +1433,7 @@ f_return_status firewall_process_rules(f_string_range_t *range, firewall_local_d status = fll_fss_extended_read(&local->buffer, range, &local->rule_objects, &local->rule_contents, 0, 0); - if (F_status_is_not_error(status)) { + if (F_status_is_error_not(status)) { status = firewall_perform_commands(*local, *data); if (F_status_is_error(status)) { diff --git a/level_3/init/c/private-init.c b/level_3/init/c/private-init.c index abde7fb..df24d72 100644 --- a/level_3/init/c/private-init.c +++ b/level_3/init/c/private-init.c @@ -100,7 +100,7 @@ // @todo: resume replacing code below. status = fll_fss_extended_read(&buffer, input, &local->rule_objects, &local->rule_contents, 0, 0); - if (F_status_is_not_error(status)) { + if (F_status_is_error_not(status)) { //status = init_perform_commands(*local, *data); // @fixme if (F_status_is_error(status)) { @@ -544,7 +544,7 @@ status = fll_fss_extended_read(buffer, location, objects, contents, 0, 0); - if (F_status_is_not_error(status)) { + if (F_status_is_error_not(status)) { // @todo: process objects and contents. // execute individual processes. -- 1.8.3.1