From: Kevin Day Date: Sun, 23 Oct 2022 03:50:02 +0000 (-0500) Subject: Update: Should be using f_file_stream_flush() instead of fflush(). X-Git-Url: https://git.kevux.org/?a=commitdiff_plain;h=17ef94f50988d2a31bc130a2f99469088a487220;p=fll Update: Should be using f_file_stream_flush() instead of fflush(). There is a f_file_stream_flush() function that should be used instead of fflush(). --- diff --git a/level_1/fl_control_group/c/control_group.h b/level_1/fl_control_group/c/control_group.h index 9e6409e..16c1407 100644 --- a/level_1/fl_control_group/c/control_group.h +++ b/level_1/fl_control_group/c/control_group.h @@ -56,11 +56,11 @@ extern "C" { * Errors (with error bit) from: f_file_stream_open(). * * @see fprintf() - * @see fflush() * @see memcpy() * @see unshare() * * @see f_file_stream_close() + * @see f_file_stream_flush() * @see f_file_stream_open() */ #ifndef _di_fl_control_group_apply_ diff --git a/level_3/byte_dump/c/byte_dump.c b/level_3/byte_dump/c/byte_dump.c index 52f1082..855b679 100644 --- a/level_3/byte_dump/c/byte_dump.c +++ b/level_3/byte_dump/c/byte_dump.c @@ -295,7 +295,7 @@ extern "C" { file.id = F_type_descriptor_input_d; file.stream = F_type_input_d; - flockfile(main->output.to.stream); + f_file_stream_lock(main->output.to); f_print_dynamic_raw(f_string_eol_s, main->output.to); fl_print_format("%[Piped " BYTE_DUMP_program_name_long_s ": (in ", main->output.to, main->context.set.title); @@ -318,7 +318,7 @@ extern "C" { fl_print_format(")%]%r", main->output.to, main->context.set.title, f_string_eol_s); - funlockfile(main->output.to.stream); + f_file_stream_unlock(main->output.to); status = byte_dump_file(&data, f_string_empty_s, file); @@ -371,7 +371,7 @@ extern "C" { return status; } - flockfile(main->output.to.stream); + f_file_stream_lock(main->output.to); fl_print_format("%r%[" BYTE_DUMP_program_name_long_s " of: %]%[", main->output.to, f_string_eol_s, main->context.set.title, main->context.set.title, main->context.set.notable); fl_print_format("%Q%] %[(in ", main->output.to, data.argv[main->parameters.remaining.array[counter]], main->context.set.notable, main->context.set.title); @@ -394,7 +394,7 @@ extern "C" { fl_print_format(")%]%r", main->output.to, main->context.set.title, f_string_eol_s); - funlockfile(main->output.to.stream); + f_file_stream_unlock(main->output.to); status = byte_dump_file(&data, data.argv[main->parameters.remaining.array[counter]], file); diff --git a/level_3/byte_dump/c/private-byte_dump.c b/level_3/byte_dump/c/private-byte_dump.c index fa9e3c0..ae910e2 100644 --- a/level_3/byte_dump/c/private-byte_dump.c +++ b/level_3/byte_dump/c/private-byte_dump.c @@ -137,7 +137,7 @@ extern "C" { } } - flockfile(data->main->output.to); + f_file_stream_lock(data->main->output); if (byte_dump_print_character_fragment(data, sequence, invalid, width_utf, 1, &previous, &cell, &offset) == F_true) { character_reset = F_true; @@ -164,7 +164,7 @@ extern "C" { position += width_utf; if (position >= data->last) { - funlockfile(data->main->output.to); + f_file_stream_unlock(data->main->output); break; } @@ -174,19 +174,19 @@ extern "C" { ++position; if (position >= data->last) { - funlockfile(data->main->output.to); + f_file_stream_unlock(data->main->output); break; } } - funlockfile(data->main->output.to); + f_file_stream_unlock(data->main->output); width_utf = -1; } // for } - flockfile(data->main->output.to); + f_file_stream_lock(data->main->output); // Print placeholders to fill out the remaining line and then optionally print the text block. if (cell.column && cell.column < data->width) { @@ -308,38 +308,38 @@ extern "C" { f_print_dynamic_raw(f_string_eol_s, data->main->output.to); - funlockfile(data->main->output.to); + f_file_stream_unlock(data->main->output); // Make sure to flush standard out to help prevent standard error from causing problems. - fflush(data->main->output.to); + f_file_stream_flush(data->main->output.to); if (found_invalid_utf) { if (data->main->error.verbosity > f_console_verbosity_quiet_e) { - flockfile(data->main->error.to); + f_file_stream_lock(data->main->error); fl_print_format("%[Invalid UTF-8 codes were detected for file '%]", data->main->error.to, data->main->context.set.error, data->main->context.set.error); fl_print_format("%[%Q%]", data->main->error.to, data->main->context.set.notable, file_name.used ? file_name : f_string_ascii_minus_s, data->main->context.set.notable); fl_print_format("%['.%]%r%r", data->main->error.to, data->main->context.set.error, data->main->context.set.error, f_string_eol_s, f_string_eol_s); - funlockfile(data->main->error.to); + f_file_stream_unlock(data->main->error); } } if (ferror(file.stream)) { if (data->main->error.verbosity > f_console_verbosity_quiet_e) { - flockfile(data->main->error.to); + f_file_stream_lock(data->main->error); fl_print_format("%[%Qread() failed for '%]", data->main->error.to, data->main->context.set.error, data->main->error.prefix, data->main->context.set.error); fl_print_format("%[%Q%]", data->main->error.to, data->main->context.set.notable, file_name.used ? file_name : f_string_ascii_minus_s, data->main->context.set.notable); fl_print_format("%['.%]%r%r", data->main->error.to, data->main->context.set.error, data->main->context.set.error, f_string_eol_s, f_string_eol_s); - funlockfile(data->main->error.to); + f_file_stream_unlock(data->main->error); } status = F_status_set_error(F_failure); } - fflush(data->main->error.to); + f_file_stream_flush(data->main->error.to); return status; } diff --git a/level_3/control/c/control.c b/level_3/control/c/control.c index 9979891..a1dec4f 100644 --- a/level_3/control/c/control.c +++ b/level_3/control/c/control.c @@ -200,7 +200,7 @@ extern "C" { if (main->output.verbosity != f_console_verbosity_quiet_e) { if (F_status_is_error(status)) { f_file_stream_flush(main->output.to); - fflush(main->error.to); + f_file_stream_flush(main->error.to); fll_print_dynamic_raw(f_string_eol_s, main->output.to); } diff --git a/level_3/control/c/private-print.c b/level_3/control/c/private-print.c index 937d4f3..6de0f1f 100644 --- a/level_3/control/c/private-print.c +++ b/level_3/control/c/private-print.c @@ -37,20 +37,20 @@ extern "C" { if (header.status == F_busy) { if (main->warning.verbosity == f_console_verbosity_quiet_e) return; - flockfile(main->warning.to.stream); + f_file_stream_lock(main->warning.to); fl_print_format("%r%[%QThe action '%]", main->warning.to, f_string_eol_s, main->context.set.warning, main->warning.prefix, main->context.set.warning); fl_print_format("%[%q%]", main->warning.to, main->context.set.notable, control_action_type_name(header.action), main->context.set.notable); fl_print_format("%[' could not be performed because the service is busy.%]%r", main->warning.to, main->context.set.warning, main->context.set.warning, f_string_eol_s); - funlockfile(main->warning.to.stream); + f_file_stream_unlock(main->warning.to); return; } if (main->output.verbosity == f_console_verbosity_quiet_e) return; - flockfile(main->output.to.stream); + f_file_stream_lock(main->output.to); fl_print_format("%rThe action '", main->output.to, f_string_eol_s); fl_print_format("%[%q%]", main->output.to, main->context.set.notable, control_action_type_name(header.action), main->context.set.notable); @@ -69,7 +69,7 @@ extern "C" { fl_print_format(".%r", main->output.to, f_string_eol_s); } - funlockfile(main->output.to.stream); + f_file_stream_unlock(main->output.to); } #endif // _di_control_print_controller_packet_response_ @@ -78,12 +78,12 @@ extern "C" { if (main->output.verbosity == f_console_verbosity_debug_e) return; - flockfile(main->output.to.stream); + f_file_stream_lock(main->output.to); fl_print_format("%rPacket header Object '%[%Q%]", main->output.to, f_string_eol_s, main->context.set.notable, object, main->context.set.notable); fl_print_format("' has value '%[%/Q%]'.%r", main->output.to, main->context.set.notable, content, content_range, main->context.set.notable, f_string_eol_s); - funlockfile(main->output.to.stream); + f_file_stream_unlock(main->output.to); } #endif // _di_control_print_debug_packet_header_object_and_content_ @@ -92,7 +92,7 @@ extern "C" { if (main->output.verbosity == f_console_verbosity_debug_e) return; - flockfile(main->output.to.stream); + f_file_stream_lock(main->output.to); fl_print_format("%r%s", main->output.to, f_string_eol_s, message, main->context.set.notable, main->context.set.notable); @@ -111,7 +111,7 @@ extern "C" { fl_print_format(".%r", main->output.to, f_string_eol_s); - funlockfile(main->output.to.stream); + f_file_stream_unlock(main->output.to); } #endif // _di_control_print_debug_packet_message_ @@ -412,13 +412,13 @@ extern "C" { if (main->warning.verbosity == f_console_verbosity_debug_e) return; - flockfile(main->warning.to.stream); + f_file_stream_lock(main->warning.to); fl_print_format("%r%[%QThe received response header '%]", main->warning.to, f_string_eol_s, main->context.set.warning, main->warning.prefix, main->context.set.warning); fl_print_format("%[%Q%]", main->warning.to, main->context.set.notable, response_header, main->context.set.notable); fl_print_format("%[' is repeated.%]%r", main->warning.to, main->context.set.warning, main->context.set.warning, f_string_eol_s); - funlockfile(main->warning.to.stream); + f_file_stream_unlock(main->warning.to); } #endif // _di_control_print_warning_packet_header_duplicate_object_ @@ -427,7 +427,7 @@ extern "C" { if (main->warning.verbosity == f_console_verbosity_debug_e) return; - flockfile(main->warning.to.stream); + f_file_stream_lock(main->warning.to); fl_print_format("%r%[%QFailed while calling f_status_string_to() for status%] ", main->output.to, f_string_eol_s, main->context.set.warning, main->context.set.warning, main->context.set.warning); fl_print_format("%[%ui%]", main->output.to, main->context.set.notable, status_of, main->context.set.notable); @@ -435,7 +435,7 @@ extern "C" { fl_print_format("%[%ui%]", main->output.to, main->context.set.notable, status_error, main->context.set.notable); fl_print_format("%[.%]%r", main->output.to, main->context.set.warning, main->context.set.warning, f_string_eol_s); - funlockfile(main->warning.to.stream); + f_file_stream_unlock(main->warning.to); } #endif // _di_control_print_warning_packet_process_string_to_failed_ diff --git a/level_3/controller/c/controller/private-controller.c b/level_3/controller/c/controller/private-controller.c index d284149..020a669 100644 --- a/level_3/controller/c/controller/private-controller.c +++ b/level_3/controller/c/controller/private-controller.c @@ -439,7 +439,7 @@ extern "C" { controller_print_error_file(0, global->main->error, F_status_set_fine(status), "controller_file_pid_create", F_true, global->setting->path_pid, f_file_operation_create_s, fll_error_file_type_file_e); - flockfile(global->main->error.to); + f_file_stream_lock(global->main->error.to); controller_entry_print_error_cache(is_entry, global->main->error, cache->action); diff --git a/level_3/controller/c/entry/private-entry.c b/level_3/controller/c/entry/private-entry.c index 4e6992e..406edb8 100644 --- a/level_3/controller/c/entry/private-entry.c +++ b/level_3/controller/c/entry/private-entry.c @@ -260,7 +260,7 @@ extern "C" { if (global.main->error.verbosity > f_console_verbosity_quiet_e) { f_thread_mutex_lock(&global.thread->lock.print); - flockfile(global.main->error.to); + f_file_stream_lock(global.main->error.to); fl_print_format("%r%[%QThe %r item action '%]", global.main->error.to, f_string_eol_s, global.main->error.context, global.main->error.prefix, is_entry ? controller_entry_s : controller_exit_s, global.main->error.context); fl_print_format("%[%Q%]", global.main->error.to, global.main->error.notable, cache->action.name_action, global.main->error.notable); @@ -286,7 +286,7 @@ extern "C" { } } - funlockfile(global.main->error.to); + f_file_stream_unlock(global.main->error.to); f_thread_mutex_unlock(&global.thread->lock.print); } @@ -401,7 +401,7 @@ extern "C" { else { if (fl_string_dynamic_compare(action->parameters.array[1], cache->buffer_path) == F_equal_to_not) { if (global.main->error.verbosity > f_console_verbosity_quiet_e) { - flockfile(global.main->error.to); + f_file_stream_lock(global.main->error.to); fl_print_format("%r%[%QThe %r item action second parameter '%]", global.main->error.to, f_string_eol_s, global.main->error.context, global.main->error.prefix, is_entry ? controller_entry_s : controller_exit_s, global.main->error.context); fl_print_format("%[%Q%]", global.main->error.to, global.main->error.notable, action->parameters.array[1], global.main->error.notable); @@ -409,7 +409,7 @@ extern "C" { fl_print_format("%[%Q%]", global.main->error.to, global.main->error.notable, cache->buffer_path, global.main->error.notable); fl_print_format("%['.%]", global.main->error.to, global.main->error.context, global.main->error.context, f_string_eol_s); - funlockfile(global.main->error.to); + f_file_stream_unlock(global.main->error.to); } action->status = F_status_set_error(F_parameter); @@ -453,7 +453,7 @@ extern "C" { } if (global.main->error.verbosity > f_console_verbosity_quiet_e) { - flockfile(global.main->error.to); + f_file_stream_lock(global.main->error.to); fl_print_format("%r%[%QThe %r item action third parameter (and beyond) must be one of '%]", global.main->error.to, f_string_eol_s, global.main->error.context, global.main->error.prefix, is_entry ? controller_entry_s : controller_exit_s, global.main->error.context); fl_print_format("%[%r%]", global.main->error.to, global.main->error.notable, controller_asynchronous_s, global.main->error.notable); @@ -465,7 +465,7 @@ extern "C" { fl_print_format("%[%Q%]", global.main->error.to, global.main->error.notable, action->parameters.array[j], global.main->error.notable); fl_print_format("%['.%]", global.main->error.to, global.main->error.context, global.main->error.context, f_string_eol_s); - funlockfile(global.main->error.to); + f_file_stream_unlock(global.main->error.to); } } } // for @@ -479,13 +479,13 @@ extern "C" { } if (global.main->error.verbosity > f_console_verbosity_quiet_e) { - flockfile(global.main->error.to); + f_file_stream_lock(global.main->error.to); fl_print_format("%r%[%QThe %r item action may not specify the reserved item '%]", global.main->error.to, f_string_eol_s, global.main->error.context, global.main->error.prefix, is_entry ? controller_entry_s : controller_exit_s, global.main->error.context); fl_print_format("%[%r%]", global.main->error.to, global.main->error.notable, controller_main_s, global.main->error.notable); fl_print_format("%['.%]", global.main->error.to, global.main->error.context, global.main->error.context, f_string_eol_s); - funlockfile(global.main->error.to); + f_file_stream_unlock(global.main->error.to); } } } @@ -508,7 +508,7 @@ extern "C" { } if (global.main->error.verbosity > f_console_verbosity_quiet_e) { - flockfile(global.main->error.to); + f_file_stream_lock(global.main->error.to); fl_print_format("%r%[%QThe %r item action must have one of '%]", global.main->error.to, f_string_eol_s, global.main->error.context, global.main->error.prefix, is_entry ? controller_entry_s : controller_exit_s, global.main->error.context); fl_print_format("%[%r%]", global.main->error.to, global.main->error.notable, controller_kill_s, global.main->error.notable); @@ -520,7 +520,7 @@ extern "C" { fl_print_format("%[%Q%]", global.main->error.to, global.main->error.notable, action->parameters.array[0], global.main->error.notable); fl_print_format("%['.%]", global.main->error.to, global.main->error.context, global.main->error.context, f_string_eol_s); - funlockfile(global.main->error.to); + f_file_stream_unlock(global.main->error.to); } } @@ -551,13 +551,13 @@ extern "C" { } if (global.main->error.verbosity > f_console_verbosity_quiet_e) { - flockfile(global.main->error.to); + f_file_stream_lock(global.main->error.to); fl_print_format("%r%[%QThe %r item action parameter '%]", global.main->error.to, f_string_eol_s, global.main->error.context, global.main->error.prefix, is_entry ? controller_entry_s : controller_exit_s, global.main->error.context); fl_print_format("%[%Q%]", global.main->error.to, global.main->error.notable, action->parameters.array[1], global.main->error.notable); fl_print_format("%[' is not a valid supported number.%]", global.main->error.to, global.main->error.context, global.main->error.context, f_string_eol_s); - funlockfile(global.main->error.to); + f_file_stream_unlock(global.main->error.to); } } } @@ -575,7 +575,7 @@ extern "C" { action->status = F_status_set_error(F_supported_not); if (global.main->error.verbosity > f_console_verbosity_quiet_e) { - flockfile(global.main->error.to); + f_file_stream_lock(global.main->error.to); fl_print_format("%r%[%QThe %r item action may only have '%]", global.main->error.to, f_string_eol_s, global.main->error.context, global.main->error.prefix, is_entry ? controller_entry_s : controller_exit_s, global.main->error.context); fl_print_format("%[%r%]", global.main->error.to, global.main->error.notable, controller_wait_s, global.main->error.notable); @@ -583,7 +583,7 @@ extern "C" { fl_print_format("%[%Q%]", global.main->error.to, global.main->error.notable, action->parameters.array[0], global.main->error.notable); fl_print_format("%['.%]", global.main->error.to, global.main->error.context, global.main->error.context, f_string_eol_s); - funlockfile(global.main->error.to); + f_file_stream_unlock(global.main->error.to); } } } @@ -2276,13 +2276,13 @@ extern "C" { } if (global.main->error.verbosity > f_console_verbosity_quiet_e) { - flockfile(global.main->error.to); + f_file_stream_lock(global.main->error.to); fl_print_format("%r%[%QThe %r setting '%]", global.main->error.to, f_string_eol_s, global.main->error.context, global.main->error.prefix, is_entry ? controller_entry_s : controller_exit_s, global.main->error.context); fl_print_format("%[%/Q%]", global.main->error.to, global.main->error.notable, cache->buffer_file, cache->content_actions.array[i].array[1], global.main->error.notable); fl_print_format("%[' is not a valid supported number.%]", global.main->error.to, global.main->error.context, global.main->error.context, f_string_eol_s); - funlockfile(global.main->error.to); + f_file_stream_unlock(global.main->error.to); } } } diff --git a/level_3/controller/c/entry/private-entry_print.c b/level_3/controller/c/entry/private-entry_print.c index 1bd01e6..e298d4f 100644 --- a/level_3/controller/c/entry/private-entry_print.c +++ b/level_3/controller/c/entry/private-entry_print.c @@ -69,7 +69,7 @@ extern "C" { fll_error_print(print, status, function, fallback); - flockfile(print.to.stream); + f_file_stream_lock(print.to); controller_entry_print_error_cache(is_entry, print, cache); @@ -118,7 +118,7 @@ extern "C" { fll_error_file_print(print, status, function, fallback, name, operation, type); - flockfile(print.to.stream); + f_file_stream_lock(print.to); controller_entry_print_error_cache(is_entry, print, cache); diff --git a/level_3/controller/c/lock/private-lock_print.h b/level_3/controller/c/lock/private-lock_print.h index e21d9b1..019ec58 100644 --- a/level_3/controller/c/lock/private-lock_print.h +++ b/level_3/controller/c/lock/private-lock_print.h @@ -42,8 +42,7 @@ extern "C" { * @param thread * The thread containing the print mutex to lock. * - * @see flockfile() - * + * @see f_file_stream_lock() * @see f_thread_mutex_unlock() */ #ifndef _di_controller_lock_print_ @@ -65,7 +64,7 @@ extern "C" { * @param thread * The thread containing the print mutex to unlock. * - * @see funlockfile() + * @see f_file_stream_unlock() * * @see f_thread_mutex_unlock() */ diff --git a/level_3/controller/c/rule/private-rule_print.c b/level_3/controller/c/rule/private-rule_print.c index 1ea863e..5751eae 100644 --- a/level_3/controller/c/rule/private-rule_print.c +++ b/level_3/controller/c/rule/private-rule_print.c @@ -21,7 +21,7 @@ extern "C" { fll_error_print(print, status, function, fallback); - flockfile(print.to.stream); + f_file_stream_lock(print.to); controller_rule_print_error_cache(print, cache, item); @@ -71,7 +71,7 @@ extern "C" { controller_rule_print_error_cache(print, cache, item); - flockfile(print.to.stream); + f_file_stream_lock(print.to); controller_unlock_print_flush(print.to, thread); } diff --git a/level_3/fake/c/private-build-load.c b/level_3/fake/c/private-build-load.c index 205bd80..99ab4b4 100644 --- a/level_3/fake/c/private-build-load.c +++ b/level_3/fake/c/private-build-load.c @@ -44,7 +44,7 @@ extern "C" { if (environment->used + data_build->setting.environment.used > environment->size) { if (environment->used + data_build->setting.environment.used > f_environment_max_length) { if (data->main->error.verbosity > f_console_verbosity_quiet_e) { - flockfile(data->main->error.to); + f_file_stream_lock(data->main->error); fl_print_format("%r%[%QThe values for the setting '%]", data->main->error.to, f_string_eol_s, data->main->error.context, data->main->error.prefix, data->main->error.context); fl_print_format("%[%r%]", data->main->error.to, data->main->error.notable, fake_build_setting_name_environment_s, data->main->error.notable); @@ -52,7 +52,7 @@ extern "C" { fl_print_format("%[%r%]", data->main->error.to, data->main->error.notable, fake_build_setting_name_environment_s, data->main->error.notable); fl_print_format("%[' is too large.%]%r", data->main->error.to, data->main->error.context, data->main->error.context, f_string_eol_s); - flockfile(data->main->error.to); + f_file_stream_lock(data->main->error); } *status = F_status_set_error(F_array_too_large); @@ -185,7 +185,7 @@ extern "C" { for (uint8_t i = 0; i < 1; ++i) { if (!settings[i]->used) { - flockfile(data->main->error.to); + f_file_stream_lock(data->main->error); fl_print_format("%r%[%QThe setting '%]", data->main->error.to, f_string_eol_s, data->main->error.context, data->main->error.prefix, data->main->error.context); fl_print_format("%[%Q%]", data->main->error.to, data->main->error.notable, names[i], data->main->error.notable); @@ -193,7 +193,7 @@ extern "C" { fl_print_format("%[%Q%]", data->main->error.to, data->main->error.notable, path_file, data->main->error.notable); fl_print_format("%['.%]%r", data->main->error.to, data->main->error.context, data->main->error.context, f_string_eol_s); - funlockfile(data->main->error.to); + f_file_stream_unlock(data->main->error); failed = F_true; } @@ -580,7 +580,7 @@ extern "C" { if (found == F_false) { if (data->main->error.verbosity > f_console_verbosity_quiet_e) { - flockfile(data->main->error.to); + f_file_stream_lock(data->main->error); fl_print_format("%r%[%QThe specified mode '%]", data->main->error.to, f_string_eol_s, data->main->error.context, data->main->error.prefix, data->main->error.context); fl_print_format("%[%Q%]", data->main->error.to, data->main->error.notable, modes->array[i], data->main->error.notable); @@ -588,7 +588,7 @@ extern "C" { fl_print_format("%[%Q%]", data->main->error.to, data->main->error.notable, path_file, data->main->error.notable); fl_print_format("%['.%]%r", data->main->error.to, data->main->error.context, data->main->error.context, f_string_eol_s); - funlockfile(data->main->error.to); + f_file_stream_unlock(data->main->error); } error_printed = F_true; @@ -674,13 +674,13 @@ extern "C" { if (F_status_is_error(*status)) { if (*status == F_status_set_error(F_string_too_large)) { if (data->main->error.verbosity > f_console_verbosity_quiet_e) { - funlockfile(data->main->error.to); + f_file_stream_unlock(data->main->error); fl_print_format("%r%[%QA setting in the file '%]", data->main->error.to, f_string_eol_s, data->main->error.context, data->main->error.prefix, data->main->error.context); fl_print_format("%[%Q%]", data->main->error.to, data->main->error.notable, path_file, data->main->error.notable); fl_print_format("%[' is too long.%]%r", data->main->error.to, data->main->error.context, data->main->error.context, f_string_eol_s); - funlockfile(data->main->error.to); + f_file_stream_unlock(data->main->error); } } else if (!error_printed) { @@ -1143,7 +1143,7 @@ extern "C" { *settings_single_bool[i] = F_true; if (data->main->warning.verbosity >= f_console_verbosity_verbose_e) { - flockfile(data->main->warning.to); + f_file_stream_lock(data->main->warning); fl_print_format("%r%[%QThe setting '%]", data->main->warning.to, f_string_eol_s, data->main->warning.context, data->main->warning.prefix, data->main->warning.context); fl_print_format("%[%r%]", data->main->warning.to, data->main->warning.notable, settings_single_name[i], data->main->warning.notable); @@ -1157,7 +1157,7 @@ extern "C" { fl_print_format("%[%r%]", data->main->warning.to, data->main->warning.notable, fake_common_setting_bool_yes_s, data->main->warning.notable); fl_print_format("%['.%]%r", data->main->warning.to, data->main->warning.context, data->main->warning.context, f_string_eol_s); - funlockfile(data->main->warning.to); + f_file_stream_unlock(data->main->warning); } } } @@ -1175,7 +1175,7 @@ extern "C" { *settings_single_language[i] = fake_build_language_type_c_e; if (data->main->warning.verbosity >= f_console_verbosity_verbose_e) { - flockfile(data->main->warning.to); + f_file_stream_lock(data->main->warning); fl_print_format("%r%[%QThe setting '%]", data->main->warning.to, f_string_eol_s, data->main->warning.context, data->main->warning.prefix, data->main->warning.context); fl_print_format("%[%r%]", data->main->warning.to, data->main->warning.notable, settings_single_name[i], data->main->warning.notable); @@ -1191,7 +1191,7 @@ extern "C" { fl_print_format("%[%r%]", data->main->warning.to, data->main->warning.notable, fake_build_language_c_s, data->main->warning.notable); fl_print_format("%['.%]%r", data->main->warning.to, data->main->warning.context, data->main->warning.context, f_string_eol_s); - funlockfile(data->main->warning.to); + f_file_stream_unlock(data->main->warning); } } } @@ -1212,7 +1212,7 @@ extern "C" { *settings_single_version[i] = settings_single_version_default[i]; if (data->main->warning.verbosity >= f_console_verbosity_verbose_e) { - flockfile(data->main->warning.to); + f_file_stream_lock(data->main->warning); fl_print_format("%r%[%QThe setting '%]", data->main->warning.to, f_string_eol_s, data->main->warning.context, data->main->warning.prefix, data->main->warning.context); fl_print_format("%[%r%]", data->main->warning.to, data->main->warning.notable, settings_single_name[i], data->main->warning.notable); @@ -1230,7 +1230,7 @@ extern "C" { fl_print_format("%[%r%]", data->main->warning.to, data->main->warning.notable, settings_single_version_default_name[i], data->main->warning.notable); fl_print_format("%['.%]%r", data->main->warning.to, data->main->warning.context, data->main->warning.context, f_string_eol_s); - funlockfile(data->main->warning.to); + f_file_stream_unlock(data->main->warning); } } } @@ -1273,7 +1273,7 @@ extern "C" { setting->version_file = fake_build_version_type_micro_e; if (data->main->warning.verbosity >= f_console_verbosity_verbose_e) { - flockfile(data->main->warning.to); + f_file_stream_lock(data->main->warning); fl_print_format("%r%[%QThe setting '%]", data->main->warning.to, f_string_eol_s, data->main->warning.context, data->main->warning.prefix, data->main->warning.context); fl_print_format("%[%r%]", data->main->warning.to, data->main->warning.notable, fake_build_setting_name_version_file_s, data->main->warning.notable); @@ -1283,7 +1283,7 @@ extern "C" { fl_print_format("%[%r%]", data->main->warning.to, data->main->warning.notable, fake_build_version_micro_s, data->main->warning.notable); fl_print_format("%['.%]%r", data->main->warning.to, data->main->warning.context, data->main->warning.context, f_string_eol_s); - funlockfile(data->main->warning.to); + f_file_stream_unlock(data->main->warning); } } @@ -1291,7 +1291,7 @@ extern "C" { setting->version_target = fake_build_version_type_major_e; if (data->main->warning.verbosity >= f_console_verbosity_verbose_e) { - flockfile(data->main->warning.to); + f_file_stream_lock(data->main->warning); fl_print_format("%r%[%QThe setting '%]", data->main->warning.to, f_string_eol_s, data->main->warning.context, data->main->warning.prefix, data->main->warning.context); fl_print_format("%[%r%]", data->main->warning.to, data->main->warning.notable, fake_build_setting_name_version_target_s, data->main->warning.notable); @@ -1301,7 +1301,7 @@ extern "C" { fl_print_format("%[%r%]", data->main->warning.to, data->main->warning.notable, fake_build_version_major_s, data->main->warning.notable); fl_print_format("%['.%]%r", data->main->warning.to, data->main->warning.context, data->main->warning.context, f_string_eol_s); - funlockfile(data->main->warning.to); + f_file_stream_unlock(data->main->warning); } } } @@ -1377,7 +1377,7 @@ extern "C" { } if (data->main->error.verbosity > f_console_verbosity_quiet_e) { - flockfile(data->main->error.to); + f_file_stream_lock(data->main->error); fl_print_format("%r%[%QThe parameters '%]", data->main->error.to, f_string_eol_s, data->main->error.context, data->main->error.prefix, data->main->error.context); fl_print_format("%[%r%r%]", data->main->error.to, data->main->error.notable, f_console_symbol_long_enable_s, fake_long_shared_disabled_s, data->main->error.notable); @@ -1387,7 +1387,7 @@ extern "C" { fl_print_format("%[%r%r%]", data->main->error.to, data->main->error.notable, f_console_symbol_long_enable_s, setting->build_shared ? fake_long_shared_enabled_s : fake_long_shared_disabled_s, data->main->error.notable); fl_print_format("%['.%]%r", data->main->error.to, data->main->error.context, data->main->error.context, f_string_eol_s); - funlockfile(data->main->error.to); + f_file_stream_unlock(data->main->error); } } else { @@ -1412,7 +1412,7 @@ extern "C" { } if (data->main->error.verbosity >= f_console_verbosity_verbose_e) { - flockfile(data->main->error.to); + f_file_stream_lock(data->main->error); fl_print_format("%r%[%QThe parameters '%]", data->main->error.to, f_string_eol_s, data->main->error.context, data->main->error.prefix, data->main->error.context); fl_print_format("%[%r%r%]", data->main->error.to, data->main->error.notable, f_console_symbol_long_enable_s, fake_long_static_disabled_s, data->main->error.notable); @@ -1422,7 +1422,7 @@ extern "C" { fl_print_format("%[%r%r%]", data->main->error.to, data->main->error.notable, f_console_symbol_long_enable_s, setting->build_static ? fake_long_static_enabled_s : fake_long_static_disabled_s, data->main->error.notable); fl_print_format("%['.%]%r", data->main->error.to, data->main->error.context, data->main->error.context, f_string_eol_s); - funlockfile(data->main->error.to); + f_file_stream_unlock(data->main->error); } } else { @@ -1438,7 +1438,7 @@ extern "C" { if (setting->build_language == fake_build_language_type_c_e || setting->build_language == fake_build_language_type_cpp_e) { if (setting->build_shared == F_false && setting->build_static == F_false) { if (data->main->error.verbosity > f_console_verbosity_quiet_e) { - flockfile(data->main->error.to); + f_file_stream_lock(data->main->error); fl_print_format("%r%[%QThe build settings '%]", data->main->error.to, f_string_eol_s, data->main->error.context, data->main->error.prefix, data->main->error.context); fl_print_format("%[%r%]", data->main->error.to, data->main->error.notable, fake_build_setting_name_build_shared_s, data->main->error.notable); @@ -1448,7 +1448,7 @@ extern "C" { fl_print_format("%[%r%]", data->main->error.to, data->main->error.notable, setting->build_language == fake_build_language_type_c_e ? fake_build_language_c_s : fake_build_language_cpp_s, data->main->error.notable); fl_print_format("%['.%]%r", data->main->error.to, data->main->error.context, data->main->error.context, f_string_eol_s); - funlockfile(data->main->error.to); + f_file_stream_unlock(data->main->error); } *status = F_status_set_error(F_failure); diff --git a/level_3/fake/c/private-build-objects.c b/level_3/fake/c/private-build-objects.c index 8ba9ddc..94d3be3 100644 --- a/level_3/fake/c/private-build-objects.c +++ b/level_3/fake/c/private-build-objects.c @@ -102,13 +102,13 @@ extern "C" { if (*status == F_false) { if (data->main->error.verbosity > f_console_verbosity_quiet_e) { - flockfile(data->main->error.to); + f_file_stream_lock(data->main->error); fl_print_format("%r%[%QThe path '%]", data->main->error.to, f_string_eol_s, data->main->error.context, data->main->error.prefix, data->main->error.context); fl_print_format("%[%Q%]", data->main->error.to, data->main->error.notable, destination_path, data->main->error.notable); fl_print_format("%[' exists but is not a directory.%]%r", data->main->error.to, data->main->error.context, data->main->error.context, f_string_eol_s); - funlockfile(data->main->error.to); + f_file_stream_unlock(data->main->error); } *status = F_status_set_error(F_failure); @@ -121,13 +121,13 @@ extern "C" { if (F_status_is_error(*status)) { if (F_status_set_fine(*status) == F_file_found_not) { - flockfile(data->main->error.to); + f_file_stream_lock(data->main->error); fl_print_format("%r%[%QThe path '%]", data->main->error.to, f_string_eol_s, data->main->error.context, data->main->error.prefix, data->main->error.context); fl_print_format("%[%Q%]", data->main->error.to, data->main->error.notable, destination_path, data->main->error.notable); fl_print_format("%[' could not be created, a parent directory does not exist.%]%r", data->main->error.to, data->main->error.context, data->main->error.context, f_string_eol_s); - funlockfile(data->main->error.to); + f_file_stream_unlock(data->main->error); } else { fll_error_file_print(data->main->error, F_status_set_fine(*status), "f_directory_create", F_true, destination_path, f_file_operation_create_s, fll_error_file_type_directory_e); diff --git a/level_3/fake/c/private-build.c b/level_3/fake/c/private-build.c index 3b46b7a..dba0555 100644 --- a/level_3/fake/c/private-build.c +++ b/level_3/fake/c/private-build.c @@ -722,13 +722,13 @@ extern "C" { if (F_status_is_error(*status)) { if (F_status_set_fine(*status) == F_failure) { if (data->main->error.verbosity > f_console_verbosity_quiet_e) { - flockfile(data->main->error.to); + f_file_stream_lock(data->main->error); fl_print_format("%r%[%QFailed to execute script: '%]", data->main->error.to, f_string_eol_s, data->main->error.context, data->main->error.prefix, data->main->error.context); fl_print_format("%[%Q%]", data->main->error.to, data->main->error.notable, path, data->main->error.notable); fl_print_format("%['.%]%r", data->main->error.to, data->main->error.context, data->main->error.context, f_string_eol_s); - funlockfile(data->main->error.to); + f_file_stream_unlock(data->main->error); } } else { @@ -835,7 +835,7 @@ extern "C" { if (F_status_is_fine(status)) { if (data->main->output.verbosity != f_console_verbosity_quiet_e && data->main->output.verbosity != f_console_verbosity_error_e) { - flockfile(data->main->output.to); + f_file_stream_lock(data->main->output); fl_print_format("%r%[Building%] ", data->main->output.to, f_string_eol_s, data->main->context.set.important, data->main->context.set.important); fl_print_format("%[%Q%]", data->main->output.to, data->main->context.set.notable, data_build.setting.build_name, data->main->context.set.notable); @@ -857,7 +857,7 @@ extern "C" { fl_print_format("%['.%]%r", data->main->output.to, data->main->context.set.important, data->main->context.set.important, f_string_eol_s); - funlockfile(data->main->output.to); + f_file_stream_unlock(data->main->output); } } diff --git a/level_3/fake/c/private-clean.c b/level_3/fake/c/private-clean.c index ead3e73..7cff4ce 100644 --- a/level_3/fake/c/private-clean.c +++ b/level_3/fake/c/private-clean.c @@ -10,13 +10,13 @@ extern "C" { f_status_t fake_clean_operate(fake_data_t * const data) { if (data->main->output.verbosity != f_console_verbosity_quiet_e && data->main->output.verbosity != f_console_verbosity_error_e) { - flockfile(data->main->output.to); + f_file_stream_lock(data->main->output); fl_print_format("%r%[Deleting all files within build directory '%]", data->main->output.to, f_string_eol_s, data->main->context.set.important, data->main->context.set.important); fl_print_format("%[%Q%]", data->main->output.to, data->main->context.set.notable, data->path_build, data->main->context.set.notable); fl_print_format("%['.%]%r", data->main->output.to, data->main->context.set.important, data->main->context.set.important, f_string_eol_s); - funlockfile(data->main->output.to); + f_file_stream_unlock(data->main->output); } f_status_t status = F_none; diff --git a/level_3/fake/c/private-fake.c b/level_3/fake/c/private-fake.c index 5dca548..ef22d22 100644 --- a/level_3/fake/c/private-fake.c +++ b/level_3/fake/c/private-fake.c @@ -13,7 +13,7 @@ extern "C" { if (F_status_is_error(*status)) return 1; if (data->main->error.verbosity >= f_console_verbosity_verbose_e) { - flockfile(data->main->output.to); + f_file_stream_lock(data->main->output); f_print_dynamic(program, data->main->output.to); @@ -26,10 +26,10 @@ extern "C" { f_print_dynamic_raw(f_string_eol_s, data->main->output.to); - funlockfile(data->main->output.to); + f_file_stream_unlock(data->main->output); // Flush to stdout before executing command. - fflush(data->main->output.to); + f_file_stream_flush(data->main->output.to); } int return_code = 0; @@ -67,13 +67,13 @@ extern "C" { if (F_status_set_fine(*status) == F_file_found_not) { if (data->main->error.verbosity > f_console_verbosity_quiet_e) { - flockfile(data->main->error.to); + f_file_stream_lock(data->main->error); fl_print_format("%r%[%QFailed to find program '%]", data->main->error.to, f_string_eol_s, data->main->error.context, data->main->error.prefix, data->main->error.context); fl_print_format("%[%Q%]", data->main->error.to, data->main->error.notable, program, data->main->error.notable); fl_print_format("%[' for executing.%]%r", data->main->error.to, data->main->error.context, data->main->error.context, f_string_eol_s); - funlockfile(data->main->error.to); + f_file_stream_unlock(data->main->error); } } else { @@ -256,13 +256,13 @@ extern "C" { if (F_status_is_error(status)) { if (fll_error_print(data->main->error, F_status_set_fine(status), "f_utf_is_word_dash_plus", F_false) == F_known_not && data->main->error.verbosity > f_console_verbosity_quiet_e) { - flockfile(data->main->error.to); + f_file_stream_lock(data->main->error); fl_print_format("%r%[%QFailed to process the parameter '%]", data->main->error.to, f_string_eol_s, data->main->error.context, data->main->error.prefix, data->main->error.context); fl_print_format("%[%r%r%]", data->main->error.to, data->main->error.notable, f_console_symbol_long_enable_s, fake_long_process_s, data->main->error.notable); fl_print_format("%['.%]%r", data->main->error.to, data->main->error.context, data->main->error.context, f_string_eol_s); - funlockfile(data->main->error.to); + f_file_stream_unlock(data->main->error); } return status; @@ -270,7 +270,7 @@ extern "C" { if (status == F_false) { if (data->main->error.verbosity > f_console_verbosity_quiet_e) { - flockfile(data->main->error.to); + f_file_stream_lock(data->main->error); fl_print_format("%r%[%QThe '%]", data->main->error.to, f_string_eol_s, data->main->error.context, data->main->error.prefix, data->main->error.context); fl_print_format("%[%r%r%]", data->main->error.to, data->main->error.notable, f_console_symbol_long_enable_s, fake_long_process_s, data->main->error.notable); @@ -278,7 +278,7 @@ extern "C" { fl_print_format("%[%Q%]", data->main->error.to, data->main->error.notable, data->main->parameters.arguments.array[index], data->main->error.notable); fl_print_format("%[' contains non-word, non-dash, and non-plus characters.%]%r", data->main->error.to, data->main->error.context, data->main->error.context, f_string_eol_s); - funlockfile(data->main->error.to); + f_file_stream_unlock(data->main->error); } return F_status_set_error(F_parameter); @@ -299,13 +299,13 @@ extern "C" { if (F_status_is_error(status)) { if (status == F_status_set_error(F_string_too_large)) { if (data->main->error.verbosity > f_console_verbosity_quiet_e) { - flockfile(data->main->error.to); + f_file_stream_lock(data->main->error); fl_print_format("%r%[%QThe parameter '%]", data->main->error.to, f_string_eol_s, data->main->error.context, data->main->error.prefix, data->main->error.context); fl_print_format("%[%r%Q%]", data->main->error.to, data->main->error.notable, f_console_symbol_long_enable_s, parameters_name[i], data->main->error.notable); fl_print_format("%[' is too long.%]%r", data->main->error.to, data->main->error.context, data->main->error.context, f_string_eol_s); - funlockfile(data->main->error.to); + f_file_stream_unlock(data->main->error); } } else { @@ -320,13 +320,13 @@ extern "C" { if (!data->main->parameters.arguments.array[index].used || status == F_data_not) { if (data->main->error.verbosity > f_console_verbosity_quiet_e) { - flockfile(data->main->error.to); + f_file_stream_lock(data->main->error); fl_print_format("%r%[%QThe parameter '%]", data->main->error.to, f_string_eol_s, data->main->error.context, data->main->error.prefix, data->main->error.context); fl_print_format("%[%r%r%]", data->main->error.to, data->main->error.notable, f_console_symbol_long_enable_s, parameters_name[i], data->main->error.notable); fl_print_format("%[' must not be empty and must not contain only white space.%]%r", data->main->error.to, data->main->error.context, data->main->error.context, f_string_eol_s); - funlockfile(data->main->error.to); + f_file_stream_unlock(data->main->error); } } } @@ -414,13 +414,13 @@ extern "C" { if (F_status_is_error(status)) { if (fll_error_print(data->main->error, F_status_set_fine(status), "f_path_directory_cleanup", F_false) == F_known_not && data->main->error.verbosity > f_console_verbosity_quiet_e) { - flockfile(data->main->error.to); + f_file_stream_lock(data->main->error); fl_print_format("%r%[%QFailed to process parameter '%]", data->main->error.to, f_string_eol_s, data->main->error.context, data->main->error.prefix, data->main->error.context); fl_print_format("%[%r%r%]", data->main->error.to, data->main->error.notable, f_console_symbol_long_enable_s, parameters_name[i], data->main->error.notable); fl_print_format("%['.%]%r", data->main->error.to, data->main->error.context, data->main->error.context, f_string_eol_s); - funlockfile(data->main->error.to); + f_file_stream_unlock(data->main->error); } return status; @@ -441,13 +441,13 @@ extern "C" { if (F_status_is_error(status)) { if (fll_error_print(data->main->error, F_status_set_fine(status), " f_string_dynamic_append", F_false) == F_known_not && data->main->error.verbosity > f_console_verbosity_quiet_e) { - flockfile(data->main->error.to); + f_file_stream_lock(data->main->error); fl_print_format("%r%[%QFailed to load default for the parameter '%]", data->main->error.to, f_string_eol_s, data->main->error.context, data->main->error.prefix, data->main->error.context); fl_print_format("%[%r%r%]", data->main->error.to, data->main->error.notable, f_console_symbol_long_enable_s, parameters_name[i], data->main->error.notable); fl_print_format("%['.%]%r", data->main->error.to, data->main->error.context, data->main->error.context, f_string_eol_s); - funlockfile(data->main->error.to); + f_file_stream_unlock(data->main->error); } return status; @@ -461,13 +461,13 @@ extern "C" { if (F_status_is_error(status)) { if (fll_error_print(data->main->error, F_status_set_fine(status), "fll_program_parameter_additional_rip", F_false) == F_known_not && data->main->error.verbosity > f_console_verbosity_quiet_e) { - flockfile(data->main->error.to); + f_file_stream_lock(data->main->error); fl_print_format("%r%[%QFailed to process the parameter '%]", data->main->error.to, f_string_eol_s, data->main->error.context, data->main->error.prefix, data->main->error.context); fl_print_format("%[%r%r%]", data->main->error.to, data->main->error.notable, f_console_symbol_long_enable_s, fake_long_define_s, data->main->error.notable); fl_print_format("%['.%]%r", data->main->error.to, data->main->error.context, data->main->error.context, f_string_eol_s); - funlockfile(data->main->error.to); + f_file_stream_unlock(data->main->error); } return status; @@ -485,13 +485,13 @@ extern "C" { if (F_status_is_error(status)) { if (fll_error_print(data->main->error, F_status_set_fine(status), "fll_program_parameter_additional_rip", F_false) == F_known_not && data->main->error.verbosity > f_console_verbosity_quiet_e) { - flockfile(data->main->error.to); + f_file_stream_lock(data->main->error); fl_print_format("%r%[%QFailed to process the parameter '%]", data->main->error.to, f_string_eol_s, data->main->error.context, data->main->error.prefix, data->main->error.context); fl_print_format("%[%r%r%]", data->main->error.to, data->main->error.notable, f_console_symbol_long_enable_s, fake_long_mode_s, data->main->error.notable); fl_print_format("%['.%]%r", data->main->error.to, data->main->error.context, data->main->error.context, f_string_eol_s); - funlockfile(data->main->error.to); + f_file_stream_unlock(data->main->error); } return status; @@ -511,13 +511,13 @@ extern "C" { if (F_status_is_error(status)) { if (fll_error_print(data->main->error, F_status_set_fine(status), "f_utf_is_word_dash_plus", F_false) == F_known_not && data->main->error.verbosity > f_console_verbosity_quiet_e) { - flockfile(data->main->error.to); + f_file_stream_lock(data->main->error); fl_print_format("%r%[%QFailed to process the parameter '%]", data->main->error.to, f_string_eol_s, data->main->error.context, data->main->error.prefix, data->main->error.context); fl_print_format("%[%r%r%]", data->main->error.to, data->main->error.notable, f_console_symbol_long_enable_s, fake_long_mode_s, data->main->error.notable); fl_print_format("%['.%]%r", data->main->error.to, data->main->error.context, data->main->error.context, f_string_eol_s); - funlockfile(data->main->error.to); + f_file_stream_unlock(data->main->error); } return status; @@ -525,7 +525,7 @@ extern "C" { if (status == F_false) { if (data->main->error.verbosity > f_console_verbosity_quiet_e) { - flockfile(data->main->error.to); + f_file_stream_lock(data->main->error); fl_print_format("%r%[%QThe '%]", data->main->error.to, f_string_eol_s, data->main->error.context, data->main->error.prefix, data->main->error.context); fl_print_format("%[%r%r%]", data->main->error.to, data->main->error.notable, f_console_symbol_long_enable_s, fake_long_mode_s, data->main->error.notable); @@ -533,7 +533,7 @@ extern "C" { fl_print_format("%[%Q%]", data->main->error.to, data->main->error.notable, data->mode.array[i], data->main->error.notable); fl_print_format("%[' contains non-word, non-dash, and non-plus characters.%]%r", data->main->error.to, data->main->error.context, data->main->error.context, f_string_eol_s); - funlockfile(data->main->error.to); + f_file_stream_unlock(data->main->error); } return F_status_set_error(F_parameter); @@ -633,13 +633,13 @@ extern "C" { } } else if (parameters_required[i] == F_true) { - flockfile(data->main->error.to); + f_file_stream_lock(data->main->error); fl_print_format("%r%[%QNo valid path for the (required) directory parameter '%]", data->main->error.to, f_string_eol_s, data->main->error.context, data->main->error.prefix, data->main->error.context); fl_print_format("%[%r%r%]", data->main->error.to, data->main->error.notable, f_console_symbol_long_enable_s, parameters_name[i], data->main->error.notable); fl_print_format("%[' was found.%]%r", data->main->error.to, data->main->error.context, data->main->error.context, f_string_eol_s); - funlockfile(data->main->error.to); + f_file_stream_unlock(data->main->error); return F_status_set_error(F_directory_found_not); } diff --git a/level_3/fake/c/private-make-load_fakefile.c b/level_3/fake/c/private-make-load_fakefile.c index babfccc..5a63981 100644 --- a/level_3/fake/c/private-make-load_fakefile.c +++ b/level_3/fake/c/private-make-load_fakefile.c @@ -44,13 +44,13 @@ extern "C" { if (!data_make->buffer.used) { if (data_make->main->error.verbosity >= f_console_verbosity_verbose_e) { - flockfile(data_make->main->warning.to); + f_file_stream_lock(data_make->warning.to); fl_print_format("%r%[%QThe fakefile '%]", data_make->main->warning.to, f_string_eol_s, data_make->main->warning.context, data_make->main->warning.prefix, data_make->main->warning.context); fl_print_format("%[%Q%]", data_make->main->warning.to, data_make->main->warning.notable, data_make->data->file_data_build_fakefile, data_make->main->warning.notable); fl_print_format("%[' is empty.%]%r", data_make->main->warning.to, data_make->main->warning.context, data_make->main->warning.context, f_string_eol_s); - funlockfile(data_make->main->warning.to); + f_file_stream_unlock(data_make->warning.to); } return; @@ -214,7 +214,7 @@ extern "C" { if (missing_main) { if (data_make->main->error.verbosity > f_console_verbosity_quiet_e) { - flockfile(data_make->main->error.to); + f_file_stream_lock(data_make->error.to); fl_print_format("%r%[%QThe fakefile '%]", data_make->main->error.to, f_string_eol_s, data_make->main->error.context, data_make->main->error.prefix, data_make->main->error.context); fl_print_format("%[%Q%]", data_make->main->error.to, data_make->main->error.notable, data_make->data->file_data_build_fakefile, data_make->main->error.notable); @@ -222,7 +222,7 @@ extern "C" { fl_print_format("%[%r%]", data_make->main->error.to, data_make->main->error.notable, fake_make_section_main_s, data_make->main->error.notable); fl_print_format("%[' object.%]%r", data_make->main->error.to, data_make->main->error.context, data_make->main->error.context, f_string_eol_s); - funlockfile(data_make->main->error.to); + f_file_stream_unlock(data_make->error.to); } *status = F_status_set_error(F_failure); @@ -450,13 +450,13 @@ extern "C" { } else { if (data->main->error.verbosity > f_console_verbosity_quiet_e) { - flockfile(data->main->error.to); + f_file_stream_lock(data->main->error); fl_print_format("%r%[%QInvalid characters in the define setting name '%]", data->main->error.to, f_string_eol_s, data->main->error.context, data->main->error.prefix, data->main->error.context); fl_print_format("%[%Q%]", data->main->error.to, data->main->error.notable, define.array[i].name, data->main->error.notable); fl_print_format("%[', only alpha-numeric ASCII characters and underscore (without a leading digit) are allowed.%]%r", data->main->error.to, data->main->error.context, data->main->error.context, f_string_eol_s); - funlockfile(data->main->error.to); + f_file_stream_unlock(data->main->error); } status = F_status_set_error(F_failure); @@ -534,23 +534,23 @@ extern "C" { ++data_make->setting_build.environment.used; } else if (data_make->main->warning.verbosity >= f_console_verbosity_verbose_e) { - flockfile(data_make->main->warning.to); + f_file_stream_lock(data_make->warning.to); fl_print_format("%r%[%QThe environment name '%]", data_make->main->warning.to, f_string_eol_s, data_make->main->warning.context, data_make->main->warning.prefix, data_make->main->warning.context); fl_print_format("%[%Q%]", data_make->main->warning.to, data_make->main->warning.notable, name_define, data_make->main->warning.notable); fl_print_format("%[' is already added.%]%r", data_make->main->warning.to, data_make->main->warning.context, data_make->main->warning.context, f_string_eol_s); - funlockfile(data_make->main->warning.to); + f_file_stream_unlock(data_make->warning.to); } } else if (data_make->main->warning.verbosity >= f_console_verbosity_verbose_e) { - flockfile(data_make->main->warning.to); + f_file_stream_lock(data_make->warning.to); fl_print_format("%r%[%QThe environment name '%]", data_make->main->warning.to, f_string_eol_s, data_make->main->warning.context, data_make->main->warning.prefix, data_make->main->warning.context); fl_print_format("%[%Q%]", data_make->main->warning.to, data_make->main->warning.notable, name_define, data_make->main->warning.notable); fl_print_format("%[' is invalid, ignoring.%]%r", data_make->main->warning.to, data_make->main->warning.context, data_make->main->warning.context, f_string_eol_s); - funlockfile(data_make->main->warning.to); + f_file_stream_unlock(data_make->warning.to); } name_define.used = 0; diff --git a/level_3/fake/c/private-make-operate.c b/level_3/fake/c/private-make-operate.c index 60764ee..e4abe5b 100644 --- a/level_3/fake/c/private-make-operate.c +++ b/level_3/fake/c/private-make-operate.c @@ -23,7 +23,7 @@ extern "C" { } if (data->main->output.verbosity != f_console_verbosity_quiet_e && data->main->output.verbosity != f_console_verbosity_error_e) { - flockfile(data->main->output.to); + f_file_stream_lock(data->main->output); fl_print_format("%r%[Now making using '%]", data->main->output.to, f_string_eol_s, data->main->context.set.important, data->main->context.set.important); fl_print_format("%[%Q%]", data->main->output.to, data->main->context.set.notable, data->fakefile, data->main->context.set.notable); @@ -43,7 +43,7 @@ extern "C" { fl_print_format("%['.%]%r", data->main->output.to, data->main->context.set.important, data->main->context.set.important, f_string_eol_s); - funlockfile(data->main->output.to); + f_file_stream_unlock(data->main->output); } f_status_t status = F_none; @@ -140,7 +140,7 @@ extern "C" { const f_status_t status_path = f_path_change_at(data_make.path.top.id); if (F_status_is_error(status_path) && data->main->warning.verbosity >= f_console_verbosity_verbose_e) { - flockfile(data->main->warning.to); + f_file_stream_lock(data->main->warning); fl_print_format("%r%[%QFailed change back to orignal path '%]", data->main->warning.to, f_string_eol_s, data->main->warning.context, data->main->warning.prefix, data->main->warning.context); fl_print_format("%[%Q%]", data->main->warning.to, data->main->warning.notable, data_make.path.stack.array[0], data->main->warning.notable); @@ -148,7 +148,7 @@ extern "C" { fl_print_format("%[%ui%]", data->main->warning.to, data->main->warning.notable, F_status_set_fine(status_path), data->main->warning.notable); fl_print_format("%['.%]%r", data->main->warning.to, data->main->warning.context, data->main->warning.context, f_string_eol_s); - funlockfile(data->main->warning.to); + f_file_stream_unlock(data->main->warning); } } @@ -1154,13 +1154,13 @@ extern "C" { const f_fss_named_t *section = &data_make->fakefile.array[id_section]; if (data_make->main->output.verbosity != f_console_verbosity_quiet_e && data_make->main->output.verbosity != f_console_verbosity_error_e) { - flockfile(data_make->main->output.to); + f_file_stream_lock(data_make->output.to); fl_print_format("%r%[Processing Section '%]", data_make->main->output.to, f_string_eol_s, data_make->main->context.set.important, data_make->main->context.set.important); fl_print_format("%[%/Q%]", data_make->main->output.to, data_make->main->context.set.notable, data_make->buffer, section->name, data_make->main->context.set.notable); fl_print_format("%['.%]%r", data_make->main->output.to, data_make->main->context.set.important, data_make->main->context.set.important, f_string_eol_s); - funlockfile(data_make->main->output.to); + f_file_stream_unlock(data_make->output.to); } if (!section->objects.used) { @@ -1390,7 +1390,7 @@ extern "C" { if (i == section->objects.used && F_status_is_error_not(*status) && (state_process.operation == fake_make_operation_type_and_e || state_process.operation == fake_make_operation_type_else_e || state_process.operation == fake_make_operation_type_if_e || state_process.operation == fake_make_operation_type_or_e)) { if (data_make->data->main->error.verbosity > f_console_verbosity_quiet_e && data_make->error.to) { - flockfile(data_make->error.to.stream); + f_file_stream_lock(data_make->error.to); fl_print_format("%r%[%QIncomplete '%]", data_make->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); @@ -1409,7 +1409,7 @@ extern "C" { fl_print_format("%[' at end of the section.%]%r", data_make->error.to, data_make->error.context, data_make->error.context, f_string_eol_s); - funlockfile(data_make->error.to.stream); + f_file_stream_unlock(data_make->error.to); } fake_print_message_section_operation_failed(data_make->data, data_make->error, data_make->buffer, section->name, section->objects.array[section->objects.used - 1]); diff --git a/level_3/fake/c/private-make-operate_process.c b/level_3/fake/c/private-make-operate_process.c index 35dead3..9434804 100644 --- a/level_3/fake/c/private-make-operate_process.c +++ b/level_3/fake/c/private-make-operate_process.c @@ -323,7 +323,7 @@ extern "C" { } if (data_make->main->error.verbosity >= f_console_verbosity_verbose_e) { - flockfile(data_make->main->output.to); + f_file_stream_lock(data_make->output.to); f_array_length_t i = 0; @@ -345,10 +345,10 @@ extern "C" { f_print_dynamic_raw(f_string_eol_s, data_make->main->output.to); - funlockfile(data_make->main->output.to); + f_file_stream_unlock(data_make->output.to); // Flush to stdout before executing command. - fflush(data_make->main->output.to); + f_file_stream_flush(data_make->main->output.to); } int return_code = 0; @@ -373,13 +373,13 @@ extern "C" { if (F_status_set_fine(status) == F_file_found_not) { if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->error.to) { - flockfile(data_make->error.to.stream); + f_file_stream_lock(data_make->error.to); fl_print_format("%r%[%QFailed to find program '%]", data_make->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); fl_print_format("%[%Q%]", data_make->error.to, data_make->error.notable, program, data_make->error.notable); fl_print_format("%[' for executing.%]%r", data_make->error.to, data_make->error.context, data_make->error.context, f_string_eol_s); - funlockfile(data_make->error.to.stream); + f_file_stream_unlock(data_make->error.to); } } else if (F_status_set_fine(status) != F_failure) { @@ -441,13 +441,13 @@ extern "C" { } if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->error.to) { - flockfile(data_make->error.to.stream); + f_file_stream_lock(data_make->error.to); fl_print_format("%r%[%QFailed with return code %]", data_make->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); fl_print_format("%[%i%]", data_make->error.to, data_make->error.notable, return_code, data_make->error.notable); fl_print_format("%[.%]%r", data_make->error.to, data_make->error.context, data_make->error.context, f_string_eol_s); - funlockfile(data_make->error.to.stream); + f_file_stream_unlock(data_make->error.to); } if (data_make->setting_make.fail == fake_make_operation_fail_type_exit_e) return F_status_set_error(F_failure); diff --git a/level_3/fake/c/private-make-operate_process_type.c b/level_3/fake/c/private-make-operate_process_type.c index b27c07a..73e0e2d 100644 --- a/level_3/fake/c/private-make-operate_process_type.c +++ b/level_3/fake/c/private-make-operate_process_type.c @@ -30,13 +30,13 @@ extern "C" { } if (data_make->main->error.verbosity >= f_console_verbosity_verbose_e) { - flockfile(data_make->main->output.to); + f_file_stream_lock(data_make->output.to); fl_print_format("%rBreaking as '", data_make->main->output.to, f_string_eol_s); fl_print_format("%[%Q%]", data_make->main->output.to, data_make->main->context.set.notable, data_make->cache_arguments.used ? data_make->cache_arguments.array[0] : fake_make_operation_argument_success_s, data_make->main->context.set.notable); fl_print_format("'.%r", data_make->main->output.to, f_string_eol_s); - funlockfile(data_make->main->output.to); + f_file_stream_unlock(data_make->output.to); } return status; @@ -327,12 +327,12 @@ extern "C" { } if (data_make->main->error.verbosity >= f_console_verbosity_verbose_e) { - flockfile(data_make->main->output.to); + f_file_stream_lock(data_make->output.to); fl_print_format("%r%s '%[%Q%]' to '", data_make->main->output.to, f_string_eol_s, clone ? "Cloned" : "Copied", data_make->main->context.set.notable, data_make->cache_arguments.array[i], data_make->main->context.set.notable); fl_print_format("%[%Q%]'.%r", data_make->main->output.to, data_make->main->context.set.notable, destination, data_make->main->context.set.notable, f_string_eol_s); - funlockfile(data_make->main->output.to); + f_file_stream_unlock(data_make->output.to); } } else if (F_status_is_error(status_file)) { @@ -386,13 +386,13 @@ extern "C" { if (F_status_is_error(status)) { if (F_status_set_fine(status) == F_file_found_not) { if (data_make->main->warning.verbosity >= f_console_verbosity_verbose_e) { - flockfile(data_make->main->warning.to); + f_file_stream_lock(data_make->warning.to); fl_print_format("%r%[%QThe file '%]", data_make->main->warning.to, data_make->main->warning.prefix, f_string_eol_s); fl_print_format("%[%Q%]", data_make->main->warning.to, data_make->main->warning.notable, data_make->cache_arguments.array[i], data_make->main->warning.notable); fl_print_format("%[' cannot be found.%]%r", data_make->main->warning.to, f_string_eol_s); - funlockfile(data_make->main->warning.to); + f_file_stream_unlock(data_make->warning.to); } status = F_none; @@ -519,7 +519,7 @@ extern "C" { } if (data_make->main->error.verbosity >= f_console_verbosity_verbose_e) { - flockfile(data_make->main->output.to); + f_file_stream_lock(data_make->output.to); f_print_terminated("Set failure state to '", data_make->main->output.to); @@ -535,7 +535,7 @@ extern "C" { fl_print_format("'.%r", data_make->main->output.to, f_string_eol_s); - funlockfile(data_make->main->output.to); + f_file_stream_unlock(data_make->output.to); } } #endif // _di_fake_make_operate_process_type_fail_ @@ -581,12 +581,12 @@ extern "C" { } if (data_make->main->error.verbosity >= f_console_verbosity_verbose_e) { - flockfile(data_make->main->output.to); + f_file_stream_lock(data_make->output.to); fl_print_format("%r group of '%[%r%]", data_make->main->output.to, all ? "Recursively changed" : "Changed", data_make->main->context.set.notable, data_make->cache_arguments.array[i], data_make->main->context.set.notable); fl_print_format("' to %[%ul%].%r", data_make->main->output.to, data_make->main->context.set.notable, id, data_make->main->context.set.notable, f_string_eol_s); - funlockfile(data_make->main->output.to); + f_file_stream_unlock(data_make->output.to); } } // for @@ -931,7 +931,7 @@ extern "C" { state_process->condition_result = fake_condition_result_error_e; if (data_make->main->error.verbosity > f_console_verbosity_quiet_e && data_make->error.to) { - flockfile(data_make->error.to.stream); + f_file_stream_lock(data_make->error.to); if ((i == 1 && number_left > F_number_t_size_unsigned_d) || (i > 1 && number_right > F_number_t_size_unsigned_d)) { fl_print_format("%r%[%QThe number '%]", data_make->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); @@ -944,7 +944,7 @@ extern "C" { fl_print_format("%['.%]%r", data_make->error.to, data_make->error.context, F_number_t_size_unsigned_d, F_number_t_size_unsigned_d, data_make->error.context, f_string_eol_s); } - funlockfile(data_make->error.to.stream); + f_file_stream_unlock(data_make->error.to); } return F_status_set_error(F_failure); @@ -1363,12 +1363,12 @@ extern "C" { } if (data_make->main->error.verbosity >= f_console_verbosity_verbose_e) { - flockfile(data_make->main->output.to); + f_file_stream_lock(data_make->output.to); fl_print_format("Created symbolic link from '%[%Q%]", data_make->main->output.to, data_make->main->context.set.notable, data_make->cache_arguments.array[data_make->cache_arguments.used - 1], data_make->main->context.set.notable); fl_print_format("' to %[%Q%].%r", data_make->main->output.to, data_make->main->context.set.notable, data_make->cache_arguments.array[0], data_make->main->context.set.notable, f_string_eol_s); - funlockfile(data_make->main->output.to); + f_file_stream_unlock(data_make->output.to); } return F_none; @@ -1773,12 +1773,12 @@ extern "C" { } // for } - flockfile(data_make->main->output.to); + f_file_stream_lock(data_make->output.to); fll_print_dynamic_raw(data_make->cache_1, data_make->main->output.to); fll_print_dynamic_raw(f_string_eol_s, data_make->main->output.to); - funlockfile(data_make->main->output.to); + f_file_stream_unlock(data_make->output.to); return F_none; } diff --git a/level_3/fake/c/private-make-operate_validate_type.c b/level_3/fake/c/private-make-operate_validate_type.c index 87d37e4..789aaad 100644 --- a/level_3/fake/c/private-make-operate_validate_type.c +++ b/level_3/fake/c/private-make-operate_validate_type.c @@ -23,13 +23,13 @@ extern "C" { if (fl_string_dynamic_compare(fake_make_operation_argument_failure_s, data_make->cache_arguments.array[0]) == F_equal_to_not) { if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->error.to) { - flockfile(data_make->error.to.stream); + f_file_stream_lock(data_make->error.to); fl_print_format("%r%[%QUnsupported break type '%]", data_make->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); fl_print_format("%[%Q%]", data_make->error.to, data_make->error.notable, data_make->cache_arguments.array[0], data_make->error.notable); fl_print_format("%['.%]%r", data_make->error.to, data_make->error.context, data_make->error.context, f_string_eol_s); - funlockfile(data_make->error.to.stream); + f_file_stream_unlock(data_make->error.to); } return F_status_set_error(F_failure); @@ -60,13 +60,13 @@ extern "C" { if (status == F_file_found_not) { if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->error.to) { - flockfile(data_make->error.to.stream); + f_file_stream_lock(data_make->error.to); fl_print_format("%r%[%QFailed to find file '%]", data_make->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); fl_print_format("%[%Q%]", data_make->error.to, data_make->error.notable, path_file, data_make->error.notable); fl_print_format("%['.%]%r", data_make->error.to, data_make->error.context, data_make->error.context, f_string_eol_s); - funlockfile(data_make->error.to.stream); + f_file_stream_unlock(data_make->error.to); } return F_status_set_error(F_failure); @@ -80,13 +80,13 @@ extern "C" { if (!status) { if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->error.to) { - flockfile(data_make->error.to.stream); + f_file_stream_lock(data_make->error.to); fl_print_format("%r%[%QThe file '%]", data_make->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); fl_print_format("%[%Q%]", data_make->error.to, data_make->error.notable, path_file, data_make->error.notable); fl_print_format("%[' must be a regular file.%]%r", data_make->error.to, data_make->error.context, data_make->error.context, f_string_eol_s); - funlockfile(data_make->error.to.stream); + f_file_stream_unlock(data_make->error.to); } return F_status_set_error(F_failure); @@ -140,13 +140,13 @@ extern "C" { if (f_file_exists(data_make->cache_arguments.array[i], F_true) != F_true) { if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->error.to) { - flockfile(data_make->error.to.stream); + f_file_stream_lock(data_make->error.to); fl_print_format("%r%[%QFailed to find file '%]", data_make->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); fl_print_format("%[%Q%]", data_make->error.to, data_make->error.notable, data_make->cache_arguments.array[i], data_make->error.notable); fl_print_format("%['.%]%r", data_make->error.to, data_make->error.context, data_make->error.context, f_string_eol_s); - funlockfile(data_make->error.to.stream); + f_file_stream_unlock(data_make->error.to); } status = F_status_set_error(F_failure); @@ -160,13 +160,13 @@ extern "C" { if (status_file == F_false || status_file == F_file_found_not) { if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->error.to) { - flockfile(data_make->error.to.stream); + f_file_stream_lock(data_make->error.to); fl_print_format("%r%[%QThe last file '%]", data_make->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); fl_print_format("%[%Q%]", data_make->error.to, data_make->error.notable, data_make->cache_arguments.array[data_make->cache_arguments.used - 1], data_make->error.notable); fl_print_format("%[' must be a valid directory.%]%r", data_make->error.to, data_make->error.context, data_make->error.context, f_string_eol_s); - funlockfile(data_make->error.to.stream); + f_file_stream_unlock(data_make->error.to); } status = F_status_set_error(F_failure); @@ -188,13 +188,13 @@ extern "C" { if (status_file == F_false) { if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->error.to) { - flockfile(data_make->error.to.stream); + f_file_stream_lock(data_make->error.to); fl_print_format("%r%[%QThe second file '%]", data_make->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); fl_print_format("%[%Q%]", data_make->error.to, data_make->error.notable, data_make->cache_arguments.array[1], data_make->error.notable); fl_print_format("%[' must be a valid directory.%]%r", data_make->error.to, data_make->error.context, data_make->error.context, f_string_eol_s); - funlockfile(data_make->error.to.stream); + f_file_stream_unlock(data_make->error.to); } status = F_status_set_error(F_failure); @@ -222,13 +222,13 @@ extern "C" { if (data_make->setting_build.build_compiler.used) { if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->error.to) { - flockfile(data_make->error.to.stream); + f_file_stream_lock(data_make->error.to); fl_print_format("%r%[%QNo compiler has been specified, cannot perform '%]", data_make->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); fl_print_format("%[%r%]", data_make->error.to, data_make->error.notable, fake_make_operation_compile_s, data_make->error.notable); fl_print_format("%[' section operation.%]%r", data_make->error.to, data_make->error.context, data_make->error.context, f_string_eol_s); - funlockfile(data_make->error.to.stream); + f_file_stream_unlock(data_make->error.to); } return F_status_set_error(F_failure); @@ -244,7 +244,7 @@ extern "C" { if (state_process->operation == fake_make_operation_type_if_e) { if (state_process->operation_previous == fake_make_operation_type_if_e) { if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->error.to) { - flockfile(data_make->error.to.stream); + f_file_stream_lock(data_make->error.to); fl_print_format("%r%[%QMust not be used immediately after another '%]", data_make->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); fl_print_format("%[%r%]", data_make->error.to, data_make->error.notable, fake_make_operation_if_s, data_make->error.notable); @@ -254,7 +254,7 @@ extern "C" { fl_print_format("%[%r%]", data_make->error.to, data_make->error.notable, fake_make_operation_or_s, data_make->error.notable); fl_print_format("%[' section operation.%]%r", data_make->error.to, data_make->error.context, data_make->error.context, f_string_eol_s); - funlockfile(data_make->error.to.stream); + f_file_stream_unlock(data_make->error.to); } return F_status_set_error(F_failure); @@ -263,7 +263,7 @@ extern "C" { else { if (!(state_process->operation_previous == fake_make_operation_type_if_e || state_process->operation_previous == fake_make_operation_type_and_e || state_process->operation_previous == fake_make_operation_type_or_e)) { if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->error.to) { - flockfile(data_make->error.to.stream); + f_file_stream_lock(data_make->error.to); fl_print_format("%r%[%QMay only be used immediately after another '%]", data_make->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); fl_print_format("%[%r%]", data_make->error.to, data_make->error.notable, fake_make_operation_if_s, data_make->error.notable); @@ -273,7 +273,7 @@ extern "C" { fl_print_format("%[%r%]", data_make->error.to, data_make->error.notable, fake_make_operation_or_s, data_make->error.notable); fl_print_format("%[' section operation.%]%r", data_make->error.to, data_make->error.context, data_make->error.context, f_string_eol_s); - funlockfile(data_make->error.to.stream); + f_file_stream_unlock(data_make->error.to); } return F_status_set_error(F_failure); @@ -424,7 +424,7 @@ extern "C" { if (i == 23) { if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->error.to) { - flockfile(data_make->error.to.stream); + f_file_stream_lock(data_make->error.to); fl_print_format("%r%[%QUnsupported '%]", data_make->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); fl_print_format("%[%r%]", data_make->error.to, data_make->error.notable, if_and_or, data_make->error.notable); @@ -432,7 +432,7 @@ extern "C" { fl_print_format("%[%Q%]", data_make->error.to, data_make->error.notable, data_make->cache_arguments.array[k], data_make->error.notable); fl_print_format("%['.%]%r", data_make->error.to, data_make->error.context, data_make->error.context, f_string_eol_s); - funlockfile(data_make->error.to.stream); + f_file_stream_unlock(data_make->error.to); } return F_status_set_error(F_failure); @@ -461,7 +461,7 @@ extern "C" { if (j == 7) { if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->error.to) { - flockfile(data_make->error.to.stream); + f_file_stream_lock(data_make->error.to); fl_print_format("%r%[%QUnsupported '%]", data_make->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); fl_print_format("%[%r%]", data_make->error.to, data_make->error.notable, if_and_or, data_make->error.notable); @@ -469,7 +469,7 @@ extern "C" { fl_print_format("%[%Q%]", data_make->error.to, data_make->error.notable, data_make->cache_arguments.array[k], data_make->error.notable); fl_print_format("%['.%]%r", data_make->error.to, data_make->error.context, data_make->error.context, f_string_eol_s); - funlockfile(data_make->error.to.stream); + f_file_stream_unlock(data_make->error.to); } return F_status_set_error(F_failure); @@ -512,13 +512,13 @@ extern "C" { if (fl_string_dynamic_compare(fake_make_operation_argument_is_s, data_make->cache_arguments.array[k]) == F_equal_to_not) { if (fl_string_dynamic_compare(fake_make_operation_argument_has_s, data_make->cache_arguments.array[k]) == F_equal_to_not) { if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->error.to) { - flockfile(data_make->error.to.stream); + f_file_stream_lock(data_make->error.to); fl_print_format("%r%[%QUnsupported %smode type '%]", data_make->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, j == 6 ? "" : "not ", data_make->error.context); fl_print_format("%[%Q%]", data_make->error.to, data_make->error.notable, data_make->cache_arguments.array[k], data_make->error.notable); fl_print_format("%['.%]%r", data_make->error.to, data_make->error.context, data_make->error.context, f_string_eol_s); - funlockfile(data_make->error.to.stream); + f_file_stream_unlock(data_make->error.to); } return F_status_set_error(F_failure); @@ -582,13 +582,13 @@ extern "C" { } else { if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->error.to) { - flockfile(data_make->error.to.stream); + f_file_stream_lock(data_make->error.to); fl_print_format("%r%[%QUnsupported file type '%]", data_make->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); fl_print_format("%[%Q%]", data_make->error.to, data_make->error.notable, data_make->cache_arguments.array[i], data_make->error.notable); fl_print_format("%['.%]%r", data_make->error.to, data_make->error.context, data_make->error.context, f_string_eol_s); - funlockfile(data_make->error.to.stream); + f_file_stream_unlock(data_make->error.to); } type_file |= 0x80; @@ -683,7 +683,7 @@ extern "C" { status = F_status_set_error(F_failure); if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->error.to) { - flockfile(data_make->error.to.stream); + f_file_stream_lock(data_make->error.to); if (number > F_number_t_size_unsigned_d) { fl_print_format("%r%[%QThe number '%]", data_make->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); @@ -696,7 +696,7 @@ extern "C" { fl_print_format("%['.%]%r", data_make->error.to, data_make->error.context, data_make->error.context, f_string_eol_s); } - funlockfile(data_make->error.to.stream); + f_file_stream_unlock(data_make->error.to); } } } // for @@ -736,13 +736,13 @@ extern "C" { if (f_file_exists(data_make->cache_arguments.array[i], F_true) != F_true) { if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->error.to) { - flockfile(data_make->error.to.stream); + f_file_stream_lock(data_make->error.to); fl_print_format("%r%[%QFailed to find file '%]", data_make->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); fl_print_format("%[%Q%]", data_make->error.to, data_make->error.notable, data_make->cache_arguments.array[i], data_make->error.notable); fl_print_format("%['.%]%r", data_make->error.to, data_make->error.context, data_make->error.context, f_string_eol_s); - funlockfile(data_make->error.to.stream); + f_file_stream_unlock(data_make->error.to); } status = F_status_set_error(F_failure); @@ -756,13 +756,13 @@ extern "C" { if (status_file == F_false || status_file == F_file_found_not) { if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->error.to) { - flockfile(data_make->error.to.stream); + f_file_stream_lock(data_make->error.to); fl_print_format("%r%[%QThe last file '%]", data_make->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); fl_print_format("%[%Q%]", data_make->error.to, data_make->error.notable, data_make->cache_arguments.array[data_make->cache_arguments.used - 1], data_make->error.notable); fl_print_format("%[' must be a valid directory.%]%r", data_make->error.to, data_make->error.context, data_make->error.context, f_string_eol_s); - funlockfile(data_make->error.to.stream); + f_file_stream_unlock(data_make->error.to); } status = F_status_set_error(F_failure); @@ -784,13 +784,13 @@ extern "C" { if (status_file == F_false) { if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->error.to) { - flockfile(data_make->error.to.stream); + f_file_stream_lock(data_make->error.to); fl_print_format("%r%[%QThe second file '%]", data_make->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); fl_print_format("%[%Q%]", data_make->error.to, data_make->error.notable, data_make->cache_arguments.array[1], data_make->error.notable); fl_print_format("%[' must be a valid directory.%]%r", data_make->error.to, data_make->error.context, data_make->error.context, f_string_eol_s); - funlockfile(data_make->error.to.stream); + f_file_stream_unlock(data_make->error.to); } status = F_status_set_error(F_failure); @@ -823,13 +823,13 @@ extern "C" { if (status == F_false) { if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->error.to) { - flockfile(data_make->error.to.stream); + f_file_stream_lock(data_make->error.to); fl_print_format("%r%[%QInvalid characters in the define setting name '%]", data_make->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); fl_print_format("%[%Q%]", data_make->error.to, data_make->error.notable, data_make->cache_arguments.array[0], data_make->error.notable); fl_print_format("%[', only alpha-numeric ASCII characters and underscore (without a leading digit) is allowed.%]%r", data_make->error.to, data_make->error.context, data_make->error.context, f_string_eol_s); - funlockfile(data_make->error.to.stream); + f_file_stream_unlock(data_make->error.to); } return F_status_set_error(F_failure); @@ -876,13 +876,13 @@ extern "C" { if (state_process->operation_previous == fake_make_operation_type_else_e) { if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->error.to) { - flockfile(data_make->error.to.stream); + f_file_stream_lock(data_make->error.to); fl_print_format("%r%[%QMust not be used immediately after another '%]", data_make->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); fl_print_format("%[%r%]", data_make->error.to, data_make->error.notable, fake_make_operation_else_s, data_make->error.notable); fl_print_format("%[' section operation.%]%r", data_make->error.to, data_make->error.context, data_make->error.context, f_string_eol_s); - funlockfile(data_make->error.to.stream); + f_file_stream_unlock(data_make->error.to); } return F_status_set_error(F_failure); @@ -890,7 +890,7 @@ extern "C" { if (state_process->operation_previous == fake_make_operation_type_if_e || state_process->operation_previous == fake_make_operation_type_and_e || state_process->operation_previous == fake_make_operation_type_or_e) { if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->error.to) { - flockfile(data_make->error.to.stream); + f_file_stream_lock(data_make->error.to); fl_print_format("%r%[%QMust not be used immediately after an '%]", data_make->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); fl_print_format("%[%r%]", data_make->error.to, data_make->error.notable, fake_make_operation_if_s, data_make->error.notable); @@ -900,7 +900,7 @@ extern "C" { fl_print_format("%[%r%]", data_make->error.to, data_make->error.notable, fake_make_operation_or_s, data_make->error.notable); fl_print_format("%[' section operation.%]%r", data_make->error.to, data_make->error.context, data_make->error.context, f_string_eol_s); - funlockfile(data_make->error.to.stream); + f_file_stream_unlock(data_make->error.to); } return F_status_set_error(F_failure); @@ -943,13 +943,13 @@ extern "C" { if (fl_string_dynamic_compare(fake_make_operation_argument_success_s, data_make->cache_arguments.array[0]) == F_equal_to_not) { if (fl_string_dynamic_compare(fake_make_operation_argument_failure_s, data_make->cache_arguments.array[0]) == F_equal_to_not) { if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->error.to) { - flockfile(data_make->error.to.stream); + f_file_stream_lock(data_make->error.to); fl_print_format("%r%[%QUnsupported exit type '%]", data_make->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); fl_print_format("%[%Q%]", data_make->error.to, data_make->error.notable, data_make->cache_arguments.array[0], data_make->error.notable); fl_print_format("%['.%]%r", data_make->error.to, data_make->error.context, data_make->error.context, f_string_eol_s); - funlockfile(data_make->error.to.stream); + f_file_stream_unlock(data_make->error.to); } return F_status_set_error(F_failure); @@ -969,13 +969,13 @@ extern "C" { if (fl_string_dynamic_compare(fake_make_operation_argument_warn_s, data_make->cache_arguments.array[0]) == F_equal_to_not) { if (fl_string_dynamic_compare(fake_make_operation_argument_ignore_s, data_make->cache_arguments.array[0]) == F_equal_to_not) { if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->error.to) { - flockfile(data_make->error.to.stream); + f_file_stream_lock(data_make->error.to); fl_print_format("%r%[%QUnsupported fail type '%]", data_make->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); fl_print_format("%[%Q%]", data_make->error.to, data_make->error.notable, data_make->cache_arguments.array[0], data_make->error.notable); fl_print_format("%['.%]%r", data_make->error.to, data_make->error.context, data_make->error.context, f_string_eol_s); - funlockfile(data_make->error.to.stream); + f_file_stream_unlock(data_make->error.to); } return F_status_set_error(F_failure); @@ -1003,13 +1003,13 @@ extern "C" { if (!data_make->setting_build.build_indexer.used) { if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->error.to) { - flockfile(data_make->error.to.stream); + f_file_stream_lock(data_make->error.to); fl_print_format("%r%[%QNo indexer has been specified, cannot perform '%]", data_make->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); fl_print_format("%[%r%]", data_make->error.to, data_make->error.notable, fake_make_operation_index_s, data_make->error.notable); fl_print_format("%[' section operation.%]%r", data_make->error.to, data_make->error.context, data_make->error.context, f_string_eol_s); - funlockfile(data_make->error.to.stream); + f_file_stream_unlock(data_make->error.to); } return F_status_set_error(F_failure); @@ -1203,13 +1203,13 @@ extern "C" { if (f_file_exists(data_make->cache_arguments.array[i], F_true) != F_true) { if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->error.to) { - flockfile(data_make->error.to.stream); + f_file_stream_lock(data_make->error.to); fl_print_format("%r%[%QFailed to find file '%]", data_make->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); fl_print_format("%[%Q%]", data_make->error.to, data_make->error.notable, data_make->cache_arguments.array[i], data_make->error.notable); fl_print_format("%['.%]%r", data_make->error.to, data_make->error.context, data_make->error.context, f_string_eol_s); - funlockfile(data_make->error.to.stream); + f_file_stream_unlock(data_make->error.to); } status = F_status_set_error(F_failure); @@ -1227,13 +1227,13 @@ extern "C" { if (status == F_false || status == F_file_found_not) { if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->error.to) { - flockfile(data_make->error.to.stream); + f_file_stream_lock(data_make->error.to); fl_print_format("%r%[%QThe last file '%]", data_make->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); fl_print_format("%[%Q%]", data_make->error.to, data_make->error.notable, data_make->cache_arguments.array[data_make->cache_arguments.used - 1], data_make->error.notable); fl_print_format("%[' must be a valid directory.%]%r", data_make->error.to, data_make->error.context, data_make->error.context, f_string_eol_s); - funlockfile(data_make->error.to.stream); + f_file_stream_unlock(data_make->error.to); } return F_status_set_error(F_failure); @@ -1255,13 +1255,13 @@ extern "C" { if (status == F_false) { if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->error.to) { - flockfile(data_make->error.to.stream); + f_file_stream_lock(data_make->error.to); fl_print_format("%r%[%QThe second file '%]", data_make->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); fl_print_format("%[%Q%]", data_make->error.to, data_make->error.notable, data_make->cache_arguments.array[1], data_make->error.notable); fl_print_format("%[' must be a valid directory.%]%r", data_make->error.to, data_make->error.context, data_make->error.context, f_string_eol_s); - funlockfile(data_make->error.to.stream); + f_file_stream_unlock(data_make->error.to); } return F_status_set_error(F_failure); @@ -1298,13 +1298,13 @@ extern "C" { } // for if (id_section == data_make->fakefile.used) { - flockfile(data_make->error.to.stream); + f_file_stream_lock(data_make->error.to); fl_print_format("%r%[%QNo operation section named '%]", data_make->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); fl_print_format("%[%Q%]", data_make->error.to, data_make->error.notable, data_make->cache_arguments.array[0], data_make->error.notable); fl_print_format("%[' is found.%]%r", data_make->error.to, data_make->error.context, data_make->error.context, f_string_eol_s); - funlockfile(data_make->error.to.stream); + f_file_stream_unlock(data_make->error.to); return F_status_set_error(F_failure); } @@ -1313,13 +1313,13 @@ extern "C" { if (section_stack->array[i] == id_section) { if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->error.to) { - flockfile(data_make->error.to.stream); + f_file_stream_lock(data_make->error.to); fl_print_format("%r%[%QThe section operation '%]", data_make->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); fl_print_format("%[%Q%]", data_make->error.to, data_make->error.notable, data_make->fakefile.array[id_section].name, data_make->error.notable); fl_print_format("%[' is already in the operation stack, recursion is not allowed.%]%r", data_make->error.to, data_make->error.context, data_make->error.context, f_string_eol_s); - funlockfile(data_make->error.to.stream); + f_file_stream_unlock(data_make->error.to); } return F_status_set_error(F_failure); @@ -1417,13 +1417,13 @@ extern "C" { if (status_file == F_file_found_not) { if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->error.to) { - flockfile(data_make->error.to.stream); + f_file_stream_lock(data_make->error.to); fl_print_format("%r%[%QFailed to find file '%]", data_make->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); fl_print_format("%[%Q%]", data_make->error.to, data_make->error.notable, data_make->cache_arguments.array[i], data_make->error.notable); fl_print_format("%['.%]%r", data_make->error.to, data_make->error.context, data_make->error.context, f_string_eol_s); - funlockfile(data_make->error.to.stream); + f_file_stream_unlock(data_make->error.to); } status = F_status_set_error(F_failure); @@ -1497,13 +1497,13 @@ extern "C" { if (status == F_file_found_not) { if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->error.to) { - flockfile(data_make->error.to.stream); + f_file_stream_lock(data_make->error.to); fl_print_format("%r%[%QFailed to find file '%]", data_make->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); fl_print_format("%[%Q%]", data_make->error.to, data_make->error.notable, data_make->cache_arguments.array[0], data_make->error.notable); fl_print_format("%['.%]%r", data_make->error.to, data_make->error.context, data_make->error.context, f_string_eol_s); - funlockfile(data_make->error.to.stream); + f_file_stream_unlock(data_make->error.to); } return F_status_set_error(F_failure); @@ -1519,13 +1519,13 @@ extern "C" { if (!status) { if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->error.to) { - flockfile(data_make->error.to.stream); + f_file_stream_lock(data_make->error.to); fl_print_format("%r%[%QThe file '%]", data_make->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); fl_print_format("%[%Q%]", data_make->error.to, data_make->error.notable, data_make->cache_arguments.array[0], data_make->error.notable); fl_print_format("%[' must be a directory file.%]%r", data_make->error.to, data_make->error.context, data_make->error.context, f_string_eol_s); - funlockfile(data_make->error.to.stream); + f_file_stream_unlock(data_make->error.to); } return F_status_set_error(F_failure); @@ -1555,13 +1555,13 @@ extern "C" { if (fl_string_dynamic_compare(fake_make_operation_argument_directory_s, data_make->cache_arguments.array[0]) == F_equal_to_not) { if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->error.to) { - flockfile(data_make->error.to.stream); + f_file_stream_lock(data_make->error.to); fl_print_format("%r%[%QUnsupported file type '%]", data_make->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); fl_print_format("%[%Q%]", data_make->error.to, data_make->error.notable, data_make->cache_arguments.array[0], data_make->error.notable); fl_print_format("%['.%]%r", data_make->error.to, data_make->error.context, data_make->error.context, f_string_eol_s); - funlockfile(data_make->error.to.stream); + f_file_stream_unlock(data_make->error.to); } return F_status_set_error(F_failure); diff --git a/level_3/fake/c/private-make.c b/level_3/fake/c/private-make.c index cd1a846..846cdf2 100644 --- a/level_3/fake/c/private-make.c +++ b/level_3/fake/c/private-make.c @@ -60,13 +60,13 @@ extern "C" { if (status == F_exist_not) { if (data->main->error.verbosity > f_console_verbosity_quiet_e) { - flockfile(data->main->error.to); + f_file_stream_lock(data->main->error); fl_print_format("%r%[%QThe group name '%]", data->main->error.to, f_string_eol_s, data->main->error.context, data->main->error.prefix, data->main->error.context); fl_print_format("%[%Q%]", data->main->error.to, data->main->error.notable, buffer, data->main->error.notable); fl_print_format("%[' is not found.%]%r", data->main->error.to, data->main->error.context, data->main->error.context, f_string_eol_s); - funlockfile(data->main->error.to); + f_file_stream_unlock(data->main->error); } return F_status_set_error(F_failure); @@ -82,13 +82,13 @@ extern "C" { if (number > F_type_size_32_unsigned_d) { if (data->main->error.verbosity > f_console_verbosity_quiet_e) { - flockfile(data->main->error.to); + f_file_stream_lock(data->main->error); fl_print_format("%r%[%QThe number '%]", data->main->error.to, f_string_eol_s, data->main->error.context, data->main->error.prefix, data->main->error.context); fl_print_format("%[%un%]", data->main->error.to, data->main->error.notable, number, data->main->error.notable); fl_print_format("%[' is too large.%]%r", data->main->error.to, data->main->error.context, data->main->error.context, f_string_eol_s); - funlockfile(data->main->error.to); + f_file_stream_unlock(data->main->error); } } @@ -112,13 +112,13 @@ extern "C" { if (F_status_is_error(status)) { if (data->main->error.verbosity > f_console_verbosity_quiet_e) { if (F_status_set_fine(status) == F_syntax) { - flockfile(data->main->error.to); + f_file_stream_lock(data->main->error); fl_print_format("%r%[%QThe mode '%]", data->main->error.to, f_string_eol_s, data->main->error.context, data->main->error.prefix, data->main->error.context); fl_print_format("%[%Q%]", data->main->error.to, data->main->error.notable, buffer, data->main->error.notable); fl_print_format("%[' is invalid.%]%r", data->main->error.to, data->main->error.context, data->main->error.context, f_string_eol_s); - funlockfile(data->main->error.to); + f_file_stream_unlock(data->main->error); } else { fll_error_print(print, status, "f_file_mode_from_string", F_true); @@ -153,13 +153,13 @@ extern "C" { if (status == F_exist_not) { if (data->main->error.verbosity > f_console_verbosity_quiet_e) { - flockfile(data->main->error.to); + f_file_stream_lock(data->main->error); fl_print_format("%r%[%QThe user '%]", data->main->error.to, f_string_eol_s, data->main->error.context, data->main->error.prefix, data->main->error.context); fl_print_format("%[%Q%]", data->main->error.to, data->main->error.notable, buffer, data->main->error.notable); fl_print_format("%[' is not found.%]%r", data->main->error.to, data->main->error.context, data->main->error.context, f_string_eol_s); - funlockfile(data->main->error.to); + f_file_stream_unlock(data->main->error); } return F_status_set_error(F_failure); @@ -175,13 +175,13 @@ extern "C" { if (number > F_type_size_32_unsigned_d) { if (data->main->error.verbosity > f_console_verbosity_quiet_e) { - flockfile(data->main->error.to); + f_file_stream_lock(data->main->error); fl_print_format("%r%[%QThe number '%]", data->main->error.to, f_string_eol_s, data->main->error.context, data->main->error.prefix, data->main->error.context); fl_print_format("%[%un%]", data->main->error.to, data->main->error.notable, number, data->main->error.notable); fl_print_format("%[' is too large.%]%r", data->main->error.to, data->main->error.context, data->main->error.context, f_string_eol_s); - funlockfile(data->main->error.to); + f_file_stream_unlock(data->main->error); } } diff --git a/level_3/fake/c/private-print.c b/level_3/fake/c/private-print.c index a8f14e1..c7c3071 100644 --- a/level_3/fake/c/private-print.c +++ b/level_3/fake/c/private-print.c @@ -11,7 +11,7 @@ extern "C" { if (status == F_file_found_not) { if (data->main->error.verbosity > f_console_verbosity_quiet_e) { - flockfile(data->main->error.to); + f_file_stream_lock(data->main->error); fl_print_format("%r%[%QFailed to find '%]", data->main->error.to, f_string_eol_s, data->main->error.context, data->main->error.prefix, data->main->error.context); @@ -19,7 +19,7 @@ extern "C" { fl_print_format("%['.%]%r", data->main->error.to, data->main->error.context, data->main->error.context, f_string_eol_s); - funlockfile(data->main->error.to); + f_file_stream_unlock(data->main->error); } return F_false; @@ -27,7 +27,7 @@ extern "C" { if (status == F_parameter) { if (data->main->error.verbosity > f_console_verbosity_quiet_e) { - flockfile(data->main->error.to); + f_file_stream_lock(data->main->error); fl_print_format("%r%[%QInvalid parameter when calling '%]", data->main->error.to, f_string_eol_s, data->main->error.context, data->main->error.prefix, data->main->error.context); fl_print_format("%[%S%]", data->main->error.to, data->main->error.notable, function, data->main->error.notable); @@ -37,7 +37,7 @@ extern "C" { fl_print_format("%['.%]%r", data->main->error.to, data->main->error.context, data->main->error.context, f_string_eol_s); - funlockfile(data->main->error.to); + f_file_stream_unlock(data->main->error); } return F_false; @@ -45,7 +45,7 @@ extern "C" { if (status == F_name) { if (data->main->error.verbosity > f_console_verbosity_quiet_e) { - flockfile(data->main->error.to); + f_file_stream_lock(data->main->error); fl_print_format("%r%[%QInvalid name for '%]", data->main->error.to, f_string_eol_s, data->main->error.context, data->main->error.prefix, data->main->error.context); @@ -60,7 +60,7 @@ extern "C" { fl_print_format("%['.%]%r", data->main->error.to, data->main->error.context, data->main->error.context, f_string_eol_s); - funlockfile(data->main->error.to); + f_file_stream_unlock(data->main->error); } return F_false; @@ -68,7 +68,7 @@ extern "C" { if (status == F_memory_not) { if (data->main->error.verbosity > f_console_verbosity_quiet_e) { - flockfile(data->main->error.to); + f_file_stream_lock(data->main->error); fl_print_format("%r%[%QUnable to allocate memory, while trying to %Q '%]", data->main->error.to, f_string_eol_s, data->main->error.context, data->main->error.prefix, operation, data->main->error.context); @@ -76,7 +76,7 @@ extern "C" { fl_print_format("%['.%]%r", data->main->error.to, data->main->error.context, data->main->error.context, f_string_eol_s); - funlockfile(data->main->error.to); + f_file_stream_unlock(data->main->error); } return F_false; @@ -84,7 +84,7 @@ extern "C" { if (status == F_number_overflow) { if (data->main->error.verbosity > f_console_verbosity_quiet_e) { - flockfile(data->main->error.to); + f_file_stream_lock(data->main->error); fl_print_format("%r%[%QOverflow while trying to %Q '%]", data->main->error.to, f_string_eol_s, data->main->error.context, data->main->error.prefix, operation, data->main->error.context); @@ -92,7 +92,7 @@ extern "C" { fl_print_format("%['.%]%r", data->main->error.to, data->main->error.context, data->main->error.context, f_string_eol_s); - funlockfile(data->main->error.to); + f_file_stream_unlock(data->main->error); } return F_false; @@ -100,7 +100,7 @@ extern "C" { if (status == F_directory) { if (data->main->error.verbosity > f_console_verbosity_quiet_e) { - flockfile(data->main->error.to); + f_file_stream_lock(data->main->error); fl_print_format("%r%[%QInvalid directory while trying to %Q '%]", data->main->error.to, f_string_eol_s, data->main->error.context, data->main->error.prefix, operation, data->main->error.context); @@ -108,7 +108,7 @@ extern "C" { fl_print_format("%['.%]%r", data->main->error.to, data->main->error.context, data->main->error.context, f_string_eol_s); - funlockfile(data->main->error.to); + f_file_stream_unlock(data->main->error); } return F_false; @@ -116,7 +116,7 @@ extern "C" { if (status == F_access_denied) { if (data->main->error.verbosity > f_console_verbosity_quiet_e) { - flockfile(data->main->error.to); + f_file_stream_lock(data->main->error); fl_print_format("%r%[%QAccess denied while trying to %Q '%]", data->main->error.to, f_string_eol_s, data->main->error.context, data->main->error.prefix, operation, data->main->error.context); @@ -124,7 +124,7 @@ extern "C" { fl_print_format("%['.%]%r", data->main->error.to, data->main->error.context, data->main->error.context, f_string_eol_s); - funlockfile(data->main->error.to); + f_file_stream_unlock(data->main->error); } return F_false; @@ -132,7 +132,7 @@ extern "C" { if (status == F_loop) { if (data->main->error.verbosity > f_console_verbosity_quiet_e) { - flockfile(data->main->error.to); + f_file_stream_lock(data->main->error); fl_print_format("%r%[%QLoop while trying to %Q '%]", data->main->error.to, f_string_eol_s, data->main->error.context, data->main->error.prefix, operation, data->main->error.context); @@ -140,7 +140,7 @@ extern "C" { fl_print_format("%['.%]%r", data->main->error.to, data->main->error.context, data->main->error.context, f_string_eol_s); - funlockfile(data->main->error.to); + f_file_stream_unlock(data->main->error); } return F_false; @@ -148,7 +148,7 @@ extern "C" { if (status == F_prohibited) { if (data->main->error.verbosity > f_console_verbosity_quiet_e) { - flockfile(data->main->error.to); + f_file_stream_lock(data->main->error); fl_print_format("%r%[%QProhibited by system while trying to %Q '%]", data->main->error.to, f_string_eol_s, data->main->error.context, data->main->error.prefix, operation, data->main->error.context); @@ -156,7 +156,7 @@ extern "C" { fl_print_format("%['.%]%r", data->main->error.to, data->main->error.context, data->main->error.context, f_string_eol_s); - funlockfile(data->main->error.to); + f_file_stream_unlock(data->main->error); } return F_false; @@ -164,7 +164,7 @@ extern "C" { if (status == F_directory_found_not) { if (data->main->error.verbosity > f_console_verbosity_quiet_e) { - flockfile(data->main->error.to); + f_file_stream_lock(data->main->error); fl_print_format("%r%[%QFailed to %Q '%]", data->main->error.to, f_string_eol_s, data->main->error.context, data->main->error.prefix, operation, data->main->error.context); @@ -172,7 +172,7 @@ extern "C" { fl_print_format("%[' due to an invalid directory in the path.%]%r", data->main->error.to, data->main->error.context, data->main->error.context, f_string_eol_s); - funlockfile(data->main->error.to); + f_file_stream_unlock(data->main->error); } return F_false; @@ -180,7 +180,7 @@ extern "C" { if (status == F_failure) { if (data->main->error.verbosity > f_console_verbosity_quiet_e) { - flockfile(data->main->error.to); + f_file_stream_lock(data->main->error); fl_print_format("%r%[%QFailed to %Q '%]", data->main->error.to, f_string_eol_s, data->main->error.context, data->main->error.prefix, operation, data->main->error.context); @@ -188,14 +188,14 @@ extern "C" { fl_print_format("%['.%]%r", data->main->error.to, data->main->error.context, data->main->error.context, f_string_eol_s); - funlockfile(data->main->error.to); + f_file_stream_unlock(data->main->error); } return F_false; } if (fll_error_print(data->main->error, status, function, F_false) == F_known_not && fallback && data->main->error.verbosity > f_console_verbosity_quiet_e) { - flockfile(data->main->error.to); + f_file_stream_lock(data->main->error); fl_print_format("%r%[UNKNOWN %Q(%]", data->main->error.to, f_string_eol_s, data->main->error.context, data->main->error.prefix, data->main->error.context); fl_print_format("%[%ui%]", data->main->error.to, data->main->error.notable, status, data->main->error.notable); @@ -205,7 +205,7 @@ extern "C" { fl_print_format("%['.%]%r", data->main->error.to, data->main->error.context, data->main->error.context, f_string_eol_s); - funlockfile(data->main->error.to); + f_file_stream_unlock(data->main->error); } return F_true; @@ -236,7 +236,7 @@ extern "C" { if (status == F_file_found_not) { if (data->main->error.verbosity > f_console_verbosity_quiet_e) { - flockfile(data->main->error.to); + f_file_stream_lock(data->main->error); fl_print_format("%r%[%QOccurred on invalid UTF-8 character at stop position (at '%]", data->main->error.to, f_string_eol_s, data->main->error.context, data->main->error.prefix, data->main->error.context); fl_print_format("%[%un%]", data->main->error.to, data->main->error.notable, range.start, data->main->error.notable); @@ -244,7 +244,7 @@ extern "C" { fl_print_format("%[%Q%]", data->main->error.to, data->main->error.notable, path_file, data->main->error.notable); fl_print_format("%[').%]%r", data->main->error.to, data->main->error.context, data->main->error.context, f_string_eol_s); - funlockfile(data->main->error.to); + f_file_stream_unlock(data->main->error); } return F_false; @@ -252,7 +252,7 @@ extern "C" { if (status == F_complete_not_utf || status == F_complete_not_utf_eos || status == F_complete_not_utf_stop) { if (data->main->error.verbosity > f_console_verbosity_quiet_e) { - flockfile(data->main->error.to); + f_file_stream_lock(data->main->error); fl_print_format("%r%[%QOccurred on invalid UTF-8 character at %s (at '%]", data->main->error.to, f_string_eol_s, data->main->error.context, data->main->error.prefix, status == F_complete_not_utf_eos ? "end of string" : "stop point of string", data->main->error.context); fl_print_format("%[%un%]", data->main->error.to, data->main->error.notable, range.start, data->main->error.notable); @@ -260,7 +260,7 @@ extern "C" { fl_print_format("%[%Q%]", data->main->error.to, data->main->error.notable, path_file, data->main->error.notable); fl_print_format("%[').%]%r", data->main->error.to, data->main->error.context, data->main->error.context, f_string_eol_s); - funlockfile(data->main->error.to); + f_file_stream_unlock(data->main->error); } return F_false; @@ -268,7 +268,7 @@ extern "C" { if (status == F_complete_not_utf_stop) { if (data->main->error.verbosity > f_console_verbosity_quiet_e) { - flockfile(data->main->error.to); + f_file_stream_lock(data->main->error); fl_print_format("%r%[%QOccurred on invalid UTF-8 character at stop point of string (at '%]", data->main->error.to, f_string_eol_s, data->main->error.context, data->main->error.prefix, data->main->error.context); fl_print_format("%[%un%]", data->main->error.to, data->main->error.notable, range.start, data->main->error.notable); @@ -276,14 +276,14 @@ extern "C" { fl_print_format("%[%Q%]", data->main->error.to, data->main->error.notable, path_file, data->main->error.notable); fl_print_format("%[').%]%r", data->main->error.to, data->main->error.context, data->main->error.context, f_string_eol_s); - funlockfile(data->main->error.to); + f_file_stream_unlock(data->main->error); } return F_false; } if (fll_error_print(data->main->error, status, function, F_false) == F_known_not && fallback && data->main->error.verbosity > f_console_verbosity_quiet_e) { - flockfile(data->main->error.to); + f_file_stream_lock(data->main->error); fl_print_format("%r%[UNKNOWN %Q(%]", data->main->error.to, f_string_eol_s, data->main->error.context, data->main->error.prefix, data->main->error.context); fl_print_format("%[%ui%]", data->main->error.to, data->main->error.notable, status, data->main->error.notable); @@ -291,7 +291,7 @@ extern "C" { fl_print_format("%[%Q%]", data->main->error.to, data->main->error.notable, function, data->main->error.notable); fl_print_format("%[().%]%r", data->main->error.to, data->main->error.context, data->main->error.context, f_string_eol_s); - funlockfile(data->main->error.to); + f_file_stream_unlock(data->main->error); } return F_true; @@ -303,13 +303,13 @@ extern "C" { if (data->main->error.verbosity == f_console_verbosity_quiet_e) return; - flockfile(data->main->error.to); + f_file_stream_lock(data->main->error); fl_print_format("%r%[%QThe parameter '%]", data->main->error.to, f_string_eol_s, data->main->error.context, data->main->error.prefix, data->main->error.context); fl_print_format("%[%r%r%]", data->main->error.to, data->main->error.notable, f_console_symbol_long_enable_s, parameter, data->main->error.notable); fl_print_format("%[' is specified, but no value is given.%]%r", data->main->error.to, data->main->error.context, data->main->error.context, f_string_eol_s); - funlockfile(data->main->error.to); + f_file_stream_unlock(data->main->error); } #endif // _di_fake_print_error_parameter_missing_value_ @@ -318,13 +318,13 @@ extern "C" { if (data->main->error.verbosity == f_console_verbosity_quiet_e) return; - flockfile(data->main->error.to); + f_file_stream_lock(data->main->error); fl_print_format("%r%[%QThe parameter '%]", data->main->error.to, f_string_eol_s, data->main->error.context, data->main->error.prefix, data->main->error.context); fl_print_format("%[%r%r%]", data->main->error.to, data->main->error.notable, f_console_symbol_long_enable_s, parameter, data->main->error.notable); fl_print_format("%[' was specified too many times.%]%r", data->main->error.to, data->main->error.context, data->main->error.context, f_string_eol_s); - funlockfile(data->main->error.to); + f_file_stream_unlock(data->main->error); } #endif // _di_fake_print_error_parameter_too_many_ @@ -354,13 +354,13 @@ extern "C" { if (data_make->error.verbosity == f_console_verbosity_quiet_e) return; if (!data_make->error.to) return; - flockfile(data_make->error.to.stream); + f_file_stream_lock(data_make->error.to); fl_print_format("%r%[%QThe %]", data_make->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); fl_print_format("%[%un%]", data_make->error.to, data_make->error.notable, index, data_make->error.notable); fl_print_format("%[ argument must not be an empty string.%]%r", data_make->error.to, data_make->error.context, data_make->error.context, f_string_eol_s); - funlockfile(data_make->error.to.stream); + f_file_stream_unlock(data_make->error.to); } #endif // _di_fake_print_error_argument_empty_ @@ -374,7 +374,7 @@ extern "C" { f_fss_count_lines(state, buffer, operation_name.start, &line); - flockfile(print.to.stream); + f_file_stream_lock(print.to); fl_print_format("%r%[%QThe section operation '%]", print.to, f_string_eol_s, print.context, print.prefix, print.context); fl_print_format("%[%/Q%]", print.to, print.notable, buffer, operation_name, print.notable); @@ -384,7 +384,7 @@ extern "C" { fl_print_format("%[%un%]", print.to, print.notable, line, print.notable); fl_print_format(" %[failed.%]%r", print.to, print.context, print.context, f_string_eol_s); - funlockfile(print.to.stream); + f_file_stream_unlock(print.to); } #endif // _di_fake_print_message_section_operation_failed_ @@ -393,7 +393,7 @@ extern "C" { if (print.verbosity == f_console_verbosity_quiet_e || !print.to) return; - flockfile(print.to.stream); + f_file_stream_lock(print.to); fl_print_format("%r%[%QThe argument '%]", print.to, f_string_eol_s, print.context, print.prefix, print.context); fl_print_format("%[%Q%]", print.to, print.notable, argument, print.notable); @@ -403,7 +403,7 @@ extern "C" { fl_print_format("%[%r%]", print.to, print.notable, fake_make_operation_argument_strict_s, print.notable); fl_print_format("%['.%]%r", print.to, print.context, print.context, f_string_eol_s); - funlockfile(print.to.stream); + f_file_stream_unlock(print.to); } #endif // _di_fake_print_message_section_operation_link_argument_unknown_ @@ -413,13 +413,13 @@ extern "C" { if (print.verbosity == f_console_verbosity_quiet_e || !print.to) return; - flockfile(print.to.stream); + f_file_stream_lock(print.to); fl_print_format("%r%[%QThe point file '%]", print.to, f_string_eol_s, print.context, print.prefix, print.context); fl_print_format("%[%Q%]", print.to, print.notable, argument, print.notable); fl_print_format("%[' already exists.%]%r", print.to, print.context, print.context, f_string_eol_s); - funlockfile(print.to.stream); + f_file_stream_unlock(print.to); } #endif // _di_fake_print_message_section_operation_link_point_exists_ @@ -429,13 +429,13 @@ extern "C" { if (print.verbosity == f_console_verbosity_quiet_e || !print.to) return; - flockfile(print.to.stream); + f_file_stream_lock(print.to); fl_print_format("%r%[%QThe target file '%]", print.to, f_string_eol_s, print.context, print.prefix, print.context); fl_print_format("%[%Q%]", print.to, print.notable, argument, print.notable); fl_print_format("%[' does not exist.%]%r", print.to, print.context, print.context, f_string_eol_s); - funlockfile(print.to.stream); + f_file_stream_unlock(print.to); } #endif // _di_fake_print_message_section_operation_link_target_exists_not_ @@ -445,7 +445,7 @@ extern "C" { if (data->main->error.verbosity == f_console_verbosity_quiet_e || !print.to) return; - flockfile(data->main->error.to); + f_file_stream_lock(data->main->error); if (F_status_set_fine(status) == F_false) { fl_print_format("%r%[%QThe path '%]", data->main->error.to, f_string_eol_s, data->main->error.context, data->main->error.prefix, data->main->error.context); @@ -456,7 +456,7 @@ extern "C" { fll_error_file_print(data->main->error, F_status_set_fine(status), function, F_true, path, fake_common_file_path_determine_real_s, fll_error_file_type_file_e); } - funlockfile(data->main->error.to); + f_file_stream_unlock(data->main->error); } #endif // _di_fake_print_message_section_operation_path_outside_ @@ -466,7 +466,7 @@ extern "C" { if (data->main->error.verbosity == f_console_verbosity_quiet_e || !print.to) return; if (status == F_array_too_large) { - flockfile(data->main->error.to); + f_file_stream_lock(data->main->error); fl_print_format("%r%[%QMaximum stack size reached while processing path '%]", data->main->error.to, f_string_eol_s, data->main->error.context, data->main->error.prefix, data->main->error.context); fl_print_format("%[%Q%]", data->main->error.to, data->main->error.notable, path, data->main->error.notable); @@ -479,7 +479,7 @@ extern "C" { fl_print_format(".%]%r", data->main->error.to, data->main->error.context, f_string_eol_s); - funlockfile(data->main->error.to); + f_file_stream_unlock(data->main->error); } else { fll_error_file_print(print, status, function, F_true, path, fake_common_file_path_change_to_s, fll_error_file_type_directory_e); @@ -497,7 +497,7 @@ extern "C" { f_fss_count_lines(state, buffer, operation_name.start, &line); - flockfile(data->main->error.to); + f_file_stream_lock(data->main->error); fl_print_format("%r%[%QThe section operation '%]", data->main->error.to, f_string_eol_s, data->main->error.context, data->main->error.prefix, data->main->error.context); fl_print_format("%[%/Q%]", data->main->error.to, data->main->error.notable, buffer, operation_name, data->main->error.notable); @@ -509,7 +509,7 @@ extern "C" { fl_print_format("%[%ul%]", data->main->error.to, data->main->error.notable, stack_max, data->main->error.notable); fl_print_format(" %[has been reached.%]%r", data->main->error.to, data->main->error.context, data->main->error.context, f_string_eol_s); - funlockfile(data->main->error.to); + f_file_stream_unlock(data->main->error); } #endif // _di_fake_print_message_section_operation_stack_max_ @@ -523,7 +523,7 @@ extern "C" { f_fss_count_lines(state, buffer, operation_name.start, &line); - flockfile(data->main->error.to); + f_file_stream_lock(data->main->error); fl_print_format("%r%[%QThe section operation '%]", data->main->error.to, f_string_eol_s, data->main->error.context, data->main->error.prefix, data->main->error.context); fl_print_format("%[%/Q%]", data->main->error.to, data->main->error.notable, buffer, operation_name, data->main->error.notable); @@ -533,7 +533,7 @@ extern "C" { fl_print_format("%[%ul%]", data->main->error.to, data->main->error.notable, line, data->main->error.notable); fl_print_format(" %[is not a known operation name.%]%r", data->main->error.to, data->main->error.context, data->main->error.context, f_string_eol_s); - funlockfile(data->main->error.to); + f_file_stream_unlock(data->main->error); } #endif // _di_fake_print_message_section_operation_unknown_ @@ -542,7 +542,7 @@ extern "C" { if (data->main->warning.verbosity == f_console_verbosity_quiet_e) return; - flockfile(data->main->warning.to); + f_file_stream_lock(data->main->warning); fl_print_format("%r%[%QThe fakefile '%]", data->main->warning.to, f_string_eol_s, data->main->warning.context, data->main->warning.prefix, data->main->warning.context); fl_print_format("%[%Q%]", data->main->warning.to, data->main->warning.notable, path_file, data->main->warning.notable); @@ -552,7 +552,7 @@ extern "C" { fl_print_format("%[%/Q%]", data->main->warning.to, data->main->warning.notable, buffer, range_object, data->main->warning.notable); fl_print_format("%['.%]%r", data->main->warning.to, data->main->warning.context, data->main->warning.context, f_string_eol_s); - funlockfile(data->main->warning.to); + f_file_stream_unlock(data->main->warning); } #endif // _di_fake_print_warning_settings_content_empty_ @@ -561,7 +561,7 @@ extern "C" { if (data->main->warning.verbosity == f_console_verbosity_quiet_e) return; - flockfile(data->main->warning.to); + f_file_stream_lock(data->main->warning); fl_print_format("%r%[%QThe fakefile '%]", data->main->warning.to, f_string_eol_s, data->main->warning.context, data->main->warning.prefix, data->main->warning.context); fl_print_format("%[%Q%]", data->main->warning.to, data->main->warning.notable, path_file, data->main->warning.notable); @@ -573,7 +573,7 @@ extern "C" { fl_print_format("%[%/Q%]", data->main->warning.to, data->main->warning.notable, buffer, range_object, data->main->warning.notable); fl_print_format("%['.%]%r", data->main->warning.to, data->main->warning.context, data->main->warning.context, f_string_eol_s); - funlockfile(data->main->warning.to); + f_file_stream_unlock(data->main->warning); } #endif // _di_fake_print_warning_settings_content_invalid_ @@ -582,7 +582,7 @@ extern "C" { if (data->main->warning.verbosity == f_console_verbosity_quiet_e) return; - flockfile(data->main->warning.to); + f_file_stream_lock(data->main->warning); fl_print_format("%r%[%QThe fakefile '%]", data->main->warning.to, f_string_eol_s, data->main->warning.context, data->main->warning.prefix, data->main->warning.context); fl_print_format("%[%r%]", data->main->warning.to, data->main->warning.notable, name_object, data->main->warning.notable); @@ -590,7 +590,7 @@ extern "C" { fl_print_format("%[%Q%]", data->main->warning.to, data->main->warning.notable, path_file, data->main->warning.notable); fl_print_format("%[' may only have a single property, only using the first.%]%r", data->main->warning.to, data->main->warning.context, data->main->warning.context, f_string_eol_s); - funlockfile(data->main->warning.to); + f_file_stream_unlock(data->main->warning); } #endif // _di_fake_print_warning_settings_content_multiple_ @@ -599,7 +599,7 @@ extern "C" { if (data->main->warning.verbosity == f_console_verbosity_quiet_e) return; - flockfile(data->main->warning.to); + f_file_stream_lock(data->main->warning); fl_print_format("%r%[%QThe object '%]", data->main->warning.to, f_string_eol_s, data->main->warning.context, data->main->warning.prefix, data->main->warning.context); fl_print_format("%[%r%]", data->main->warning.to, data->main->warning.notable, name_object, data->main->warning.notable); @@ -607,7 +607,7 @@ extern "C" { fl_print_format("%[%Q%]", data->main->warning.to, data->main->warning.notable, path_file, data->main->warning.notable); fl_print_format("%[' may only be specified once, only using the first.%]%r", data->main->warning.to, data->main->warning.context, data->main->warning.context, f_string_eol_s); - funlockfile(data->main->warning.to); + f_file_stream_unlock(data->main->warning); } #endif // _di_fake_print_warning_settings_object_multiple_ diff --git a/level_3/fake/c/private-print.h b/level_3/fake/c/private-print.h index 02ba75e..b72453d 100644 --- a/level_3/fake/c/private-print.h +++ b/level_3/fake/c/private-print.h @@ -37,9 +37,8 @@ extern "C" { * F_true is returned if the status code has no print message. * F_false is returned on successful print of known errors. * - * @see flockfile() - * @see funlockfile() - * + * @see f_file_stream_lock() + * @see f_file_stream_unlock() * @see fl_print_format() * * @see fake_print_error_build_operation_file_message(); @@ -93,9 +92,8 @@ extern "C" { * F_true is returned if the status code has no print message. * F_false is returned on successful print of known errors. * - * @see flockfile() - * @see funlockfile() - * + * @see f_file_stream_lock() + * @see f_file_stream_unlock() * @see fl_print_format() */ #ifndef _di_fake_print_error_fss_ @@ -110,9 +108,8 @@ extern "C" { * @param parameter * The parameter name. * - * @see flockfile() - * @see funlockfile() - * + * @see f_file_stream_lock() + * @see f_file_stream_unlock() * @see fl_print_format() */ #ifndef _di_fake_print_error_parameter_missing_value_ @@ -127,9 +124,8 @@ extern "C" { * @param parameter * The parameter name. * - * @see flockfile() - * @see funlockfile() - * + * @see f_file_stream_lock() + * @see f_file_stream_unlock() * @see fl_print_format() */ #ifndef _di_fake_print_error_parameter_too_many_ @@ -188,9 +184,8 @@ extern "C" { * @param operation_name * The range within the buffer representing the operation name within the section. * - * @see flockfile() - * @see funlockfile() - * + * @see f_file_stream_lock() + * @see f_file_stream_unlock() * @see fl_print_format() */ #ifndef _di_fake_print_message_section_operation_failed_ @@ -207,9 +202,8 @@ extern "C" { * @param argument * The argument that is unknown by the link operation. * - * @see flockfile() - * @see funlockfile() - * + * @see f_file_stream_lock() + * @see f_file_stream_unlock() * @see fl_print_format() */ #ifndef _di_fake_print_message_section_operation_link_argument_unknown_ @@ -226,9 +220,8 @@ extern "C" { * @param argument * The argument representing the point file. * - * @see flockfile() - * @see funlockfile() - * + * @see f_file_stream_lock() + * @see f_file_stream_unlock() * @see fl_print_format() */ #ifndef _di_fake_print_message_section_operation_link_point_exists_ @@ -245,9 +238,8 @@ extern "C" { * @param argument * The argument representing the point file. * - * @see flockfile() - * @see funlockfile() - * + * @see f_file_stream_lock() + * @see f_file_stream_unlock() * @see fl_print_format() */ #ifndef _di_fake_print_message_section_operation_link_target_exists_not_ @@ -268,9 +260,8 @@ extern "C" { * @param path * The path that is outside of the project path. * - * @see flockfile() - * @see funlockfile() - * + * @see f_file_stream_lock() + * @see f_file_stream_unlock() * @see fl_print_format() * @see fll_error_file_print() */ @@ -293,9 +284,8 @@ extern "C" { * @param path * The path to the directory. * - * @see flockfile() - * @see funlockfile() - * + * @see f_file_stream_lock() + * @see f_file_stream_unlock() * @see fl_print_format() * @see fll_error_file_print() */ @@ -319,9 +309,8 @@ extern "C" { * @param stack_max * The max stack depth. * - * @see flockfile() - * @see funlockfile() - * + * @see f_file_stream_lock() + * @see f_file_stream_unlock() * @see fl_print_format() */ #ifndef _di_fake_print_message_section_operation_stack_max_ @@ -342,9 +331,8 @@ extern "C" { * @param operation_name * The range within the buffer representing the operation name within the section. * - * @see flockfile() - * @see funlockfile() - * + * @see f_file_stream_lock() + * @see f_file_stream_unlock() * @see fl_print_format() */ #ifndef _di_fake_print_message_section_operation_unknown_ @@ -365,9 +353,8 @@ extern "C" { * @param settings_name * The name of the setting that has an invalid value. * - * @see flockfile() - * @see funlockfile() - * + * @see f_file_stream_lock() + * @see f_file_stream_unlock() * @see fl_print_format() */ #ifndef _di_fake_print_warning_settings_content_empty_ @@ -390,9 +377,8 @@ extern "C" { * @param settings_name * The name of the setting that has an invalid value. * - * @see flockfile() - * @see funlockfile() - * + * @see f_file_stream_lock() + * @see f_file_stream_unlock() * @see fl_print_format() */ #ifndef _di_fake_print_warning_settings_content_invalid_ @@ -411,9 +397,8 @@ extern "C" { * @param name_object * The name of the object. * - * @see flockfile() - * @see funlockfile() - * + * @see f_file_stream_lock() + * @see f_file_stream_unlock() * @see fl_print_format() */ #ifndef _di_fake_print_warning_settings_content_multiple_ @@ -434,9 +419,8 @@ extern "C" { * @param name_object * The name of the object. * - * @see flockfile() - * @see funlockfile() - * + * @see f_file_stream_lock() + * @see f_file_stream_unlock() * @see fl_print_format() */ #ifndef _di_fake_print_warning_settings_object_multiple_ diff --git a/level_3/fake/c/private-skeleton.c b/level_3/fake/c/private-skeleton.c index 593a970..4a54032 100644 --- a/level_3/fake/c/private-skeleton.c +++ b/level_3/fake/c/private-skeleton.c @@ -143,13 +143,13 @@ extern "C" { if (status == F_false) { if (data->main->error.verbosity > f_console_verbosity_quiet_e) { - flockfile(data->main->error.to); + f_file_stream_lock(data->main->error); fl_print_format("%r%[%QThe path '%]", data->main->error.to, f_string_eol_s, data->main->error.context, data->main->error.prefix, data->main->error.context); fl_print_format("%[%Q%]", data->main->error.to, data->main->error.notable, path, data->main->error.notable); fl_print_format("%[' exists but is not a directory.%]%r", data->main->error.to, data->main->error.context, data->main->error.context, f_string_eol_s); - funlockfile(data->main->error.to); + f_file_stream_unlock(data->main->error); } return F_status_set_warning(F_failure); @@ -159,13 +159,13 @@ extern "C" { if (F_status_is_error(status)) { if (F_status_set_fine(status) == F_file_found_not) { - flockfile(data->main->error.to); + f_file_stream_lock(data->main->error); fl_print_format("%r%[%QThe path '%]", data->main->error.to, f_string_eol_s, data->main->error.context, data->main->error.prefix, data->main->error.context); fl_print_format("%[%Q%]", data->main->error.to, data->main->error.notable, path, data->main->error.notable); fl_print_format("%[' could not be created, a parent directory does not exist.%]%r", data->main->error.to, data->main->error.context, data->main->error.context, f_string_eol_s); - funlockfile(data->main->error.to); + f_file_stream_unlock(data->main->error); } else { fll_error_file_print(data->main->error, F_status_set_fine(status), "f_directory_create", F_true, path, f_file_operation_create_s, fll_error_file_type_directory_e); @@ -236,13 +236,13 @@ extern "C" { if (F_status_is_error(status)) { if (F_status_set_fine(status) == F_file_found_not) { - flockfile(data->main->error.to); + f_file_stream_lock(data->main->error); fl_print_format("%r%[%QThe file '%]", data->main->error.to, f_string_eol_s, data->main->error.context, data->main->error.prefix, data->main->error.context); fl_print_format("%[%Q%]", data->main->error.to, data->main->error.notable, path, data->main->error.notable); fl_print_format("%[' could not be created, a parent directory does not exist.%]%r", data->main->error.to, data->main->error.context, data->main->error.context, f_string_eol_s); - funlockfile(data->main->error.to); + f_file_stream_unlock(data->main->error); } else { fll_error_file_print(data->main->error, F_status_set_fine(status), "f_file_create", F_true, path, f_file_operation_create_s, fll_error_file_type_file_e); diff --git a/level_3/firewall/c/firewall.c b/level_3/firewall/c/firewall.c index 897db54..d89c92e 100644 --- a/level_3/firewall/c/firewall.c +++ b/level_3/firewall/c/firewall.c @@ -174,14 +174,14 @@ extern "C" { show_ports = F_true; } else { - flockfile(main->warning.to.stream); + f_file_stream_lock(main->warning.to); fl_print_format("%r%[%Q'%]", main->warning.to, f_string_eol_s, main->warning.context, main->warning.prefix, main->warning.context); fl_print_format("%[%Q%]", main->warning.to, main->warning.notable, data.argv[index], main->warning.notable); fl_print_format("%[' is not a valid show option.%]%r", main->warning.to, main->warning.context, main->warning.context, f_string_eol_s); - funlockfile(main->warning.to.stream); - fflush(main->warning.to); + f_file_stream_unlock(main->warning.to); + f_file_stream_flush(main->warning.to); } } } diff --git a/level_3/firewall/c/private-common.c b/level_3/firewall/c/private-common.c index 6ddbec0..95fe6c5 100644 --- a/level_3/firewall/c/private-common.c +++ b/level_3/firewall/c/private-common.c @@ -19,7 +19,7 @@ void firewall_print_debug_tool(const fl_print_t output, const f_string_static_t if (output.verbosity != f_console_verbosity_debug_e) return; - flockfile(output.to.stream); + f_file_stream_lock(output.to); fl_print_format("%[%r", output.to, output.context, tool); @@ -29,7 +29,7 @@ void firewall_print_debug_tool(const fl_print_t output, const f_string_static_t fl_print_format("%]%r", output.to, output.context, f_string_eol_s); - funlockfile(output.to.stream); + f_file_stream_unlock(output.to); } void firewall_print_error_on_allocation_failure(const fl_print_t output) { @@ -57,7 +57,7 @@ void firewall_print_error_on_operation(const fl_print_t output, const f_string_s if (output.verbosity == f_console_verbosity_quiet_e) return; - flockfile(output.to.stream); + f_file_stream_lock(output.to); fl_print_format("%r%[%QFailed to perform requested %r operation:%]", output.to, f_string_eol_s, output.context, output.prefix, tool, output.context); fl_print_format("%r %[%r", output.to, f_string_eol_s, output.context, tool); @@ -68,7 +68,7 @@ void firewall_print_error_on_operation(const fl_print_t output, const f_string_s fl_print_format("%]%r", output.to, output.context, f_string_eol_s); - funlockfile(output.to.stream); + f_file_stream_unlock(output.to); } void firewall_print_error_on_unhandled(const fl_print_t output, const char *function, const f_status_t status) { diff --git a/level_3/firewall/c/private-firewall.c b/level_3/firewall/c/private-firewall.c index 42ca1bd..6b54c5a 100644 --- a/level_3/firewall/c/private-firewall.c +++ b/level_3/firewall/c/private-firewall.c @@ -290,13 +290,13 @@ f_status_t firewall_perform_commands(firewall_data_t * const data, firewall_loca // If the remaining rule does not match as firewall_rule_s, then it is an invalid rule. else if (fl_string_dynamic_compare_string(local->buffer.string + local->rule_objects.array[i].start, firewall_rule_s, length) == F_equal_to_not) { if (length) { - flockfile(data->main->warning.to); + f_file_stream_lock(data->main->warning); fl_print_format("%r%[%QAt line %ul, the object '%]", data->main->warning.to, f_string_eol_s, data->main->warning.context, data->main->warning.prefix, i, data->main->warning.context, data->main->warning.notable); fl_print_format("%[%/Q%]", data->main->warning.to, data->main->warning.notable, local->buffer, local->rule_objects.array[i], data->main->warning.notable); fl_print_format("%[' is invalid.%]%r", data->main->warning.to, data->main->warning.context, data->main->warning.context, f_string_eol_s); - funlockfile(data->main->warning.to); + f_file_stream_unlock(data->main->warning); } else { fll_print_format("%r%[%QAt line %ul, the object is missing.%]%r", data->main->warning.to, f_string_eol_s, data->main->warning.context, data->main->warning.prefix, i, data->main->warning.context, f_string_eol_s); @@ -309,7 +309,7 @@ f_status_t firewall_perform_commands(firewall_data_t * const data, firewall_loca length = (local->rule_objects.array[i].stop - local->rule_objects.array[i].start) + 1; if (length) { - flockfile(data->main->warning.to); + f_file_stream_lock(data->main->warning); fl_print_format("%r%[%QAt line %ul, the object '%]", data->main->warning.to, f_string_eol_s, data->main->warning.context, data->main->warning.prefix, i, data->main->warning.context); fl_print_format("%[%/Q%]", data->main->warning.to, data->main->warning.notable, local->buffer, local->rule_objects.array[i], data->main->warning.notable); @@ -317,7 +317,7 @@ f_status_t firewall_perform_commands(firewall_data_t * const data, firewall_loca fl_print_format("%[%/Q%]", data->main->warning.to, data->main->warning.notable, local->buffer, local->rule_contents.array[i].array[0], data->main->warning.notable); fl_print_format("%['.%]%r", data->main->warning.to, data->main->warning.context, data->main->warning.context, f_string_eol_s); - funlockfile(data->main->warning.to); + f_file_stream_unlock(data->main->warning); } else { fll_print_format("%r%[%QAt line %ul, the object has no content.%]%r", data->main->warning.to, f_string_eol_s, data->main->warning.context, data->main->warning.prefix, i, data->main->warning.context, f_string_eol_s); @@ -515,13 +515,13 @@ f_status_t firewall_perform_commands(firewall_data_t * const data, firewall_loca else { length = (local->rule_objects.array[i].stop - local->rule_objects.array[i].start) + 1; - flockfile(data->main->warning.to); + f_file_stream_lock(data->main->warning); fl_print_format("%r%[%QAt line %ul, the object '%]", data->main->warning.to, f_string_eol_s, data->main->warning.context, data->main->warning.prefix, i, data->main->warning.context); fl_print_format("%[%/Q%]", data->main->warning.to, data->main->warning.notable, local->buffer, local->rule_objects.array[i], data->main->warning.notable); fl_print_format("%]%[' has no content.%]%r", data->main->warning.to, data->main->warning.context, data->main->warning.context, f_string_eol_s); - funlockfile(data->main->warning.to); + f_file_stream_unlock(data->main->warning); break; } diff --git a/level_3/fss_basic_list_read/c/private-print.c b/level_3/fss_basic_list_read/c/private-print.c index a5ec4ae..c45be1a 100644 --- a/level_3/fss_basic_list_read/c/private-print.c +++ b/level_3/fss_basic_list_read/c/private-print.c @@ -14,7 +14,7 @@ extern "C" { } if ((data->option & fss_basic_list_read_data_option_object_d) || (data->option & fss_basic_list_read_data_option_content_d) && (data->contents.array[at].used || (data->option & fss_basic_list_read_data_option_empty_d))) { - flockfile(main->output.to.stream); + f_file_stream_lock(main->output.to); if (data->option & fss_basic_list_read_data_option_object_d) { if (data->option & fss_basic_list_read_data_option_trim_d) { @@ -39,7 +39,7 @@ extern "C" { fss_basic_list_read_print_set_end(main); - funlockfile(main->output.to.stream); + f_file_stream_unlock(main->output.to); } } #endif // _di_fss_basic_list_read_print_at_ diff --git a/level_3/fss_basic_list_read/c/private-read.c b/level_3/fss_basic_list_read/c/private-read.c index 065ca50..a106622 100644 --- a/level_3/fss_basic_list_read/c/private-read.c +++ b/level_3/fss_basic_list_read/c/private-read.c @@ -262,11 +262,11 @@ extern "C" { if (status == F_data_not_stop || status == F_data_not_eos) { if (data->option & fss_basic_list_read_data_option_total_d) { - flockfile(main->output.to.stream); + f_file_stream_lock(main->output.to); fss_basic_list_read_print_zero(main); - funlockfile(main->output.to.stream); + f_file_stream_unlock(main->output.to); return F_none; } @@ -308,11 +308,11 @@ extern "C" { // This standard does not support multiple content groups. if ((data->option & fss_basic_list_read_data_option_select_d) && data->select) { if (main->parameters.array[fss_basic_list_read_parameter_total_e].result == f_console_result_found_e) { - flockfile(main->output.to.stream); + f_file_stream_lock(main->output.to); fss_basic_list_read_print_zero(main); - funlockfile(main->output.to.stream); + f_file_stream_unlock(main->output.to); } return F_none; @@ -377,11 +377,11 @@ extern "C" { if (data->depths.array[0].value_at >= data->objects.used) { if (data->option & (fss_basic_list_read_data_option_columns_d | fss_basic_list_read_data_option_total_d)) { - flockfile(main->output.to.stream); + f_file_stream_lock(main->output.to); fss_basic_list_read_print_zero(main); - funlockfile(main->output.to.stream); + f_file_stream_unlock(main->output.to); } return F_none; @@ -457,11 +457,11 @@ extern "C" { } // for if (data->option & fss_basic_list_read_data_option_total_d) { - flockfile(main->output.to.stream); + f_file_stream_lock(main->output.to); fss_basic_list_read_print_zero(main); - funlockfile(main->output.to.stream); + f_file_stream_unlock(main->output.to); } return F_none; @@ -473,7 +473,7 @@ extern "C" { if (data->option & fss_basic_list_read_data_option_object_d) { if (*line == data->line) { - flockfile(main->output.to.stream); + f_file_stream_lock(main->output.to); if (data->option & fss_basic_list_read_data_option_total_d) { fss_basic_list_read_print_one(main); @@ -482,7 +482,7 @@ extern "C" { fss_basic_list_read_print_at_object(main, data, at, delimits_object); } - funlockfile(main->output.to.stream); + f_file_stream_unlock(main->output.to); return F_success; } @@ -520,7 +520,7 @@ extern "C" { if (*line == data->line) { range.stop = i; - flockfile(main->output.to.stream); + f_file_stream_lock(main->output.to); if (data->option & fss_basic_list_read_data_option_total_d) { fss_basic_list_read_print_one(main); @@ -529,7 +529,7 @@ extern "C" { f_print_except_in_dynamic_partial(data->buffer, range, delimits_content, data->comments, main->output.to); } - funlockfile(main->output.to.stream); + f_file_stream_unlock(main->output.to); return F_success; } @@ -547,7 +547,7 @@ extern "C" { ++(*line); if (*line == data->line) { - flockfile(main->output.to.stream); + f_file_stream_lock(main->output.to); if (data->option & fss_basic_list_read_data_option_total_d) { fss_basic_list_read_print_one(main); @@ -559,7 +559,7 @@ extern "C" { f_print_dynamic_raw(f_string_eol_s, main->output.to); } - funlockfile(main->output.to.stream); + f_file_stream_unlock(main->output.to); return F_success; } @@ -574,11 +574,11 @@ extern "C" { f_status_t fss_basic_list_read_process_columns(fll_program_data_t * const main, fss_basic_list_read_data_t * const data, bool names[]) { if (!(data->option & fss_basic_list_read_data_option_content_d)) { - flockfile(main->output.to.stream); + f_file_stream_lock(main->output.to); fss_basic_list_read_print_zero(main); - funlockfile(main->output.to.stream); + f_file_stream_unlock(main->output.to); return F_none; } @@ -789,7 +789,7 @@ extern "C" { } } // for - flockfile(main->output.to.stream); + f_file_stream_lock(main->output.to); if (data->option & fss_basic_list_read_data_option_line_d) { if (data->line < total) { @@ -803,7 +803,7 @@ extern "C" { fl_print_format("%ul%r", main->output.to, total, f_string_eol_s); } - funlockfile(main->output.to.stream); + f_file_stream_unlock(main->output.to); return F_none; } diff --git a/level_3/fss_basic_read/c/private-print.c b/level_3/fss_basic_read/c/private-print.c index edcb186..3c5ed2d 100644 --- a/level_3/fss_basic_read/c/private-print.c +++ b/level_3/fss_basic_read/c/private-print.c @@ -14,7 +14,7 @@ extern "C" { } if ((data->option & fss_basic_read_data_option_object_d) || (data->option & fss_basic_read_data_option_content_d) && (data->contents.array[at].used || (data->option & fss_basic_read_data_option_empty_d))) { - flockfile(main->output.to.stream); + f_file_stream_lock(main->output.to); if (data->option & fss_basic_read_data_option_object_d) { if (data->option & fss_basic_read_data_option_trim_d) { @@ -66,7 +66,7 @@ extern "C" { fss_basic_read_print_set_end(main); - funlockfile(main->output.to.stream); + f_file_stream_unlock(main->output.to); } } #endif // _di_fss_basic_read_print_at_ diff --git a/level_3/fss_basic_read/c/private-read.c b/level_3/fss_basic_read/c/private-read.c index 5ff88ce..57231a2 100644 --- a/level_3/fss_basic_read/c/private-read.c +++ b/level_3/fss_basic_read/c/private-read.c @@ -289,11 +289,11 @@ extern "C" { // This standard does not support multiple content groups. if ((data->option & fss_basic_read_data_option_select_d) && data->select) { if (main->parameters.array[fss_basic_read_parameter_total_e].result == f_console_result_found_e) { - flockfile(main->output.to.stream); + f_file_stream_lock(main->output.to); fss_basic_read_print_zero(main); - funlockfile(main->output.to.stream); + f_file_stream_unlock(main->output.to); } return F_none; @@ -342,11 +342,11 @@ extern "C" { if (data->depths.array[0].value_at >= data->objects.used) { if (data->option & (fss_basic_read_data_option_columns_d | fss_basic_read_data_option_total_d)) { - flockfile(main->output.to.stream); + f_file_stream_lock(main->output.to); fss_basic_read_print_zero(main); - funlockfile(main->output.to.stream); + f_file_stream_unlock(main->output.to); } return F_none; @@ -356,11 +356,11 @@ extern "C" { if (data->option & fss_basic_read_data_option_line_d) { if (data->line) { if (data->option & fss_basic_read_data_option_total_d) { - flockfile(main->output.to.stream); + f_file_stream_lock(main->output.to); fss_basic_read_print_zero(main); - funlockfile(main->output.to.stream); + f_file_stream_unlock(main->output.to); } return F_none; @@ -393,11 +393,11 @@ extern "C" { if (data->line) break; if (data->option & fss_basic_read_data_option_total_d) { - flockfile(main->output.to.stream); + f_file_stream_lock(main->output.to); fss_basic_read_print_one(main); - funlockfile(main->output.to.stream); + f_file_stream_unlock(main->output.to); } else { fss_basic_read_print_at(main, i, *delimits, except_none, data); @@ -407,7 +407,7 @@ extern "C" { fll_print_format("%ul%r", main->output.to, data->contents.array[i].used, f_string_eol_s); } else if (data->option & fss_basic_read_data_option_total_d) { - flockfile(main->output.to.stream); + f_file_stream_lock(main->output.to); if (data->contents.array[i].used) { fss_basic_read_print_one(main); @@ -416,7 +416,7 @@ extern "C" { fss_basic_read_print_zero(main); } - funlockfile(main->output.to.stream); + f_file_stream_unlock(main->output.to); } else { fss_basic_read_print_at(main, i, *delimits, except_none, data); @@ -429,11 +429,11 @@ extern "C" { } // for if (data->option & fss_basic_read_data_option_total_d) { - flockfile(main->output.to.stream); + f_file_stream_lock(main->output.to); fss_basic_read_print_zero(main); - funlockfile(main->output.to.stream); + f_file_stream_unlock(main->output.to); } return F_none; @@ -444,11 +444,11 @@ extern "C" { f_status_t fss_basic_read_process_columns(fll_program_data_t * const main, fss_basic_read_data_t * const data, bool names[]) { if (!(data->option & fss_basic_read_data_option_content_d)) { - flockfile(main->output.to.stream); + f_file_stream_lock(main->output.to); fss_basic_read_print_zero(main); - funlockfile(main->output.to.stream); + f_file_stream_unlock(main->output.to); return F_none; } @@ -506,11 +506,11 @@ extern "C" { if (!data->contents.array[i].used) { if (data->option & fss_basic_read_data_option_empty_d) { if (line == data->line) { - flockfile(main->output.to.stream); + f_file_stream_lock(main->output.to); fss_basic_read_print_set_end(main); - funlockfile(main->output.to.stream); + f_file_stream_unlock(main->output.to); break; } @@ -662,7 +662,7 @@ extern "C" { ++total; } // for - flockfile(main->output.to.stream); + f_file_stream_lock(main->output.to); if (data->option & fss_basic_read_data_option_line_d) { if (data->line < total) { @@ -676,7 +676,7 @@ extern "C" { fl_print_format("%ul%r", main->output.to, total, f_string_eol_s); } - funlockfile(main->output.to.stream); + f_file_stream_unlock(main->output.to); return F_none; } diff --git a/level_3/fss_embedded_list_read/c/private-read.c b/level_3/fss_embedded_list_read/c/private-read.c index 95fc573..601b390 100644 --- a/level_3/fss_embedded_list_read/c/private-read.c +++ b/level_3/fss_embedded_list_read/c/private-read.c @@ -205,7 +205,7 @@ extern "C" { for (j = i + 1; j < depths->used; ++j) { if (depths->array[i].depth == depths->array[j].depth) { - flockfile(data->main->error.to); + f_file_stream_lock(data->main->error); fl_print_format("%r%[%QThe value '%]", data->main->error.to, f_string_eol_s, data->main->error.context, data->main->error.prefix, data->main->error.context); fl_print_format("%[%ul%]", data->main->error.to, data->main->error.notable, depths->array[i].depth, data->main->error.notable); @@ -213,12 +213,12 @@ extern "C" { fl_print_format("%[%r%r%]", data->main->error.to, data->main->error.notable, f_console_symbol_long_enable_s, fss_embedded_list_read_long_depth_s, data->main->error.notable); fl_print_format("%['.%]%r", data->main->error.to, data->main->error.context, data->main->error.context, f_string_eol_s); - funlockfile(data->main->error.to); + f_file_stream_unlock(data->main->error); return F_status_set_error(F_parameter); } else if (depths->array[i].depth > depths->array[j].depth) { - flockfile(data->main->error.to); + f_file_stream_lock(data->main->error); fl_print_format("%r%[%QThe parameter '%]", data->main->error.to, f_string_eol_s, data->main->error.context, data->main->error.prefix, data->main->error.context); fl_print_format("%[%r%r%]", data->main->error.to, data->main->error.notable, f_console_symbol_long_enable_s, fss_embedded_list_read_long_depth_s, data->main->error.notable); @@ -228,7 +228,7 @@ extern "C" { fl_print_format("%[%ul%]", data->main->error.to, data->main->error.notable, depths->array[j].depth, data->main->error.notable); fl_print_format("%['.%]%r", data->main->error.to, data->main->error.context, data->main->error.context, f_string_eol_s); - funlockfile(data->main->error.to); + f_file_stream_unlock(data->main->error); return F_status_set_error(F_parameter); } @@ -516,7 +516,7 @@ extern "C" { print_object = &fl_print_trim_except_dynamic_partial; } - flockfile(data->main->output.to); + f_file_stream_lock(data->main->output); for (i = 0; i < items->used; ++i) { @@ -535,7 +535,7 @@ extern "C" { fss_embedded_list_read_print_set_end(data); } // for - funlockfile(data->main->output.to); + f_file_stream_unlock(data->main->output); return F_none; } @@ -590,7 +590,7 @@ extern "C" { if (data->main->parameters.array[fss_embedded_list_read_parameter_line_e].result == f_console_result_additional_e) { f_array_length_t line_current = 0; - flockfile(data->main->output.to); + f_file_stream_lock(data->main->output); for (; i < items->used; ++i) { @@ -647,12 +647,12 @@ extern "C" { } } // for - funlockfile(data->main->output.to); + f_file_stream_unlock(data->main->output); return F_none; } - flockfile(data->main->output.to); + f_file_stream_lock(data->main->output); for (i = 0; i < items->used; ++i) { @@ -673,7 +673,7 @@ extern "C" { } } // for - funlockfile(data->main->output.to); + f_file_stream_unlock(data->main->output); return F_none; } diff --git a/level_3/fss_extended_list_read/c/private-print.c b/level_3/fss_extended_list_read/c/private-print.c index ebcc11d..c1809d8 100644 --- a/level_3/fss_extended_list_read/c/private-print.c +++ b/level_3/fss_extended_list_read/c/private-print.c @@ -14,7 +14,7 @@ extern "C" { } if ((data->option & fss_extended_list_read_data_option_object_d) || ((data->option & fss_extended_list_read_data_option_content_d) && (data->contents.array[at].used && data->contents.array[at].array[0].start <= data->contents.array[at].array[0].stop || (data->option & fss_extended_list_read_data_option_empty_d)))) { - flockfile(main->output.to.stream); + f_file_stream_lock(main->output.to); if (data->option & fss_extended_list_read_data_option_object_d) { if (data->option & fss_extended_list_read_data_option_trim_d) { @@ -41,7 +41,7 @@ extern "C" { fss_extended_list_read_print_set_end(main, data); - funlockfile(main->output.to.stream); + f_file_stream_unlock(main->output.to); } } #endif // _di_fss_extended_list_read_print_at_ diff --git a/level_3/fss_extended_list_read/c/private-read.c b/level_3/fss_extended_list_read/c/private-read.c index 28974f5..da2b8fa 100644 --- a/level_3/fss_extended_list_read/c/private-read.c +++ b/level_3/fss_extended_list_read/c/private-read.c @@ -360,11 +360,11 @@ extern "C" { if (data->depths.array[0].value_at >= data->objects.used) { if (data->option & (fss_extended_list_read_data_option_columns_d | fss_extended_list_read_data_option_total_d)) { - flockfile(main->output.to.stream); + f_file_stream_lock(main->output.to); fss_extended_list_read_print_zero(main); - funlockfile(main->output.to.stream); + f_file_stream_unlock(main->output.to); } return F_none; @@ -398,7 +398,7 @@ extern "C" { } else if (data->option & fss_extended_list_read_data_option_total_d) { if ((data->option & fss_extended_list_read_data_option_object_d) && !(data->option & fss_extended_list_read_data_option_content_d)) { - flockfile(main->output.to.stream); + f_file_stream_lock(main->output.to); if (data->contents.array[i].used) { fss_extended_list_read_print_one(main); @@ -407,7 +407,7 @@ extern "C" { fss_extended_list_read_print_zero(main); } - funlockfile(main->output.to.stream); + f_file_stream_unlock(main->output.to); } else { f_array_length_t total = 0; @@ -463,11 +463,11 @@ extern "C" { } // for if (data->option & fss_extended_list_read_data_option_total_d) { - flockfile(main->output.to.stream); + f_file_stream_lock(main->output.to); fss_extended_list_read_print_zero(main); - funlockfile(main->output.to.stream); + f_file_stream_unlock(main->output.to); } return F_none; @@ -480,7 +480,7 @@ extern "C" { if (data->option & fss_extended_list_read_data_option_object_d) { if (*line == data->line) { - flockfile(main->output.to.stream); + f_file_stream_lock(main->output.to); if (data->option & fss_extended_list_read_data_option_total_d) { fss_extended_list_read_print_one(main); @@ -489,7 +489,7 @@ extern "C" { fss_extended_list_read_print_at_object(main, data, at, delimits_object); } - funlockfile(main->output.to.stream); + f_file_stream_unlock(main->output.to); return F_success; } @@ -520,7 +520,7 @@ extern "C" { if (*line == data->line) { range.stop = i; - flockfile(main->output.to.stream); + f_file_stream_lock(main->output.to); if (data->option & fss_extended_list_read_data_option_total_d) { fss_extended_list_read_print_one(main); @@ -529,7 +529,7 @@ extern "C" { f_print_except_in_dynamic_partial(data->buffer, range, delimits_content, data->comments, main->output.to); } - funlockfile(main->output.to.stream); + f_file_stream_unlock(main->output.to); return F_success; } @@ -547,7 +547,7 @@ extern "C" { ++(*line); if (*line == data->line) { - flockfile(main->output.to.stream); + f_file_stream_lock(main->output.to); if (data->option & fss_extended_list_read_data_option_total_d) { fss_extended_list_read_print_one(main); @@ -559,7 +559,7 @@ extern "C" { f_print_dynamic_raw(f_string_eol_s, main->output.to); } - funlockfile(main->output.to.stream); + f_file_stream_unlock(main->output.to); return F_success; } @@ -574,11 +574,11 @@ extern "C" { f_status_t fss_extended_list_read_process_columns(fll_program_data_t * const main, fss_extended_list_read_data_t * const data, bool names[]) { if (!(data->option & fss_extended_list_read_data_option_content_d)) { - flockfile(main->output.to.stream); + f_file_stream_lock(main->output.to); fss_extended_list_read_print_zero(main); - funlockfile(main->output.to.stream); + f_file_stream_unlock(main->output.to); return F_none; } @@ -766,7 +766,7 @@ extern "C" { } } // for - flockfile(main->output.to.stream); + f_file_stream_lock(main->output.to); if (data->option & fss_extended_list_read_data_option_line_d) { if (data->line < total) { @@ -780,7 +780,7 @@ extern "C" { fl_print_format("%ul%r", main->output.to, total, f_string_eol_s); } - funlockfile(main->output.to.stream); + f_file_stream_unlock(main->output.to); return F_none; } diff --git a/level_3/fss_extended_read/c/private-print.c b/level_3/fss_extended_read/c/private-print.c index 7dc8a8a..e997847 100644 --- a/level_3/fss_extended_read/c/private-print.c +++ b/level_3/fss_extended_read/c/private-print.c @@ -14,7 +14,7 @@ extern "C" { return; } - flockfile(main->output.to.stream); + f_file_stream_lock(main->output.to); if ((data->option & fss_extended_read_data_option_object_d) || (data->option & fss_extended_read_data_option_content_d) && (data->contents.array[at].used || (data->option & fss_extended_read_data_option_empty_d))) { if (data->option & fss_extended_read_data_option_object_d) { @@ -94,7 +94,7 @@ extern "C" { fss_extended_read_print_set_end(main); } - funlockfile(main->output.to.stream); + f_file_stream_unlock(main->output.to); } } #endif // _di_fss_extended_read_print_at_ @@ -104,33 +104,33 @@ extern "C" { if (data->option & fss_extended_read_data_option_select_d) { if (data->option & fss_extended_read_data_option_object_d) { - flockfile(main->output.to.stream); + f_file_stream_lock(main->output.to); fss_extended_read_print_one(main); - funlockfile(main->output.to.stream); + f_file_stream_unlock(main->output.to); return F_success; } if (data->select < data->contents.array[at].used) { if (data->contents.array[at].array[data->select].start <= data->contents.array[at].array[data->select].stop || (data->option & fss_extended_read_data_option_empty_d)) { - flockfile(main->output.to.stream); + f_file_stream_lock(main->output.to); fss_extended_read_print_one(main); - funlockfile(main->output.to.stream); + f_file_stream_unlock(main->output.to); return F_success; } } } else if ((data->option & fss_extended_read_data_option_object_d) || (data->option & fss_extended_read_data_option_empty_d)) { - flockfile(main->output.to.stream); + f_file_stream_lock(main->output.to); fss_extended_read_print_one(main); - funlockfile(main->output.to.stream); + f_file_stream_unlock(main->output.to); return F_success; } @@ -138,11 +138,11 @@ extern "C" { for (f_array_length_t j = 0; j < data->contents.array[at].used; ++j) { if (data->contents.array[at].array[j].start <= data->contents.array[at].array[j].stop) { - flockfile(main->output.to.stream); + f_file_stream_lock(main->output.to); fss_extended_read_print_one(main); - funlockfile(main->output.to.stream); + f_file_stream_unlock(main->output.to); return F_success; } diff --git a/level_3/fss_extended_read/c/private-read.c b/level_3/fss_extended_read/c/private-read.c index 160a3c6..cefe7c9 100644 --- a/level_3/fss_extended_read/c/private-read.c +++ b/level_3/fss_extended_read/c/private-read.c @@ -357,11 +357,11 @@ extern "C" { if (data->depths.array[0].value_at >= data->objects.used) { if (data->option & (fss_extended_read_data_option_columns_d | fss_extended_read_data_option_total_d)) { - flockfile(main->output.to.stream); + f_file_stream_lock(main->output.to); fss_extended_read_print_zero(main); - funlockfile(main->output.to.stream); + f_file_stream_unlock(main->output.to); } return F_none; @@ -371,11 +371,11 @@ extern "C" { if (data->option & fss_extended_read_data_option_line_d) { if (data->line) { if (data->option & fss_extended_read_data_option_total_d) { - flockfile(main->output.to.stream); + f_file_stream_lock(main->output.to); fss_extended_read_print_zero(main); - funlockfile(main->output.to.stream); + f_file_stream_unlock(main->output.to); } return F_none; @@ -447,11 +447,11 @@ extern "C" { } // for if (data->option & fss_extended_read_data_option_total_d) { - flockfile(main->output.to.stream); + f_file_stream_lock(main->output.to); fss_extended_read_print_zero(main); - funlockfile(main->output.to.stream); + f_file_stream_unlock(main->output.to); } return F_none; @@ -462,11 +462,11 @@ extern "C" { f_status_t fss_extended_read_process_columns(fll_program_data_t * const main, fss_extended_read_data_t * const data, bool names[]) { if (!(data->option & fss_extended_read_data_option_content_d)) { - flockfile(main->output.to.stream); + f_file_stream_lock(main->output.to); fss_extended_read_print_zero(main); - funlockfile(main->output.to.stream); + f_file_stream_unlock(main->output.to); return F_none; } @@ -510,11 +510,11 @@ extern "C" { if (!data->contents.array[i].used) { if (data->option & fss_extended_read_data_option_empty_d) { if (line == data->line) { - flockfile(main->output.to.stream); + f_file_stream_lock(main->output.to); fss_extended_read_print_set_end(main); - funlockfile(main->output.to.stream); + f_file_stream_unlock(main->output.to); break; } @@ -685,7 +685,7 @@ extern "C" { } // for } - flockfile(main->output.to.stream); + f_file_stream_lock(main->output.to); if (data->option & fss_extended_read_data_option_line_d) { if (data->line < total) { @@ -699,7 +699,7 @@ extern "C" { fl_print_format("%ul%r", main->output.to, total, f_string_eol_s); } - funlockfile(main->output.to.stream); + f_file_stream_unlock(main->output.to); return F_none; } diff --git a/level_3/fss_identify/c/private-print.c b/level_3/fss_identify/c/private-print.c index 0d94677..6e193f9 100644 --- a/level_3/fss_identify/c/private-print.c +++ b/level_3/fss_identify/c/private-print.c @@ -9,7 +9,7 @@ extern "C" { #ifndef _di_fss_identify_print_ void fss_identify_print(fll_program_data_t * const main, const f_fll_id_t id) { - flockfile(main->output.to.stream); + f_file_stream_lock(main->output.to); if (main->parameters.array[fss_identify_parameter_object_e].result == f_console_result_found_e || main->parameters.array[fss_identify_parameter_content_e].result != f_console_result_found_e) { f_print((const f_string_t) id.name, id.used, main->output.to); @@ -25,7 +25,7 @@ extern "C" { f_print_dynamic_raw(f_string_eol_s, main->output.to); - funlockfile(main->output.to.stream); + f_file_stream_unlock(main->output.to); } #endif // _di_fss_identify_print_ diff --git a/level_3/fss_payload_read/c/private-print.c b/level_3/fss_payload_read/c/private-print.c index fb4a6a3..f1d635c 100644 --- a/level_3/fss_payload_read/c/private-print.c +++ b/level_3/fss_payload_read/c/private-print.c @@ -14,7 +14,7 @@ extern "C" { } if ((data->option & fss_payload_read_data_option_object_d) || (data->option & fss_payload_read_data_option_content_d) && (data->contents.array[at].used || (data->option & fss_payload_read_data_option_empty_d))) { - flockfile(main->output.to.stream); + f_file_stream_lock(main->output.to); if (data->option & fss_payload_read_data_option_object_d) { if (data->option & fss_payload_read_data_option_trim_d) { @@ -50,7 +50,7 @@ extern "C" { fss_payload_read_print_set_end(main); } - funlockfile(main->output.to.stream); + f_file_stream_unlock(main->output.to); } } #endif // _di_fss_payload_read_print_at_ @@ -62,7 +62,7 @@ extern "C" { return; } - flockfile(main->output.to.stream); + f_file_stream_lock(main->output.to); if ((data->option & fss_payload_read_data_option_object_d) || (data->option & fss_payload_read_data_option_content_d) && (data->contents_header.array[at].used || (data->option & fss_payload_read_data_option_empty_d))) { if (data->option & fss_payload_read_data_option_object_d) { @@ -142,7 +142,7 @@ extern "C" { fss_payload_read_print_set_end_extended(main); } - funlockfile(main->output.to.stream); + f_file_stream_unlock(main->output.to); } } #endif // _di_fss_payload_read_print_at_extended_ @@ -170,33 +170,33 @@ extern "C" { if (data->option & fss_payload_read_data_option_select_d) { if (data->option & fss_payload_read_data_option_object_d) { - flockfile(main->output.to.stream); + f_file_stream_lock(main->output.to); fss_payload_read_print_one(main); - funlockfile(main->output.to.stream); + f_file_stream_unlock(main->output.to); return F_success; } if (data->select < data->contents_header.array[at].used) { if (data->contents_header.array[at].array[data->select].start <= data->contents_header.array[at].array[data->select].stop || (data->option & fss_payload_read_data_option_empty_d)) { - flockfile(main->output.to.stream); + f_file_stream_lock(main->output.to); fss_payload_read_print_one(main); - funlockfile(main->output.to.stream); + f_file_stream_unlock(main->output.to); return F_success; } } } else if ((data->option & fss_payload_read_data_option_object_d) || (data->option & fss_payload_read_data_option_empty_d)) { - flockfile(main->output.to.stream); + f_file_stream_lock(main->output.to); fss_payload_read_print_one(main); - funlockfile(main->output.to.stream); + f_file_stream_unlock(main->output.to); return F_success; } @@ -204,11 +204,11 @@ extern "C" { for (f_array_length_t j = 0; j < data->contents_header.array[at].used; ++j) { if (data->contents_header.array[at].array[j].start <= data->contents_header.array[at].array[j].stop) { - flockfile(main->output.to.stream); + f_file_stream_lock(main->output.to); fss_payload_read_print_one(main); - funlockfile(main->output.to.stream); + f_file_stream_unlock(main->output.to); return F_success; } diff --git a/level_3/fss_payload_read/c/private-read.c b/level_3/fss_payload_read/c/private-read.c index a95ee59..fa9b6ef 100644 --- a/level_3/fss_payload_read/c/private-read.c +++ b/level_3/fss_payload_read/c/private-read.c @@ -272,11 +272,11 @@ extern "C" { if (status == F_data_not_stop || status == F_data_not_eos) { if (data->option & fss_payload_read_data_option_total_d) { - flockfile(main->output.to.stream); + f_file_stream_lock(main->output.to); fss_payload_read_print_zero(main); - funlockfile(main->output.to.stream); + f_file_stream_unlock(main->output.to); return F_none; } @@ -337,11 +337,11 @@ extern "C" { if (!(data->option & fss_payload_read_data_option_extended_d)) { if ((data->option & fss_payload_read_data_option_select_d) && data->select) { if (main->parameters.array[fss_payload_read_parameter_total_e].result == f_console_result_found_e) { - flockfile(main->output.to.stream); + f_file_stream_lock(main->output.to); fss_payload_read_print_zero(main); - funlockfile(main->output.to.stream); + f_file_stream_unlock(main->output.to); } return F_none; @@ -365,11 +365,11 @@ extern "C" { if (names[i]) break; if (main->parameters.array[fss_payload_read_parameter_total_e].result == f_console_result_found_e) { - flockfile(main->output.to.stream); + f_file_stream_lock(main->output.to); fss_payload_read_print_zero(main); - funlockfile(main->output.to.stream); + f_file_stream_unlock(main->output.to); } return F_none; @@ -470,11 +470,11 @@ extern "C" { if (data->depths.array[0].value_at >= data->objects.used) { if (data->option & (fss_payload_read_data_option_columns_d | fss_payload_read_data_option_total_d)) { - flockfile(main->output.to.stream); + f_file_stream_lock(main->output.to); fss_payload_read_print_zero(main); - funlockfile(main->output.to.stream); + f_file_stream_unlock(main->output.to); } return F_none; @@ -518,7 +518,7 @@ extern "C" { fll_print_format("%ul%r", main->output.to, data->contents.array[i].used, f_string_eol_s); } else if (data->option & fss_payload_read_data_option_total_d) { - flockfile(main->output.to.stream); + f_file_stream_lock(main->output.to); if (data->contents.array[i].used) { fss_payload_read_print_one(main); @@ -527,7 +527,7 @@ extern "C" { fss_payload_read_print_zero(main); } - funlockfile(main->output.to.stream); + f_file_stream_unlock(main->output.to); } else { is_payload = fl_string_dynamic_partial_compare_string(f_fss_string_payload_s.string, data->buffer, f_fss_string_payload_s.used, data->objects.array[i]) == F_equal_to; @@ -542,11 +542,11 @@ extern "C" { } // for if (data->option & fss_payload_read_data_option_total_d) { - flockfile(main->output.to.stream); + f_file_stream_lock(main->output.to); fss_payload_read_print_zero(main); - funlockfile(main->output.to.stream); + f_file_stream_unlock(main->output.to); } return F_none; @@ -558,11 +558,11 @@ extern "C" { if (data->depths.array[data->depths.used - 1].value_at >= data->objects_header.used) { if (data->option & (fss_payload_read_data_option_columns_d | fss_payload_read_data_option_total_d)) { - flockfile(main->output.to.stream); + f_file_stream_lock(main->output.to); fss_payload_read_print_zero(main); - funlockfile(main->output.to.stream); + f_file_stream_unlock(main->output.to); } return F_none; @@ -572,11 +572,11 @@ extern "C" { if (data->option & fss_payload_read_data_option_line_d) { if (data->line) { if (data->option & fss_payload_read_data_option_total_d) { - flockfile(main->output.to.stream); + f_file_stream_lock(main->output.to); fss_payload_read_print_zero(main); - funlockfile(main->output.to.stream); + f_file_stream_unlock(main->output.to); } return F_none; @@ -648,11 +648,11 @@ extern "C" { } // for if (data->option & fss_payload_read_data_option_total_d) { - flockfile(main->output.to.stream); + f_file_stream_lock(main->output.to); fss_payload_read_print_zero(main); - funlockfile(main->output.to.stream); + f_file_stream_unlock(main->output.to); } return F_none; @@ -664,7 +664,7 @@ extern "C" { if (data->option & fss_payload_read_data_option_object_d) { if (*line == data->line) { - flockfile(main->output.to.stream); + f_file_stream_lock(main->output.to); if (data->option & fss_payload_read_data_option_total_d) { fss_payload_read_print_one(main); @@ -673,7 +673,7 @@ extern "C" { fss_payload_read_print_at_object(main, data, at, delimits_object); } - funlockfile(main->output.to.stream); + f_file_stream_unlock(main->output.to); return F_success; } @@ -714,7 +714,7 @@ extern "C" { if (*line == data->line) { range.stop = i; - flockfile(main->output.to.stream); + f_file_stream_lock(main->output.to); if (data->option & fss_payload_read_data_option_total_d) { fss_payload_read_print_one(main); @@ -723,7 +723,7 @@ extern "C" { f_print_except_in_dynamic_partial(data->buffer, range, delimits_content, data->comments, main->output.to); } - funlockfile(main->output.to.stream); + f_file_stream_unlock(main->output.to); return F_success; } @@ -741,7 +741,7 @@ extern "C" { ++(*line); if (*line == data->line) { - flockfile(main->output.to.stream); + f_file_stream_lock(main->output.to); if (data->option & fss_payload_read_data_option_total_d) { fss_payload_read_print_one(main); @@ -753,7 +753,7 @@ extern "C" { f_print_dynamic_raw(f_string_eol_s, main->output.to); } - funlockfile(main->output.to.stream); + f_file_stream_unlock(main->output.to); return F_success; } @@ -768,11 +768,11 @@ extern "C" { f_status_t fss_payload_read_process_columns(fll_program_data_t * const main, fss_payload_read_data_t * const data, bool names[]) { if (!(data->option & fss_payload_read_data_option_content_d)) { - flockfile(main->output.to.stream); + f_file_stream_lock(main->output.to); fss_payload_read_print_zero(main); - funlockfile(main->output.to.stream); + f_file_stream_unlock(main->output.to); return F_none; } @@ -808,11 +808,11 @@ extern "C" { f_status_t fss_payload_read_process_columns_extended(fll_program_data_t * const main, fss_payload_read_data_t * const data, bool names[]) { if (!(data->option & fss_payload_read_data_option_content_d)) { - flockfile(main->output.to.stream); + f_file_stream_lock(main->output.to); fss_payload_read_print_zero(main); - funlockfile(main->output.to.stream); + f_file_stream_unlock(main->output.to); return F_none; } @@ -893,11 +893,11 @@ extern "C" { if (!data->contents_header.array[i].used) { if (data->option & fss_payload_read_data_option_empty_d) { if (line == data->line) { - flockfile(main->output.to.stream); + f_file_stream_lock(main->output.to); fss_payload_read_print_set_end_extended(main); - funlockfile(main->output.to.stream); + f_file_stream_unlock(main->output.to); break; } @@ -1103,7 +1103,7 @@ extern "C" { } } // for - flockfile(main->output.to.stream); + f_file_stream_lock(main->output.to); if (data->option & fss_payload_read_data_option_line_d) { if (data->line < total) { @@ -1117,7 +1117,7 @@ extern "C" { fl_print_format("%ul%r", main->output.to, total, f_string_eol_s); } - funlockfile(main->output.to.stream); + f_file_stream_unlock(main->output.to); return F_none; } @@ -1170,7 +1170,7 @@ extern "C" { } // for } - flockfile(main->output.to.stream); + f_file_stream_lock(main->output.to); if (data->option & fss_payload_read_data_option_line_d) { if (data->line < total) { @@ -1184,7 +1184,7 @@ extern "C" { fl_print_format("%ul%r", main->output.to, total, f_string_eol_s); } - funlockfile(main->output.to.stream); + f_file_stream_unlock(main->output.to); return F_none; } diff --git a/level_3/iki_read/c/private-read.c b/level_3/iki_read/c/private-read.c index 1c83989..4b5c6f9 100644 --- a/level_3/iki_read/c/private-read.c +++ b/level_3/iki_read/c/private-read.c @@ -197,7 +197,7 @@ extern "C" { f_array_length_t matches = 0; bool unmatched = F_true; - flockfile(main->output.to.stream); + f_file_stream_lock(main->output.to); for (i = 0; i < setting->data.vocabulary.used; ++i) { @@ -223,7 +223,7 @@ extern "C" { } // for } // for - funlockfile(main->output.to.stream); + f_file_stream_unlock(main->output.to); if (unmatched) { setting->status = F_data_not; @@ -236,13 +236,13 @@ extern "C" { if (setting->data.variable.used) { if (setting->flag & iki_read_main_flag_at_e) { if (setting->at < setting->data.variable.used) { - flockfile(main->output.to.stream); + f_file_stream_lock(main->output.to); iki_read_print(main, setting, setting->at); f_print_dynamic_raw(f_string_eol_s, main->output.to); - funlockfile(main->output.to.stream); + f_file_stream_unlock(main->output.to); setting->status = F_none; } @@ -251,7 +251,7 @@ extern "C" { } } else { - flockfile(main->output.to.stream); + f_file_stream_lock(main->output.to); for (i = 0; i < setting->data.variable.used; ++i) { @@ -260,7 +260,7 @@ extern "C" { f_print_dynamic_raw(f_string_eol_s, main->output.to); } // for - funlockfile(main->output.to.stream); + f_file_stream_unlock(main->output.to); setting->status = F_none; } @@ -324,7 +324,7 @@ extern "C" { i = buffer_range.start; range = buffer_range; - flockfile(main->output.to.stream); + f_file_stream_lock(main->output.to); while (i <= range.stop && j < stop) { @@ -362,7 +362,7 @@ extern "C" { f_print_dynamic_partial(setting->buffer, range, main->output.to); } - funlockfile(main->output.to.stream); + f_file_stream_unlock(main->output.to); } setting->status = F_none; diff --git a/level_3/utf8/c/private-utf8.c b/level_3/utf8/c/private-utf8.c index 39bdfab..5b0d6ab 100644 --- a/level_3/utf8/c/private-utf8.c +++ b/level_3/utf8/c/private-utf8.c @@ -19,7 +19,7 @@ extern "C" { utf8_process_text_width(&text); - flockfile(main->output.to.stream); + f_file_stream_lock(main->output.to); for (; text.string[0] && F_status_is_error_not(status); ) { @@ -88,12 +88,12 @@ extern "C" { } if (F_status_is_error(status)) { - funlockfile(main->output.to.stream); + f_file_stream_unlock(main->output.to); return status; } - funlockfile(main->output.to.stream); + f_file_stream_unlock(main->output.to); return valid; }