Update build action to clang-format-18

.github/workflows/build.yaml

@@ -597,7 +597,7 @@ jobs:
       with:
         fetch-depth: 0
     - name: Run clang-format style check for C/C++
-      uses: jidicula/clang-format-action@v4.11.0
+      uses: jidicula/clang-format-action@v4.14.0
       with:
-        clang-format-version: '11'
+        clang-format-version: '18'
         exclude-regex: 'dependencies'

ai/default/daimilitary.h

@@ -23,7 +23,7 @@
    to finish him off. */
 #define FINISH_HIM_CITY_COUNT 5
 
-typedef struct unit_list *(player_unit_list_getter)(struct player *pplayer);
+typedef struct unit_list *(player_unit_list_getter) (struct player *pplayer);
 
 struct unit_type *dai_choose_defender_versus(struct city *pcity,
                                              struct unit *attacker);

ai/tex/texai.c

@@ -575,8 +575,7 @@ bool fc_ai_tex_setup(struct ai_type *ai)
 
   qstrncpy(ai->name, "tex", sizeof(ai->name));
 
-  ai->private = new struct dai_private_data {
-  };
+  ai->private = new struct dai_private_data {};
   ai->private->contemplace_workers =
       false; /* We use custom code to set worker want and type */
 

ai/tex/texaicity.c

@@ -583,8 +583,7 @@ void texai_req_worker_task_rcv(struct texai_req *req)
  **************************************************************************/
 void texai_city_alloc(struct ai_type *ait, struct city *pcity)
 {
-  struct texai_city *city_data = new struct texai_city {
-  };
+  struct texai_city *city_data = new struct texai_city {};
 
   city_data->defai.building_wait = BUILDING_WAIT_MINIMUM;
   adv_init_choice(&(city_data->defai.choice));

ai/threaded/threadedai.c

@@ -570,8 +570,7 @@ bool fc_ai_threaded_setup(struct ai_type *ai)
 
   qstrncpy(ai->name, "threaded", sizeof(ai->name));
 
-  ai->private = new struct dai_private_data {
-  };
+  ai->private = new struct dai_private_data {};
   ai->private->contemplace_workers = true;
 
   tai_init_self(ai);

client/options.cpp

@@ -245,11 +245,13 @@ struct option {
 
 #define OPTION_INIT(optset, spec_type, spec_table_var, common_table,        \
                     spec_table, changed_cb, cb_data)                        \
-  {                                                                         \
-    .poptset = optset, .type = spec_type, .common_vtable = &common_table,   \
-    .spec_table_var = &spec_table, .changed_callback = changed_cb,          \
-    .callback_data = cb_data, .gui_data = nullptr                           \
-  }
+  {.poptset = optset,                                                       \
+   .type = spec_type,                                                       \
+   .common_vtable = &common_table,                                          \
+   .spec_table_var = &spec_table,                                           \
+   .changed_callback = changed_cb,                                          \
+   .callback_data = cb_data,                                                \
+   .gui_data = nullptr}
 #define OPTION_BOOL_INIT(optset, common_table, bool_table, changed_cb)      \
   OPTION_INIT(optset, OT_BOOLEAN, bool_vtable, common_table, bool_table,    \
               changed_cb, 0)

client/views/view_map_common.cpp

@@ -318,8 +318,8 @@ bool tile_to_canvas_pos(float *canvas_x, float *canvas_y, const tile *ptile)
    * backing store we need to draw it in case the canvas is resized.
    */
   return (*canvas_x > -tileset_tile_width(tileset)
-          && *canvas_x<mapview.store_width
-                           && * canvas_y> - tileset_tile_height(tileset)
+          && *canvas_x < mapview.store_width
+          && *canvas_y > -tileset_tile_height(tileset)
           && *canvas_y < (mapview.store_height
                           + (tileset_full_tile_height(tileset)
                              - tileset_tile_height(tileset))));

common/aicore/path_finding.cpp

@@ -938,7 +938,7 @@ struct pf_danger_node {
     signed short cost;      // See comment above.
     unsigned extra_cost;    // See comment above.
     signed dir_to_here : 4; // See comment above.
-  } * danger_segment;
+  } *danger_segment;
 };
 
 // Derived structure of struct pf_map.

common/clientutils.cpp

@@ -46,7 +46,7 @@ static void calc_activity(struct actcalc *calc, const struct tile *ptile)
     int rmextra_units[MAX_EXTRA_TYPES][ACTIVITY_LAST];
     int activity_total[ACTIVITY_LAST];
     int activity_units[ACTIVITY_LAST];
-  } * t;
+  } *t;
 
   t = new tmp_state[1]();
   memset(calc, 0, sizeof(*calc));

common/events.cpp

@@ -50,9 +50,7 @@ static const char *event_sections[] = {
     N_("Vote: %s"), N_("Wonder: %s"), nullptr};
 
 #define GEN_EV(event, section, descr)                                       \
-  {                                                                         \
-#event, nullptr, section, descr, nullptr, event                         \
-  }
+  {#event, nullptr, section, descr, nullptr, event}
 
 /*
  * Holds information about all event types. The entries don't have

common/featured_text.h

@@ -92,7 +92,7 @@
 // Offset type (in bytes).
 typedef int ft_offset_t;
 // Unset offset value.
-#define FT_OFFSET_UNSET ((ft_offset_t) -1)
+#define FT_OFFSET_UNSET ((ft_offset_t) - 1)
 
 // Opaque type.
 struct text_tag;
@@ -135,10 +135,7 @@ struct ft_color {
   const char *foreground;
   const char *background;
 };
-#define FT_COLOR(fg, bg)                                                    \
-  {                                                                         \
-    fg, bg                                                                  \
-  }
+#define FT_COLOR(fg, bg) {fg, bg}
 /**************************************************************************
   Constructor.
 **************************************************************************/

common/game.h

@@ -541,7 +541,7 @@ extern struct world wld;
 #define GAME_DEFAULT_SCORETURN 20
 
 #define GAME_DEFAULT_VICTORY_CONDITIONS                                     \
-  ((victory_condition_type)(1 << VC_SPACERACE | 1 << VC_ALLIED))
+  ((victory_condition_type) (1 << VC_SPACERACE | 1 << VC_ALLIED))
 #define GAME_DEFAULT_END_SPACESHIP true
 
 #define GAME_DEFAULT_SPACESHIP_TRAVEL_TIME 100

common/helpdata.cpp

@@ -4203,7 +4203,7 @@ void helptext_government(char *buf, size_t bufsz, struct player *pplayer,
                            ratio);
             }
           } // else this effect somehow has no effect; keep quiet
-        }   // else there was some extra condition making it complicated
+        } // else there was some extra condition making it complicated
         break;
       case EFT_UNIT_UPKEEP_FREE_PER_CITY:
         if (!unittype) {

common/map.h

@@ -104,7 +104,7 @@ bool map_startpos_remove(struct tile *ptile);
 #endif // FREECIV_DEBUG
 
 #define native_pos_to_index_nocheck(nat_x, nat_y)                           \
-  ((nat_x) + (nat_y) *wld.map.xsize)
+  ((nat_x) + (nat_y) * wld.map.xsize)
 #define native_pos_to_index(nat_x, nat_y)                                   \
   (CHECK_NATIVE_POS((nat_x), (nat_y)),                                      \
    native_pos_to_index_nocheck(nat_x, nat_y))
@@ -116,14 +116,14 @@ bool map_startpos_remove(struct tile *ptile);
 
 /* Obscure math.  See explanation in doc/HACKING. */
 #define NATIVE_TO_MAP_POS(pmap_x, pmap_y, nat_x, nat_y)                     \
-  (MAP_IS_ISOMETRIC ? (*(pmap_x) = ((nat_y) + ((nat_y) &1)) / 2 + (nat_x),  \
+  (MAP_IS_ISOMETRIC ? (*(pmap_x) = ((nat_y) + ((nat_y) & 1)) / 2 + (nat_x), \
                        *(pmap_y) = (nat_y) - *(pmap_x) + wld.map.xsize)     \
                     : (*(pmap_x) = (nat_x), *(pmap_y) = (nat_y)))
 
 #define MAP_TO_NATIVE_POS(pnat_x, pnat_y, map_x, map_y)                     \
   (MAP_IS_ISOMETRIC                                                         \
-       ? (*(pnat_y) = (map_x) + (map_y) -wld.map.xsize,                     \
-          *(pnat_x) = (2 * (map_x) - *(pnat_y) - (*(pnat_y) &1)) / 2)       \
+       ? (*(pnat_y) = (map_x) + (map_y) - wld.map.xsize,                    \
+          *(pnat_x) = (2 * (map_x) - *(pnat_y) - (*(pnat_y) & 1)) / 2)      \
        : (*(pnat_x) = (map_x), *(pnat_y) = (map_y)))
 
 #define NATURAL_TO_MAP_POS(pmap_x, pmap_y, nat_x, nat_y)                    \
@@ -132,7 +132,7 @@ bool map_startpos_remove(struct tile *ptile);
                     : (*(pmap_x) = (nat_x), *(pmap_y) = (nat_y)))
 
 #define MAP_TO_NATURAL_POS(pnat_x, pnat_y, map_x, map_y)                    \
-  (MAP_IS_ISOMETRIC ? (*(pnat_y) = (map_x) + (map_y) -wld.map.xsize,        \
+  (MAP_IS_ISOMETRIC ? (*(pnat_y) = (map_x) + (map_y) - wld.map.xsize,       \
                        *(pnat_x) = 2 * (map_x) - *(pnat_y))                 \
                     : (*(pnat_x) = (map_x), *(pnat_y) = (map_y)))
 

common/name_translation.h

@@ -29,10 +29,7 @@ struct name_translation {
 };
 
 // Inititalization macro.
-#define NAME_INIT                                                           \
-  {                                                                         \
-    nullptr, "\0", "\0"                                                     \
-  }
+#define NAME_INIT {nullptr, "\0", "\0"}
 
 /****************************************************************************
   Initializes a name translation structure.

common/path_finder.cpp

@@ -657,7 +657,7 @@ path_finder::path_finder(const unit *unit)
  */
 path_finder::path_finder(const unit *unit, const path::step &init)
     : m_d(std::make_unique<path_finder_private>(
-        unit, detail::vertex{init, nullptr}))
+          unit, detail::vertex{init, nullptr}))
 {
 }
 

common/requirements.cpp

@@ -3171,9 +3171,10 @@ bool is_req_active(
                                 req->source.value.building);
     break;
   case VUT_IMPR_GENUS:
-    eval = (target_building ? BOOL_TO_TRISTATE(
-                target_building->genus == req->source.value.impr_genus)
-                            : TRI_MAYBE);
+    eval =
+        (target_building ? BOOL_TO_TRISTATE(target_building->genus
+                                            == req->source.value.impr_genus)
+                         : TRI_MAYBE);
     break;
   case VUT_EXTRA:
     eval = is_extra_type_in_range(target_tile, target_city, req->range,

common/server_settings.h

@@ -15,7 +15,7 @@ received a copy of the GNU General Public License along with Freeciv21.
 #include "fc_types.h"
 
 // Special value to signal the absence of a server setting.
-#define SERVER_SETTING_NONE ((server_setting_id) -1)
+#define SERVER_SETTING_NONE ((server_setting_id) - 1)
 
 // Pure server settings.
 server_setting_id server_setting_by_name(const char *name);

common/vision.h

@@ -92,9 +92,7 @@ struct vision {
 
 // Initialize a vision radius array.
 #define V_RADIUS(main_sq, invis_sq, subs_sq)                                \
-  {                                                                         \
-    (short) (main_sq), (short) (invis_sq), (short) (subs_sq)                \
-  }
+  {(short) (main_sq), (short) (invis_sq), (short) (subs_sq)}
 
 #define ASSERT_VISION(v)                                                    \
   do {                                                                      \

server/advisors/autosettlers.cpp

@@ -748,7 +748,7 @@ adv_want settler_evaluate_improvements(struct unit *punit,
           }
           extra_type_iterate_end;
         } // endif: can we arrive sooner than current worker, if any?
-      }   // endif: are we travelling to a legal destination?
+      } // endif: are we travelling to a legal destination?
     }
     city_tile_iterate_index_end;
   }

server/aiiface.cpp

@@ -70,7 +70,7 @@ bool load_ai_module(const char *modname)
   struct ai_type *ai = ai_type_alloc();
   bool setup_success;
   lt_dlhandle handle;
-  bool (*setup_func)(struct ai_type * ai);
+  bool (*setup_func)(struct ai_type *ai);
   const char *(*capstr_func)(void);
   const char *capstr;
   char buffer[2048];

server/diplomats.cpp

@@ -272,10 +272,8 @@ bool diplomat_investigate(struct player *pplayer, struct unit *pdiplomat,
                           struct city *pcity, const struct action *paction)
 {
   struct player *cplayer;
-  struct packet_unit_short_info unit_packet {
-  };
-  struct packet_city_info city_packet {
-  };
+  struct packet_unit_short_info unit_packet {};
+  struct packet_city_info city_packet {};
   struct traderoute_packet_list *routes;
 
   // Fetch target city's player.  Sanity checks.

server/savegame/savecompat.cpp

@@ -226,7 +226,7 @@ int current_compat_ver() { return compat[compat_current].version; }
  */
 char bin2ascii_hex(int value, int halfbyte_wanted)
 {
-  return hex_chars[((value) >> ((halfbyte_wanted) *4)) & 0xf];
+  return hex_chars[((value) >> ((halfbyte_wanted) * 4)) & 0xf];
 }
 
 /**

server/score.cpp

@@ -352,7 +352,7 @@ void calc_civ_score(struct player *pplayer)
   }
   unit_list_iterate_end
 
-      improvement_iterate(i)
+  improvement_iterate(i)
   {
     if (is_great_wonder(i) && (wonder_city = city_from_great_wonder(i))
         && player_owns_city(pplayer, wonder_city)) {