From 09d91340b9be72969de0f2b080e48268abcb79d6 Mon Sep 17 00:00:00 2001
From: Marko Lindqvist <cazfi74@gmail.com>
Date: Sun, 31 Mar 2024 22:07:21 +0300
Subject: [PATCH 54/54] server/ruleset/: Clear trailing spaces

See RM #385

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
---
 server/ruleset/rssanity.c |  2 +-
 server/ruleset/ruleload.c | 32 ++++++++++++++++----------------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/server/ruleset/rssanity.c b/server/ruleset/rssanity.c
index 32caddc8bb..5f9143eb22 100644
--- a/server/ruleset/rssanity.c
+++ b/server/ruleset/rssanity.c
@@ -1543,7 +1543,7 @@ bool sanity_check_ruleset_data(struct rscompat_info *compat)
 bool autoadjust_ruleset_data(void)
 {
   bool ok = TRUE;
-  
+
   extra_type_by_cause_iterate(EC_RESOURCE, pextra) {
     extra_type_by_cause_iterate(EC_RESOURCE, pextra2) {
       if (pextra != pextra2) {
diff --git a/server/ruleset/ruleload.c b/server/ruleset/ruleload.c
index 112279c404..23be2fed18 100644
--- a/server/ruleset/ruleload.c
+++ b/server/ruleset/ruleload.c
@@ -879,7 +879,7 @@ static bool lookup_tech(struct section_file *file,
 **************************************************************************/
 static bool lookup_unit_list(struct section_file *file, const char *prefix,
                              const char *entry,
-                             struct unit_type **output, 
+                             struct unit_type **output,
                              const char *filename)
 {
   const char **slist;
@@ -1061,7 +1061,7 @@ static bool lookup_unit_type(struct section_file *file,
                              const char *description)
 {
   const char *sval;
-  
+
   sval = secfile_lookup_str_default(file, "None", "%s.%s", prefix, entry);
 
   if (strcmp(sval, "None") == 0) {
@@ -1749,7 +1749,7 @@ restart:
       }
     } advance_iterate_all_end;
 
-    /* Some more consistency checking: 
+    /* Some more consistency checking:
        Non-removed techs depending on removed techs is too
        broken to fix by default, so die.
     */
@@ -2494,7 +2494,7 @@ static bool load_ruleset_units(struct section_file *file,
       const int i = utype_index(u);
 
       BV_CLR_ALL(u->roles);
-    
+
       slist = secfile_lookup_str_vec(file, &nval, "%s.roles",
                                      section_name(section_list_get(sec, i)));
       for (j = 0; j < nval; j++) {
@@ -2518,7 +2518,7 @@ static bool load_ruleset_units(struct section_file *file,
     } unit_type_iterate_end;
   }
 
-  if (ok) { 
+  if (ok) {
     /* Some more consistency checking: */
     unit_type_iterate(u) {
       unit_tech_reqs_iterate(u, padv) {
@@ -3800,7 +3800,7 @@ static bool load_ruleset_terrain(struct section_file *file,
           BV_SET(pextra2->conflicts, extra_index(pextra));
         }
       }
-    
+
       free(slist);
 
       if (!ok) {
@@ -4362,7 +4362,7 @@ static bool load_ruleset_governments(struct section_file *file,
         g->ai.better = NULL;
       }
       requirement_vector_copy(&g->reqs, reqs);
-    
+
       sz_strlcpy(g->graphic_str,
                  secfile_lookup_str(file, "%s.graphic", sec_name));
       sz_strlcpy(g->graphic_alt,
@@ -4487,7 +4487,7 @@ static bool load_ruleset_governments(struct section_file *file,
       }
       requirement_vector_copy(&pmul->reqs, reqs);
 
-      pmul->helptext = lookup_strvec(file, sec_name, "helptext");   
+      pmul->helptext = lookup_strvec(file, sec_name, "helptext");
     } multipliers_iterate_end;
     section_list_destroy(sec);
   }
@@ -4706,7 +4706,7 @@ static bool load_nation_names(struct section_file *file,
 **************************************************************************/
 static bool is_on_allowed_list(const char *name, const char **list, size_t len)
 {
-  int i;  
+  int i;
 
   for (i = 0; i < len; i++) {
     if (!fc_strcasecmp(name, list[i])) {
@@ -5684,9 +5684,9 @@ static bool load_ruleset_styles(struct section_file *file,
     struct requirement_vector *reqs;
     const char *sec_name = section_name(section_list_get(sec, i));
 
-    sz_strlcpy(city_styles[i].graphic, 
+    sz_strlcpy(city_styles[i].graphic,
                secfile_lookup_str(file, "%s.graphic", sec_name));
-    sz_strlcpy(city_styles[i].graphic_alt, 
+    sz_strlcpy(city_styles[i].graphic_alt,
                secfile_lookup_str(file, "%s.graphic_alt", sec_name));
     sz_strlcpy(city_styles[i].citizens_graphic,
                secfile_lookup_str_default(file, "-",
@@ -5932,7 +5932,7 @@ static bool load_ruleset_cities(struct section_file *file,
   if (ok) {
     /* City Parameters */
 
-    game.info.celebratesize = 
+    game.info.celebratesize =
       secfile_lookup_int_default(file, GAME_DEFAULT_CELEBRATESIZE,
                                  "parameters.celebrate_size_limit");
     game.info.add_to_size_limit =
@@ -5941,13 +5941,13 @@ static bool load_ruleset_cities(struct section_file *file,
       secfile_lookup_bool_default(file, GAME_DEFAULT_ANGRYCITIZEN,
                                   "parameters.angry_citizens");
 
-    game.info.changable_tax = 
+    game.info.changable_tax =
       secfile_lookup_bool_default(file, GAME_DEFAULT_CHANGABLE_TAX, "parameters.changable_tax");
-    game.info.forced_science = 
+    game.info.forced_science =
       secfile_lookup_int_default(file, 0, "parameters.forced_science");
-    game.info.forced_luxury = 
+    game.info.forced_luxury =
       secfile_lookup_int_default(file, 100, "parameters.forced_luxury");
-    game.info.forced_gold = 
+    game.info.forced_gold =
       secfile_lookup_int_default(file, 0, "parameters.forced_gold");
     if (game.info.forced_science + game.info.forced_luxury
         + game.info.forced_gold != 100) {
-- 
2.43.0