From ba845ce0bd22b5037cba09730d1c7b739df58554 Mon Sep 17 00:00:00 2001 From: Kevin Day Date: Mon, 5 Dec 2022 22:44:11 -0600 Subject: [PATCH] Cleanup: Rename quoted to quote. There are several cases where "quoted" is still used. This is likely the result of a long lost incomplete refactor. --- level_1/fl_fss/c/fss/extended.c | 36 ++++++++-------- level_1/fl_fss/c/private-fss.c | 78 +++++++++++++++++------------------ level_1/fl_fss/c/private-fss.h | 14 +++---- level_3/fake/c/private-make-operate.c | 12 +++--- level_3/fake/c/private-make-operate.h | 24 +++++------ 5 files changed, 82 insertions(+), 82 deletions(-) diff --git a/level_1/fl_fss/c/fss/extended.c b/level_1/fl_fss/c/fss/extended.c index d762420..bc1d8c7 100644 --- a/level_1/fl_fss/c/fss/extended.c +++ b/level_1/fl_fss/c/fss/extended.c @@ -33,15 +33,15 @@ extern "C" { const f_array_length_t quotes_used = quotes ? quotes->used : 0; uint8_t content_found = 0; - f_fss_quote_t quoted = f_fss_quote_type_none_e; + f_fss_quote_t quote = f_fss_quote_type_none_e; while (range->start <= range->stop && range->start < buffer.used) { f_string_range_t content_partial = f_string_range_t_initialize; - quoted = f_fss_quote_type_none_e; + quote = f_fss_quote_type_none_e; - status = private_fl_fss_basic_read(buffer, F_false, state, range, &content_partial, "ed, delimits); + status = private_fl_fss_basic_read(buffer, F_false, state, range, &content_partial, "e, delimits); if (status == F_fss_found_object || status == F_fss_found_object_content_not) { status_allocate = f_string_ranges_increase(state.step_small, found); @@ -63,10 +63,10 @@ extern "C" { found->array[found->used++] = content_partial; if (quotes) { - if (quoted == f_fss_quote_type_double_e) { + if (quote == f_fss_quote_type_double_e) { quotes->array[quotes->used] = f_string_ascii_quote_double_s.string[0]; } - else if (quoted == f_fss_quote_type_single_e) { + else if (quote == f_fss_quote_type_single_e) { quotes->array[quotes->used] = f_string_ascii_quote_single_s.string[0]; } else { @@ -126,23 +126,23 @@ extern "C" { #endif // _di_fl_fss_extended_content_read_ #ifndef _di_fl_fss_extended_content_write_ - f_status_t fl_fss_extended_content_write(const f_string_static_t content, const f_fss_quote_t quoted, const uint8_t complete, f_state_t state, f_string_range_t * const range, f_string_dynamic_t * const destination) { + f_status_t fl_fss_extended_content_write(const f_string_static_t content, const f_fss_quote_t quote, const uint8_t complete, f_state_t state, f_string_range_t * const range, f_string_dynamic_t * const destination) { #ifndef _di_level_1_parameter_checking_ if (!range) return F_status_set_error(F_parameter); if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ // This operates exactly like an object, syntax-wise. - const f_status_t status = private_fl_fss_basic_write(F_false, content, quoted ? quoted : f_fss_delimit_quote_double_s.string[0], state, range, destination); + const f_status_t status = private_fl_fss_basic_write(F_false, content, quote ? quote : f_fss_delimit_quote_double_s.string[0], state, range, destination); if (status == F_data_not_stop || status == F_data_not_eos) { - // Content that is empty must be represented by a quoted empty string. + // Content that is empty must be represented by a quote empty string. const f_status_t status_allocation = f_string_dynamic_increase_by(4, destination); if (F_status_is_error(status_allocation)) return status_allocation; - destination->string[destination->used++] = quoted ? f_fss_delimit_quote_single_s.string[0] : f_fss_delimit_quote_double_s.string[0]; - destination->string[destination->used++] = quoted ? f_fss_delimit_quote_single_s.string[0] : f_fss_delimit_quote_double_s.string[0]; + destination->string[destination->used++] = quote ? f_fss_delimit_quote_single_s.string[0] : f_fss_delimit_quote_double_s.string[0]; + destination->string[destination->used++] = quote ? f_fss_delimit_quote_single_s.string[0] : f_fss_delimit_quote_double_s.string[0]; // Content should be terminated, even if empty. if (complete == f_fss_complete_partial_e || complete == f_fss_complete_partial_trim_e || complete == f_fss_complete_full_e || complete == f_fss_complete_full_trim_e || complete == f_fss_complete_next_e) { @@ -176,7 +176,7 @@ extern "C" { #endif // _di_fl_fss_extended_content_write_ #ifndef _di_fl_fss_extended_object_read_ - f_status_t fl_fss_extended_object_read(const f_string_static_t buffer, f_state_t state, f_string_range_t * const range, f_fss_object_t * const found, f_fss_quote_t * const quoted, f_fss_delimits_t * const delimits) { + f_status_t fl_fss_extended_object_read(const f_string_static_t buffer, f_state_t state, f_string_range_t * const range, f_fss_object_t * const found, f_fss_quote_t * const quote, f_fss_delimits_t * const delimits) { #ifndef _di_level_1_parameter_checking_ if (!range) return F_status_set_error(F_parameter); if (!found) return F_status_set_error(F_parameter); @@ -185,7 +185,7 @@ extern "C" { const f_array_length_t delimits_used = delimits->used; - const f_status_t status = private_fl_fss_basic_read(buffer, F_true, state, range, found, quoted, delimits); + const f_status_t status = private_fl_fss_basic_read(buffer, F_true, state, range, found, quote, delimits); if (F_status_is_error(status) || status == F_fss_found_object_not || status == F_data_not || status == F_data_not_eos || status == F_data_not_stop) { delimits->used = delimits_used; @@ -196,7 +196,7 @@ extern "C" { #endif // _di_fl_fss_extended_object_read_ #ifndef _di_fl_fss_extended_object_write_ -f_status_t fl_fss_extended_object_write(const f_string_static_t object, const f_fss_quote_t quoted, const uint8_t complete, f_state_t state, f_string_range_t * const range, f_string_dynamic_t * const destination) { +f_status_t fl_fss_extended_object_write(const f_string_static_t object, const f_fss_quote_t quote, const uint8_t complete, f_state_t state, f_string_range_t * const range, f_string_dynamic_t * const destination) { #ifndef _di_level_1_parameter_checking_ if (!range) return F_status_set_error(F_parameter); if (!destination) return F_status_set_error(F_parameter); @@ -204,16 +204,16 @@ f_status_t fl_fss_extended_object_write(const f_string_static_t object, const f_ const f_array_length_t used_start = destination->used; - f_status_t status = private_fl_fss_basic_write(F_true, object, quoted ? quoted : f_fss_delimit_quote_double_s.string[0], state, range, destination); + f_status_t status = private_fl_fss_basic_write(F_true, object, quote ? quote : f_fss_delimit_quote_double_s.string[0], state, range, destination); if (status == F_data_not_stop || status == F_data_not_eos) { - // Objects cannot be empty, so write a quoted empty string. + // Objects cannot be empty, so write a quote empty string. const f_status_t status_allocation = f_string_dynamic_increase_by(2, destination); if (F_status_is_error(status_allocation)) return status_allocation; - destination->string[destination->used++] = quoted ? f_fss_delimit_quote_single_s.string[0] : f_fss_delimit_quote_double_s.string[0]; - destination->string[destination->used++] = quoted ? f_fss_delimit_quote_single_s.string[0] : f_fss_delimit_quote_double_s.string[0]; + destination->string[destination->used++] = quote ? f_fss_delimit_quote_single_s.string[0] : f_fss_delimit_quote_double_s.string[0]; + destination->string[destination->used++] = quote ? f_fss_delimit_quote_single_s.string[0] : f_fss_delimit_quote_double_s.string[0]; } if (complete == f_fss_complete_partial_e || complete == f_fss_complete_partial_trim_e || complete == f_fss_complete_full_e || complete == f_fss_complete_full_trim_e) { @@ -221,7 +221,7 @@ f_status_t fl_fss_extended_object_write(const f_string_static_t object, const f_ f_status_t status2 = F_none; if (complete == f_fss_complete_full_trim_e) { - status2 = private_fl_fss_basic_write_object_trim(quoted ? quoted : f_fss_delimit_quote_double_s.string[0], used_start, state, destination); + status2 = private_fl_fss_basic_write_object_trim(quote ? quote : f_fss_delimit_quote_double_s.string[0], used_start, state, destination); if (F_status_is_error(status2)) return status2; } diff --git a/level_1/fl_fss/c/private-fss.c b/level_1/fl_fss/c/private-fss.c index f027405..25ae621 100644 --- a/level_1/fl_fss/c/private-fss.c +++ b/level_1/fl_fss/c/private-fss.c @@ -123,7 +123,7 @@ extern "C" { #endif // !defined(_di_fl_fss_basic_list_object_write_) || !defined(_di_fl_fss_extended_list_object_write_) #if !defined(_di_fl_fss_basic_object_read_) || !defined(_di_fl_fss_extended_object_read_) || !defined(_di_fl_fss_extended_content_read_) - f_status_t private_fl_fss_basic_read(const f_string_static_t buffer, const bool object_as, f_state_t state, f_string_range_t * const range, f_fss_object_t * const found, f_fss_quote_t *quoted, f_fss_delimits_t * const delimits) { + f_status_t private_fl_fss_basic_read(const f_string_static_t buffer, const bool object_as, f_state_t state, f_string_range_t * const range, f_fss_object_t * const found, f_fss_quote_t *quote, f_fss_delimits_t * const delimits) { f_status_t status = f_fss_skip_past_space(state, buffer, range); if (F_status_is_error(status)) return status; @@ -173,11 +173,11 @@ extern "C" { return F_fss_found_object_not; } - // Handle quoted support. + // Handle quote support. f_char_t quote_found = 0; - if (quoted) { - *quoted = f_fss_quote_type_none_e; + if (quote) { + *quote = f_fss_quote_type_none_e; } // Identify where the object begins. @@ -252,7 +252,7 @@ extern "C" { if (buffer.string[range->start] == f_fss_delimit_quote_single_s.string[0] || buffer.string[range->start] == f_fss_delimit_quote_double_s.string[0] || (object_as && buffer.string[range->start] == f_fss_comment_s.string[0])) { - // Only the first slash before a quoted needs to be escaped (or not) as once there is a slash before a quoted, this cannot ever be a quote object. + // Only the first slash before a quote needs to be escaped (or not) as once there is a slash before a quote, this cannot ever be a quote object. // This simplifies the number of slashes needed. status = f_array_lengths_increase(state.step_small, delimits); if (F_status_is_error(status)) return status; @@ -377,7 +377,7 @@ extern "C" { if (buffer.string[range->start] == quote_found) { location = range->start; - // Check to see if there is a whitespace, EOS, or EOL after the quoted, if not, then this is not a closing quoted and delimits do not apply. + // Check to see if there is a whitespace, EOS, or EOL after the quote, if not, then this is not a closing quote and delimits do not apply. if (range->start + 1 <= range->stop && range->start + 1 < buffer.used) { ++range->start; @@ -386,7 +386,7 @@ extern "C" { if (range->start > range->stop || range->start >= buffer.used) { - // EOS or EOL was reached, so it is a valid closing quoted. + // EOS or EOL was reached, so it is a valid closing quote. // (for EOL, this is always TRUE, for EOS this could be false but there is no way to know this, so assume TRUE.) status = F_true; } @@ -397,21 +397,21 @@ extern "C" { } else { - // EOS or EOL was reached, so it is a valid closing quoted. + // EOS or EOL was reached, so it is a valid closing quote. // (for EOL, this is always TRUE, for EOS this could be false but there is no way to know this, so assume TRUE.) status = F_true; } if (status == F_true) { - if (quoted) { + if (quote) { if (quote_found == f_fss_delimit_quote_single_s.string[0]) { - *quoted = f_fss_quote_type_single_e; + *quote = f_fss_quote_type_single_e; } else if (quote_found == f_fss_delimit_quote_double_s.string[0]) { - *quoted = f_fss_quote_type_double_e; + *quote = f_fss_quote_type_double_e; } else { - *quoted = f_fss_quote_type_none_e; + *quote = f_fss_quote_type_none_e; } } @@ -533,7 +533,7 @@ extern "C" { } else if (buffer.string[range->start] == quote_found) { - // Check to see if there is a whitespace, EOS, or EOL after the quoted, if not, then this is not a closing quoted. + // Check to see if there is a whitespace, EOS, or EOL after the quote, if not, then this is not a closing quote. location = range->start; if (range->start + 1 <= range->stop && range->start + 1 < buffer.used) { @@ -544,7 +544,7 @@ extern "C" { if (range->start > range->stop || range->start >= buffer.used) { - // EOS or EOL was reached, so it is a valid closing quoted. + // EOS or EOL was reached, so it is a valid closing quote. // (for EOL, this is always TRUE, for EOS this could be false but there is no way to know this, so assume TRUE.) status = F_true; } @@ -555,7 +555,7 @@ extern "C" { } else { - // EOS or EOL was reached, so it is a valid closing quoted. + // EOS or EOL was reached, so it is a valid closing quote. // (for EOL, this is always TRUE, for EOS this could be false but there is no way to know this, so assume TRUE.) status = F_true; } @@ -563,15 +563,15 @@ extern "C" { range->start = location; if (status == F_true) { - if (quoted) { + if (quote) { if (quote_found == f_fss_delimit_quote_single_s.string[0]) { - *quoted = f_fss_quote_type_single_e; + *quote = f_fss_quote_type_single_e; } else if (quote_found == f_fss_delimit_quote_double_s.string[0]) { - *quoted = f_fss_quote_type_double_e; + *quote = f_fss_quote_type_double_e; } else { - *quoted = f_fss_quote_type_none_e; + *quote = f_fss_quote_type_none_e; } } @@ -695,7 +695,7 @@ extern "C" { #endif // !defined(_di_fl_fss_basic_object_read_) || !defined(_di_fl_fss_extended_object_read_) #if !defined(_di_fl_fss_basic_object_write_) || !defined(_di_fl_fss_extended_object_write_) || !defined(_di_fl_fss_extended_content_write_) - f_status_t private_fl_fss_basic_write(const bool object_as, const f_string_static_t object, const f_fss_quote_t quoted, f_state_t state, f_string_range_t *range, f_string_dynamic_t *destination) { + f_status_t private_fl_fss_basic_write(const bool object_as, const f_string_static_t object, const f_fss_quote_t quote, f_state_t state, f_string_range_t *range, f_string_dynamic_t *destination) { f_status_t status = f_fss_skip_past_space(state, object, range); if (F_status_is_error(status)) return status; @@ -712,22 +712,22 @@ extern "C" { const f_array_length_t input_start = range->start; const f_array_length_t used_start = destination->used; - bool quoted_is = F_false; + bool quote_is = F_false; bool commented = F_false; f_array_length_t item_first = 0; f_array_length_t item_total = 0; f_array_length_t i = 0; - const f_char_t quote_char = quoted == f_fss_quote_type_double_e ? f_string_ascii_quote_double_s.string[0] : f_string_ascii_quote_single_s.string[0]; + const f_char_t quote_char = quote == f_fss_quote_type_double_e ? f_string_ascii_quote_double_s.string[0] : f_string_ascii_quote_single_s.string[0]; // Use placeholders for potential quote and potential delimited quote to avoid doing things such as memmove(). destination->string[destination->used++] = f_fss_delimit_placeholder_s.string[0]; destination->string[destination->used++] = f_fss_delimit_placeholder_s.string[0]; - // If there is an initial quote, then this must be quoted and the existing quote must be delimited. + // If there is an initial quote, then this must be quote and the existing quote must be delimited. if (object.string[input_start] == quote_char) { - quoted_is = F_true; + quote_is = F_true; } else if (object_as && object.string[input_start] == f_fss_comment_s.string[0]) { commented = F_true; @@ -773,8 +773,8 @@ extern "C" { if (range->start > range->stop || range->start >= object.used) { - // Slashes before the final quote must be escaped when quoted, add the delimit slashes. - if (quoted_is) { + // Slashes before the final quote must be escaped when quote, add the delimit slashes. + if (quote_is) { // If this is the first quote, then only a single delimit slash is needed. if (item_first == input_start) { @@ -829,7 +829,7 @@ extern "C" { break; } - // if any space is found after a quote after a slash, then this must be delimited and quoted. + // if any space is found after a quote after a slash, then this must be delimited and quote. status = f_fss_is_space(state, object, *range); if (F_status_is_error(status)) break; @@ -840,7 +840,7 @@ extern "C" { break; } - quoted_is = F_true; + quote_is = F_true; status = f_string_dynamic_increase_by(item_total, destination); if (F_status_is_error(status)) break; @@ -879,7 +879,7 @@ extern "C" { } else if (object_as && object.string[range->start] == f_fss_comment_s.string[0]) { - // Only the first slash needs to be escaped for a comment, and then only if not quoted. + // Only the first slash needs to be escaped for a comment, and then only if not quote. if (item_first == input_start) { commented = F_true; } @@ -897,7 +897,7 @@ extern "C" { } else { - // If any space is found, then this must be quoted. + // If any space is found, then this must be quote. status = f_fss_is_space(state, object, *range); if (F_status_is_error(status)) break; @@ -908,7 +908,7 @@ extern "C" { break; } - quoted_is = F_true; + quote_is = F_true; } width = macro_f_utf_byte_width(object.string[range->start]); @@ -963,7 +963,7 @@ extern "C" { continue; } - // If any space is found, then this must be quoted. + // If any space is found, then this must be quote. status = f_fss_is_space(state, object, *range); if (F_status_is_error(status)) break; @@ -981,7 +981,7 @@ extern "C" { destination->string[destination->used++] = f_fss_delimit_slash_s.string[0]; } - quoted_is = F_true; + quote_is = F_true; } width = macro_f_utf_byte_width(object.string[range->start]); @@ -1001,12 +1001,12 @@ extern "C" { break; } else if (object.string[range->start] != f_fss_delimit_placeholder_s.string[0]) { - if (!quoted_is) { + if (!quote_is) { status = f_fss_is_space(state, object, *range); if (F_status_is_error(status)) break; if (status == F_true) { - quoted_is = F_true; + quote_is = F_true; } } @@ -1030,7 +1030,7 @@ extern "C" { return status; } - if (quoted_is) { + if (quote_is) { status = f_string_dynamic_increase(state.step_large, destination); if (F_status_is_error(status)) { @@ -1098,16 +1098,16 @@ extern "C" { #endif // !defined(_di_fl_fss_basic_object_write_) || !defined(_di_fl_fss_extended_object_write_) || !defined(_di_fl_fss_extended_content_write_) #if !defined(_di_fl_fss_basic_object_write_) || !defined(_di_fl_fss_extended_object_write_) - f_status_t private_fl_fss_basic_write_object_trim(const f_fss_quote_t quoted, const f_array_length_t used_start, f_state_t state, f_string_dynamic_t * const destination) { + f_status_t private_fl_fss_basic_write_object_trim(const f_fss_quote_t quote, const f_array_length_t used_start, f_state_t state, f_string_dynamic_t * const destination) { f_status_t status = F_none; f_string_range_t destination_range = macro_f_string_range_t_initialize2(destination->used); f_array_length_t i = 0; uint8_t width = 0; - const f_char_t quote_char = quoted == f_fss_quote_type_double_e ? f_string_ascii_quote_double_s.string[0] : f_string_ascii_quote_single_s.string[0]; + const f_char_t quote_char = quote == f_fss_quote_type_double_e ? f_string_ascii_quote_double_s.string[0] : f_string_ascii_quote_single_s.string[0]; - // If there are any spaces, then this will be quoted so find the first non-placeholder character. + // If there are any spaces, then this will be quote so find the first non-placeholder character. for (; destination_range.start < destination->used; ++destination_range.start) { if (state.interrupt) { diff --git a/level_1/fl_fss/c/private-fss.h b/level_1/fl_fss/c/private-fss.h index b9e7a59..f114c0e 100644 --- a/level_1/fl_fss/c/private-fss.h +++ b/level_1/fl_fss/c/private-fss.h @@ -111,8 +111,8 @@ extern "C" { * A start location past the stop location or buffer used means that the entire range was processed. * @param found * A set of all locations where a valid object was found. - * @param quoted - * This will store whether or not this object is quoted and what quote is in use. + * @param quote + * This will store whether or not this object is quote and what quote is in use. * Set pointer address to 0 to not use. * @param delimits * An array of delimits detected during processing. @@ -154,7 +154,7 @@ extern "C" { * @see fl_fss_extended_content_read() */ #if !defined(_di_fl_fss_basic_object_read_) || !defined(_di_fl_fss_extended_object_read_) || !defined(_di_fl_fss_extended_content_read_) - extern f_status_t private_fl_fss_basic_read(const f_string_static_t buffer, const bool object_as, f_state_t state, f_string_range_t * const range, f_fss_object_t * const found, f_fss_quote_t * const quoted, f_fss_delimits_t * const delimits) F_attribute_visibility_internal_d; + extern f_status_t private_fl_fss_basic_read(const f_string_static_t buffer, const bool object_as, f_state_t state, f_string_range_t * const range, f_fss_object_t * const found, f_fss_quote_t * const quote, f_fss_delimits_t * const delimits) F_attribute_visibility_internal_d; #endif // !defined(_di_fl_fss_basic_object_read_) || !defined(_di_fl_fss_extended_object_read_) || !defined(_di_fl_fss_extended_content_read_) /** @@ -172,7 +172,7 @@ extern "C" { * As Content, this does nothing special in regards to a leading '#'. * @param object * The string to write as (does not stop at NULLS, they are ignored and not written). - * @param quoted + * @param quote * If 0, then double quotes are auto-inserted, if needed. * Otherwise, this is the type of quote to wrap the object in when writing. * @param state @@ -218,13 +218,13 @@ extern "C" { * @see fl_fss_extended_content_write() */ #if !defined(fl_fss_basic_object_write) || !defined(fl_fss_extended_object_write) || !defined(_di_fl_fss_extended_content_write_) - extern f_status_t private_fl_fss_basic_write(const bool object_as, const f_string_static_t object, const f_fss_quote_t quoted, f_state_t state, f_string_range_t * const range, f_string_dynamic_t * const destination) F_attribute_visibility_internal_d; + extern f_status_t private_fl_fss_basic_write(const bool object_as, const f_string_static_t object, const f_fss_quote_t quote, f_state_t state, f_string_range_t * const range, f_string_dynamic_t * const destination) F_attribute_visibility_internal_d; #endif // !defined(fl_fss_basic_object_write) || !defined(fl_fss_extended_object_write) || !defined(_di_fl_fss_extended_content_write_) /** * Trim a given object used by the basic and extended object write functions. * - * @param quoted + * @param quote * If 0, then double quotes are auto-inserted, when required. * Otherwise, this is the type of quote to wrap the object in when writing. * @param used_start @@ -253,7 +253,7 @@ extern "C" { * @see fl_fss_extended_object_write() */ #if !defined(_di_fl_fss_basic_object_write_) || !defined(_di_fl_fss_extended_object_write_) - extern f_status_t private_fl_fss_basic_write_object_trim(const f_fss_quote_t quoted, const f_array_length_t used_start, f_state_t state, f_string_dynamic_t * const destination) F_attribute_visibility_internal_d; + extern f_status_t private_fl_fss_basic_write_object_trim(const f_fss_quote_t quote, const f_array_length_t used_start, f_state_t state, f_string_dynamic_t * const destination) F_attribute_visibility_internal_d; #endif // !defined(_di_fl_fss_basic_object_write_) || !defined(_di_fl_fss_extended_object_write_) #ifdef __cplusplus diff --git a/level_3/fake/c/private-make-operate.c b/level_3/fake/c/private-make-operate.c index 07b847b..2954ec6 100644 --- a/level_3/fake/c/private-make-operate.c +++ b/level_3/fake/c/private-make-operate.c @@ -722,7 +722,7 @@ extern "C" { #endif // _di_fake_make_operate_expand_ #ifndef _di_fake_make_operate_expand_build_ - f_status_t fake_make_operate_expand_build(fake_make_data_t * const data_make, const f_fss_quote_t quoted, const f_string_range_t range_name) { + f_status_t fake_make_operate_expand_build(fake_make_data_t * const data_make, const f_fss_quote_t quote, const f_string_range_t range_name) { f_status_t status = F_none; f_string_dynamic_t value = f_string_dynamic_t_initialize; @@ -1000,7 +1000,7 @@ extern "C" { return F_false; } - if (quoted) { + if (quote) { status = f_string_dynamic_append_nulless(value, &data_make->cache_arguments.array[data_make->cache_arguments.used]); } else { @@ -1024,7 +1024,7 @@ extern "C" { #endif // _di_fake_make_operate_expand_build_ #ifndef _di_fake_make_operate_expand_context_ - f_status_t fake_make_operate_expand_context(fake_make_data_t * const data_make, const f_fss_quote_t quoted, const f_string_range_t range_name) { + f_status_t fake_make_operate_expand_context(fake_make_data_t * const data_make, const f_fss_quote_t quote, const f_string_range_t range_name) { f_status_t status = F_none; const f_string_static_t *context = 0; @@ -1063,7 +1063,7 @@ extern "C" { } // for if (context) { - if (quoted) { + if (quote) { status = f_string_dynamic_append_nulless(*context, &data_make->cache_arguments.array[data_make->cache_arguments.used]); } else { @@ -1086,7 +1086,7 @@ extern "C" { #endif // _di_fake_make_operate_expand_context_ #ifndef _di_fake_make_operate_expand_environment_ - f_status_t fake_make_operate_expand_environment(fake_make_data_t * const data_make, const f_fss_quote_t quoted, const f_string_range_t range_name) { + f_status_t fake_make_operate_expand_environment(fake_make_data_t * const data_make, const f_fss_quote_t quote, const f_string_range_t range_name) { f_status_t status = F_none; @@ -1118,7 +1118,7 @@ extern "C" { if (F_status_is_error(status)) return status; - if (!quoted) { + if (!quote) { ++data_make->cache_arguments.used; } diff --git a/level_3/fake/c/private-make-operate.h b/level_3/fake/c/private-make-operate.h index 1785514..5561f74 100644 --- a/level_3/fake/c/private-make-operate.h +++ b/level_3/fake/c/private-make-operate.h @@ -44,15 +44,15 @@ extern "C" { * The section name. * @param content * The content array. - * @param quoteds - * The array of quoted associated with the content. + * @param quotes + * The array of quotes associated with the content. * @param status * The return status. * * Status codes (with error bit) are returned on any problem. */ #ifndef _di_fake_make_operate_expand_ - extern void fake_make_operate_expand(fake_make_data_t * const data_make, const f_string_range_t section_name, const f_fss_content_t content, const f_fss_quotes_t quoteds, f_status_t * const status) F_attribute_visibility_internal_d; + extern void fake_make_operate_expand(fake_make_data_t * const data_make, const f_string_range_t section_name, const f_fss_content_t content, const f_fss_quotes_t quotes, f_status_t * const status) F_attribute_visibility_internal_d; #endif // _di_fake_make_operate_expand_ /** @@ -62,8 +62,8 @@ extern "C" { * * @param data_make * All make related setting data, including data from the fakefile and the build settings file. - * @param quoted - * The quoted associated with the content. + * @param quote + * The quote associated with the content. * @param range_name * The range representing the variable content name string within the data_make->buffer. * @@ -74,7 +74,7 @@ extern "C" { * Status codes (with error bit) are returned on any problem. */ #ifndef _di_fake_make_operate_expand_context_ - extern f_status_t fake_make_operate_expand_context(fake_make_data_t * const data_make, const f_fss_quote_t quoted, const f_string_range_t range_name) F_attribute_visibility_internal_d; + extern f_status_t fake_make_operate_expand_context(fake_make_data_t * const data_make, const f_fss_quote_t quote, const f_string_range_t range_name) F_attribute_visibility_internal_d; #endif // _di_fake_make_operate_expand_context_ /** @@ -82,8 +82,8 @@ extern "C" { * * @param data_make * All make related setting data, including data from the fakefile and the build settings file. - * @param quoted - * The quoted associated with the content. + * @param quote + * The quote associated with the content. * @param range_name * The range representing the variable content name string within the data_make->buffer. * @@ -102,7 +102,7 @@ extern "C" { * @see f_string_dynamics_increase() */ #ifndef _di_fake_make_operate_expand_environment_ - extern f_status_t fake_make_operate_expand_environment(fake_make_data_t * const data_make, const f_fss_quote_t quoted, const f_string_range_t range_name) F_attribute_visibility_internal_d; + extern f_status_t fake_make_operate_expand_environment(fake_make_data_t * const data_make, const f_fss_quote_t quote, const f_string_range_t range_name) F_attribute_visibility_internal_d; #endif // _di_fake_make_operate_expand_environment_ /** @@ -110,8 +110,8 @@ extern "C" { * * @param data_make * All make related setting data, including data from the fakefile and the build settings file. - * @param quoted - * The quoted associated with the content. + * @param quote + * The quote associated with the content. * @param range_name * The range representing the variable content name string within the data_make->buffer. * @@ -122,7 +122,7 @@ extern "C" { * Status codes (with error bit) are returned on any problem. */ #ifndef _di_fake_make_operate_expand_build_ - extern f_status_t fake_make_operate_expand_build(fake_make_data_t * const data_make, const f_fss_quote_t quoted, const f_string_range_t range_name) F_attribute_visibility_internal_d; + extern f_status_t fake_make_operate_expand_build(fake_make_data_t * const data_make, const f_fss_quote_t quote, const f_string_range_t range_name) F_attribute_visibility_internal_d; #endif // _di_fake_make_operate_expand_build_ /** -- 1.8.3.1