From f0a5aff386df2560cfb38b76d7b551373ba04aa8 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Fri, 3 Apr 2026 13:56:43 +0300 Subject: [PATCH 29/29] ruleload.c: Use secfile_entry_ignore_by_path() See RM #1967 Signed-off-by: Marko Lindqvist --- server/ruleset/ruleload.c | 46 +++++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/server/ruleset/ruleload.c b/server/ruleset/ruleload.c index 7efe58047e..c05d1eb274 100644 --- a/server/ruleset/ruleload.c +++ b/server/ruleset/ruleload.c @@ -1321,14 +1321,14 @@ static bool load_game_names(struct section_file *file, const char *filename = secfile_name(file); bool ok = TRUE; - /* section: datafile */ + /* Section: datafile */ compat->version = rscompat_check_capabilities(file, filename, compat); if (compat->version <= 0) { return FALSE; } - (void) secfile_entry_by_path(file, "datafile.description"); /* unused */ - (void) secfile_entry_by_path(file, "datafile.ruledit"); /* unused */ + secfile_entry_ignore_by_path(file, "datafile.description"); /* Unused */ + secfile_entry_ignore_by_path(file, "datafile.ruledit"); /* Unused */ sec = secfile_sections_by_name_prefix(file, ACHIEVEMENT_SECTION_PREFIX); nval = (NULL != sec ? section_list_size(sec) : 0); @@ -1453,8 +1453,8 @@ static bool load_action_names(struct section_file *file, return FALSE; } - (void) secfile_entry_by_path(file, "datafile.description"); /* Unused */ - (void) secfile_entry_by_path(file, "datafile.ruledit"); /* Unused */ + secfile_entry_ignore_by_path(file, "datafile.description"); /* Unused */ + secfile_entry_ignore_by_path(file, "datafile.ruledit"); /* Unused */ return ok; } @@ -1478,8 +1478,8 @@ static bool load_tech_names(struct section_file *file, return FALSE; } - (void) secfile_entry_by_path(file, "datafile.description"); /* unused */ - (void) secfile_entry_by_path(file, "datafile.ruledit"); /* unused */ + secfile_entry_ignore_by_path(file, "datafile.description"); /* Unused */ + secfile_entry_ignore_by_path(file, "datafile.ruledit"); /* Unused */ /* User tech flag names */ for (i = 0; (flag = secfile_lookup_str_default(file, NULL, "control.flags%d.name", i)) ; @@ -1806,8 +1806,8 @@ static bool load_unit_names(struct section_file *file, return FALSE; } - (void) secfile_entry_by_path(file, "datafile.description"); /* unused */ - (void) secfile_entry_by_path(file, "datafile.ruledit"); /* unused */ + secfile_entry_ignore_by_path(file, "datafile.description"); /* Unused */ + secfile_entry_ignore_by_path(file, "datafile.ruledit"); /* Unused */ /* User unit flag names */ for (i = 0; (flag = secfile_lookup_str_default(file, NULL, "control.flags%d.name", i)) ; @@ -2568,8 +2568,8 @@ static bool load_building_names(struct section_file *file, return FALSE; } - (void) secfile_entry_by_path(file, "datafile.description"); /* unused */ - (void) secfile_entry_by_path(file, "datafile.ruledit"); /* unused */ + secfile_entry_ignore_by_path(file, "datafile.description"); /* Unused */ + secfile_entry_ignore_by_path(file, "datafile.ruledit"); /* Unused */ /* The names: */ sec = secfile_sections_by_name_prefix(file, BUILDING_SECTION_PREFIX); @@ -2774,8 +2774,8 @@ static bool load_terrain_names(struct section_file *file, return FALSE; } - (void) secfile_entry_by_path(file, "datafile.description"); /* unused */ - (void) secfile_entry_by_path(file, "datafile.ruledit"); /* unused */ + secfile_entry_ignore_by_path(file, "datafile.description"); /* Unused */ + secfile_entry_ignore_by_path(file, "datafile.ruledit"); /* Unused */ /* User terrain flag names */ for (i = 0; (flag = secfile_lookup_str_default(file, NULL, "control.flags%d.name", i)) ; @@ -4366,8 +4366,8 @@ static bool load_government_names(struct section_file *file, return FALSE; } - (void) secfile_entry_by_path(file, "datafile.description"); /* unused */ - (void) secfile_entry_by_path(file, "datafile.ruledit"); /* unused */ + secfile_entry_ignore_by_path(file, "datafile.description"); /* Unused */ + secfile_entry_ignore_by_path(file, "datafile.ruledit"); /* Unused */ sec = secfile_sections_by_name_prefix(file, GOVERNMENT_SECTION_PREFIX); if (NULL == sec || 0 == (nval = section_list_size(sec))) { @@ -4754,8 +4754,8 @@ static bool load_nation_names(struct section_file *file, return FALSE; } - (void) secfile_entry_by_path(file, "datafile.description"); /* unused */ - (void) secfile_entry_by_path(file, "datafile.ruledit"); /* unused */ + secfile_entry_ignore_by_path(file, "datafile.description"); /* Unused */ + secfile_entry_ignore_by_path(file, "datafile.ruledit"); /* Unused */ sec = secfile_sections_by_name_prefix(file, NATION_SECTION_PREFIX); if (NULL == sec) { @@ -5792,8 +5792,8 @@ static bool load_style_names(struct section_file *file, return FALSE; } - (void) secfile_entry_by_path(file, "datafile.description"); /* unused */ - (void) secfile_entry_by_path(file, "datafile.ruledit"); /* unused */ + secfile_entry_ignore_by_path(file, "datafile.description"); /* Unused */ + secfile_entry_ignore_by_path(file, "datafile.ruledit"); /* Unused */ sec = secfile_sections_by_name_prefix(file, STYLE_SECTION_PREFIX); if (NULL == sec) { @@ -6077,8 +6077,8 @@ static bool load_ruleset_cities(struct section_file *file, return FALSE; } - (void) secfile_entry_by_path(file, "datafile.description"); /* unused */ - (void) secfile_entry_by_path(file, "datafile.ruledit"); /* unused */ + secfile_entry_ignore_by_path(file, "datafile.description"); /* Unused */ + secfile_entry_ignore_by_path(file, "datafile.ruledit"); /* Unused */ /* Specialist options */ sec = secfile_sections_by_name_prefix(file, SPECIALIST_SECTION_PREFIX); @@ -6293,8 +6293,8 @@ static bool load_ruleset_effects(struct section_file *file, return FALSE; } - (void) secfile_entry_by_path(file, "datafile.description"); /* unused */ - (void) secfile_entry_by_path(file, "datafile.ruledit"); /* unused */ + secfile_entry_ignore_by_path(file, "datafile.description"); /* Unused */ + secfile_entry_ignore_by_path(file, "datafile.ruledit"); /* Unused */ sec = secfile_sections_by_name_prefix(file, UEFF_SECTION_PREFIX); -- 2.53.0