From 5eb278e0dc3d24aedc31402f67d6135d5663f7ef Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Fri, 3 Jul 2026 22:17:20 +0300 Subject: [PATCH 34/34] manual: Replace NULL with nullptr See RM #2065 Signed-off-by: Marko Lindqvist --- tools/manual/fc_manual.c | 29 +++++++++++++++-------------- tools/manual/manual_buildings.c | 4 ++-- tools/manual/manual_commands.c | 2 +- tools/manual/manual_extras.c | 4 ++-- tools/manual/manual_governments.c | 4 ++-- tools/manual/manual_settings.c | 4 ++-- tools/manual/manual_techs.c | 4 ++-- tools/manual/manual_terrain.c | 16 ++++++++-------- tools/manual/manual_uclass.c | 2 +- tools/manual/manual_units.c | 4 ++-- 10 files changed, 37 insertions(+), 36 deletions(-) diff --git a/tools/manual/fc_manual.c b/tools/manual/fc_manual.c index a35bb063eb..474784f216 100644 --- a/tools/manual/fc_manual.c +++ b/tools/manual/fc_manual.c @@ -157,7 +157,7 @@ void insert_client_build_info(char *outbuf, size_t outlen); /* Needed for "About Freeciv" help */ const char *client_string = "freeciv-manual"; -static char *ruleset = NULL; +static char *ruleset = nullptr; /**********************************************************************//** Replace html special characters ('&', '<' and '>'). @@ -201,7 +201,7 @@ struct tileset *tileset; **************************************************************************/ const char *tileset_name_get(struct tileset *t) { - return NULL; + return nullptr; } /**********************************************************************//** @@ -209,7 +209,7 @@ const char *tileset_name_get(struct tileset *t) **************************************************************************/ const char *tileset_version(struct tileset *t) { - return NULL; + return nullptr; } /**********************************************************************//** @@ -217,7 +217,7 @@ const char *tileset_version(struct tileset *t) **************************************************************************/ const char *tileset_summary(struct tileset *t) { - return NULL; + return nullptr; } /**********************************************************************//** @@ -225,7 +225,7 @@ const char *tileset_summary(struct tileset *t) **************************************************************************/ const char *tileset_description(struct tileset *t) { - return NULL; + return nullptr; } /**********************************************************************//** @@ -233,7 +233,7 @@ const char *tileset_description(struct tileset *t) **************************************************************************/ const char *current_musicset_name(void) { - return NULL; + return nullptr; } /**********************************************************************//** @@ -241,7 +241,7 @@ const char *current_musicset_name(void) **************************************************************************/ const char *current_musicset_version(void) { - return NULL; + return nullptr; } /**********************************************************************//** @@ -249,7 +249,7 @@ const char *current_musicset_version(void) **************************************************************************/ const char *current_musicset_summary(void) { - return NULL; + return nullptr; } /**********************************************************************//** @@ -257,7 +257,7 @@ const char *current_musicset_summary(void) **************************************************************************/ const char *current_musicset_description(void) { - return NULL; + return nullptr; } /**********************************************************************//** @@ -297,7 +297,7 @@ FILE *manual_start(struct tag_types *tag_info, int manual_number) || !(doc = fc_fopen(filename, "w"))) { log_error(_("Could not write manual file %s."), filename); - return NULL; + return nullptr; } fprintf(doc, "%s", tag_info->header); @@ -331,7 +331,8 @@ static bool manual_command(struct tag_types *tag_info) /* Reset aifill to zero */ game.info.aifill = 0; - if (!load_rulesets(NULL, NULL, FALSE, NULL, FALSE, FALSE, FALSE)) { + if (!load_rulesets(nullptr, nullptr, FALSE, nullptr, + FALSE, FALSE, FALSE)) { /* Failed to load correct ruleset */ return FALSE; } @@ -359,7 +360,7 @@ int main(int argc, char **argv) int inx; bool showhelp = FALSE; bool showvers = FALSE; - char *option = NULL; + char *option = nullptr; int retval = EXIT_SUCCESS; struct tag_types *tag_info = &html_tags; @@ -382,7 +383,7 @@ int main(int argc, char **argv) inx = 1; while (inx < argc) { if ((option = get_option_malloc("--ruleset", argv, &inx, argc, TRUE))) { - if (ruleset != NULL) { + if (ruleset != nullptr) { fc_fprintf(stderr, _("Multiple rulesets requested. Only one " "ruleset at a time is supported.\n")); } else { @@ -438,7 +439,7 @@ int main(int argc, char **argv) game_init(FALSE); /* Set ruleset user requested in to use */ - if (ruleset != NULL) { + if (ruleset != nullptr) { sz_strlcpy(game.server.rulesetdir, ruleset); } diff --git a/tools/manual/manual_buildings.c b/tools/manual/manual_buildings.c index 9c423bcdc0..c0f5f41e02 100644 --- a/tools/manual/manual_buildings.c +++ b/tools/manual/manual_buildings.c @@ -41,7 +41,7 @@ static bool manual_improvements(struct tag_types *tag_info, doc = manual_start(tag_info, manual); - if (doc == NULL) { + if (doc == nullptr) { return FALSE; } @@ -68,7 +68,7 @@ static bool manual_improvements(struct tag_types *tag_info, continue; } - helptext_building(buf, sizeof(buf), NULL, NULL, pimprove); + helptext_building(buf, sizeof(buf), nullptr, nullptr, pimprove); fprintf(doc, "%s%s%s%s\n" "%d
%d\n", diff --git a/tools/manual/manual_commands.c b/tools/manual/manual_commands.c index e529f53e05..8555092a91 100644 --- a/tools/manual/manual_commands.c +++ b/tools/manual/manual_commands.c @@ -37,7 +37,7 @@ bool manual_commands(struct tag_types *tag_info) doc = manual_start(tag_info, MANUAL_COMMANDS); - if (doc == NULL) { + if (doc == nullptr) { return FALSE; } diff --git a/tools/manual/manual_extras.c b/tools/manual/manual_extras.c index e86985be57..945d2d18b8 100644 --- a/tools/manual/manual_extras.c +++ b/tools/manual/manual_extras.c @@ -40,7 +40,7 @@ bool manual_extras(struct tag_types *tag_info) doc = manual_start(tag_info, MANUAL_EXTRAS); - if (doc == NULL) { + if (doc == nullptr) { return FALSE; } @@ -56,7 +56,7 @@ bool manual_extras(struct tag_types *tag_info) extra_name_translation(pextra), tag_info->sect_title_end); fprintf(doc, tag_info->subitem_begin, "helptext"); - helptext_extra(buf, sizeof(buf), NULL, "", pextra); + helptext_extra(buf, sizeof(buf), nullptr, "", pextra); fprintf(doc, "%s", buf); fprintf(doc, "%s", tag_info->subitem_end); diff --git a/tools/manual/manual_governments.c b/tools/manual/manual_governments.c index 4e76259f69..67c62e5280 100644 --- a/tools/manual/manual_governments.c +++ b/tools/manual/manual_governments.c @@ -40,7 +40,7 @@ bool manual_governments(struct tag_types *tag_info) doc = manual_start(tag_info, MANUAL_GOVS); - if (doc == NULL) { + if (doc == nullptr) { return FALSE; } @@ -57,7 +57,7 @@ bool manual_governments(struct tag_types *tag_info) fprintf(doc, "%s%s%s\n\n", tag_info->sect_title_begin, government_name_translation(pgov), tag_info->sect_title_end); fprintf(doc, tag_info->subitem_begin, "helptext"); - helptext_government(buf, sizeof(buf), NULL, NULL, pgov); + helptext_government(buf, sizeof(buf), nullptr, nullptr, pgov); fprintf(doc, "%s\n\n", buf); fprintf(doc, "%s", tag_info->subitem_end); fprintf(doc, "%s", tag_info->item_end); diff --git a/tools/manual/manual_settings.c b/tools/manual/manual_settings.c index 4a55d5f709..d4bd8e809b 100644 --- a/tools/manual/manual_settings.c +++ b/tools/manual/manual_settings.c @@ -38,7 +38,7 @@ bool manual_settings(struct tag_types *tag_info) doc = manual_start(tag_info, MANUAL_SETTINGS); - if (doc == NULL) { + if (doc == nullptr) { return FALSE; } @@ -77,7 +77,7 @@ bool manual_settings(struct tag_types *tag_info) * the function setting_is_changeable() */ if (setting_ruleset_locked(pset)) { fprintf(doc, _("Is locked by the ruleset.")); - } else if (!setting_is_changeable(pset, &dummy_conn, NULL, 0)) { + } else if (!setting_is_changeable(pset, &dummy_conn, nullptr, 0)) { fprintf(doc, _("Can only be used in server console.")); } diff --git a/tools/manual/manual_techs.c b/tools/manual/manual_techs.c index e734042026..da6e5da020 100644 --- a/tools/manual/manual_techs.c +++ b/tools/manual/manual_techs.c @@ -40,7 +40,7 @@ bool manual_techs(struct tag_types *tag_info) doc = manual_start(tag_info, MANUAL_TECHS); - if (doc == NULL) { + if (doc == nullptr) { return FALSE; } @@ -58,7 +58,7 @@ bool manual_techs(struct tag_types *tag_info) advance_name_translation(ptech), tag_info->sect_title_end); fprintf(doc, tag_info->subitem_begin, "helptext"); - helptext_advance(buf, sizeof(buf), NULL, "", ptech->item_number); + helptext_advance(buf, sizeof(buf), nullptr, "", ptech->item_number); fprintf(doc, "%s", buf); fprintf(doc, "%s", tag_info->subitem_end); diff --git a/tools/manual/manual_terrain.c b/tools/manual/manual_terrain.c index 6f299eb4e6..c708b78e23 100644 --- a/tools/manual/manual_terrain.c +++ b/tools/manual/manual_terrain.c @@ -37,7 +37,7 @@ bool manual_terrain(struct tag_types *tag_info) doc = manual_start(tag_info, MANUAL_TERRAIN); - if (doc == NULL) { + if (doc == nullptr) { return FALSE; } @@ -100,7 +100,7 @@ bool manual_terrain(struct tag_types *tag_info) fprintf(doc, "\n"); if (action_id_univs_not_blocking(ACTION_IRRIGATE, - NULL, &for_terr)) { + nullptr, &for_terr)) { fprintf(doc, "", pterrain->irrigation_food_incr); if (pterrain->irrigation_time == 0) { fprintf(doc, "\n"); @@ -111,9 +111,9 @@ bool manual_terrain(struct tag_types *tag_info) } else { fprintf(doc, "\n", _("impossible")); } - if (pterrain->cultivate_result != NULL + if (pterrain->cultivate_result != nullptr && action_id_univs_not_blocking(ACTION_CULTIVATE, - NULL, &for_terr)) { + nullptr, &for_terr)) { fprintf(doc, "", terrain_name_translation(pterrain->cultivate_result)); if (pterrain->cultivate_time == 0) { @@ -125,7 +125,7 @@ bool manual_terrain(struct tag_types *tag_info) } else { fprintf(doc, "\n", _("impossible")); } - if (action_id_univs_not_blocking(ACTION_MINE, NULL, &for_terr)) { + if (action_id_univs_not_blocking(ACTION_MINE, nullptr, &for_terr)) { fprintf(doc, "", pterrain->mining_shield_incr); if (pterrain->mining_time == 0) { fprintf(doc, "\n"); @@ -136,9 +136,9 @@ bool manual_terrain(struct tag_types *tag_info) } else { fprintf(doc, "\n", _("impossible")); } - if (pterrain->plant_result != NULL + if (pterrain->plant_result != nullptr && action_id_univs_not_blocking(ACTION_PLANT, - NULL, &for_terr)) { + nullptr, &for_terr)) { fprintf(doc, "", terrain_name_translation(pterrain->plant_result)); if (pterrain->plant_time == 0) { @@ -153,7 +153,7 @@ bool manual_terrain(struct tag_types *tag_info) if (pterrain->transform_result && action_id_univs_not_blocking(ACTION_TRANSFORM_TERRAIN, - NULL, &for_terr)) { + nullptr, &for_terr)) { fprintf(doc, "", terrain_name_translation(pterrain->transform_result)); if (pterrain->transform_time == 0) { diff --git a/tools/manual/manual_uclass.c b/tools/manual/manual_uclass.c index fc24679e98..b544926fc6 100644 --- a/tools/manual/manual_uclass.c +++ b/tools/manual/manual_uclass.c @@ -40,7 +40,7 @@ bool manual_uclasses(struct tag_types *tag_info) doc = manual_start(tag_info, MANUAL_UCLASS); - if (doc == NULL) { + if (doc == nullptr) { return FALSE; } diff --git a/tools/manual/manual_units.c b/tools/manual/manual_units.c index 350deb1182..e79ca1f38c 100644 --- a/tools/manual/manual_units.c +++ b/tools/manual/manual_units.c @@ -40,7 +40,7 @@ bool manual_units(struct tag_types *tag_info) doc = manual_start(tag_info, MANUAL_UNITS); - if (doc == NULL) { + if (doc == nullptr) { return FALSE; } @@ -99,7 +99,7 @@ bool manual_units(struct tag_types *tag_info) utype_name_translation(putype->obsoleted_by)); fprintf(doc, "%s", tag_info->subitem_end); fprintf(doc, tag_info->subitem_begin, "helptext"); - helptext_unit(buf, sizeof(buf), NULL, "", putype, FALSE); + helptext_unit(buf, sizeof(buf), nullptr, "", putype, FALSE); fprintf(doc, "%s", buf); fprintf(doc, "%s", tag_info->subitem_end); fprintf(doc, "%s", tag_info->item_end); -- 2.53.0
+%d F(-)
%s
%s
%s
+%d P(-)
%s
%s
%s