From 999ff135aadadf34c22af179a690152a4f210f94 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Tue, 9 Dec 2025 21:22:47 +0200 Subject: [PATCH 46/46] improvement.c: Replace parameter checking fc_asserts with nonnull attributes See RM #1736 Signed-off-by: Marko Lindqvist --- common/improvement.c | 19 +++++-------------- common/improvement.h | 21 ++++++++++++++------- 2 files changed, 19 insertions(+), 21 deletions(-) diff --git a/common/improvement.c b/common/improvement.c index d166a424af..fdab7286ab 100644 --- a/common/improvement.c +++ b/common/improvement.c @@ -176,8 +176,6 @@ Impr_type_id improvement_count(void) **************************************************************************/ Impr_type_id improvement_index(const struct impr_type *pimprove) { - fc_assert_ret_val(pimprove != nullptr, -1); - return pimprove - improvement_types; } @@ -186,8 +184,6 @@ Impr_type_id improvement_index(const struct impr_type *pimprove) **************************************************************************/ Impr_type_id improvement_number(const struct impr_type *pimprove) { - fc_assert_ret_val(pimprove != nullptr, -1); - return pimprove->item_number; } @@ -221,8 +217,8 @@ const struct impr_type *valid_improvement(const struct impr_type *pimprove) if (!victory_enabled(VC_SPACERACE) && (building_has_effect(pimprove, EFT_SS_STRUCTURAL) - || building_has_effect(pimprove, EFT_SS_COMPONENT) - || building_has_effect(pimprove, EFT_SS_MODULE))) { + || building_has_effect(pimprove, EFT_SS_COMPONENT) + || building_has_effect(pimprove, EFT_SS_MODULE))) { /* This assumes that space parts don't have any other effects. */ return nullptr; } @@ -386,7 +382,7 @@ struct impr_type *improvement_by_rule_name(const char *name) Return TRUE if the impr has this flag, otherwise FALSE **************************************************************************/ bool improvement_has_flag(const struct impr_type *pimprove, - enum impr_flag_id flag) + enum impr_flag_id flag) { fc_assert_ret_val(impr_flag_id_is_valid(flag), FALSE); @@ -415,7 +411,7 @@ bool can_improvement_go_obsolete(const struct impr_type *pimprove) Returns TRUE if the improvement or wonder is obsolete **************************************************************************/ bool improvement_obsolete(const struct player *pplayer, - const struct impr_type *pimprove, + const struct impr_type *pimprove, const struct city *pcity) { const struct req_context context = { @@ -738,7 +734,7 @@ bool can_player_build_improvement_direct(const struct player *p, Returns FALSE if building is obsolete. **************************************************************************/ bool can_player_build_improvement_now(const struct player *p, - struct impr_type *pimprove) + struct impr_type *pimprove) { if (!can_player_build_improvement_direct(p, pimprove)) { return FALSE; @@ -840,7 +836,6 @@ void wonder_built(const struct city *pcity, const struct impr_type *pimprove) struct player *pplayer; int windex = improvement_number(pimprove); - fc_assert_ret(pcity != nullptr); fc_assert_ret(is_wonder(pimprove)); pplayer = city_owner(pcity); @@ -861,7 +856,6 @@ void wonder_destroyed(const struct city *pcity, struct player *pplayer; int windex = improvement_number(pimprove); - fc_assert_ret(pcity != nullptr); fc_assert_ret(is_wonder(pimprove)); pplayer = city_owner(pcity); @@ -882,7 +876,6 @@ void wonder_destroyed(const struct city *pcity, bool wonder_is_lost(const struct player *pplayer, const struct impr_type *pimprove) { - fc_assert_ret_val(pplayer != nullptr, FALSE); fc_assert_ret_val(is_wonder(pimprove), FALSE); return pplayer->wonders[improvement_index(pimprove)] == WONDER_LOST; @@ -895,7 +888,6 @@ bool wonder_is_lost(const struct player *pplayer, bool wonder_is_built(const struct player *pplayer, const struct impr_type *pimprove) { - fc_assert_ret_val(pplayer != nullptr, FALSE); fc_assert_ret_val(is_wonder(pimprove), FALSE); return WONDER_BUILT(pplayer->wonders[improvement_index(pimprove)]); @@ -919,7 +911,6 @@ struct city *city_from_wonder(const struct player *pplayer, city_id = pplayer->wonders[idx]; - fc_assert_ret_val(pplayer != nullptr, nullptr); fc_assert_ret_val(is_wonder(pimprove), nullptr); if (!WONDER_BUILT(city_id)) { diff --git a/common/improvement.h b/common/improvement.h index cea5f4e510..a2e0edb794 100644 --- a/common/improvement.h +++ b/common/improvement.h @@ -78,8 +78,10 @@ struct impr_type { /* General improvement accessor functions. */ Impr_type_id improvement_count(void); -Impr_type_id improvement_index(const struct impr_type *pimprove); -Impr_type_id improvement_number(const struct impr_type *pimprove); +Impr_type_id improvement_index(const struct impr_type *pimprove) + fc__attribute((nonnull(1))); +Impr_type_id improvement_number(const struct impr_type *pimprove) + fc__attribute((nonnull(1))); struct impr_type *improvement_by_number(const Impr_type_id id); @@ -145,16 +147,21 @@ const struct impr_type *improvement_replacement(const struct impr_type *pimprove #define WONDER_NOT_BUILT 0 /* Used as city id. */ #define WONDER_BUILT(city_id) ((city_id) > 0) -void wonder_built(const struct city *pcity, const struct impr_type *pimprove); +void wonder_built(const struct city *pcity, const struct impr_type *pimprove) + fc__attribute((nonnull(1))); void wonder_destroyed(const struct city *pcity, - const struct impr_type *pimprove); + const struct impr_type *pimprove) + fc__attribute((nonnull(1))); bool wonder_is_lost(const struct player *pplayer, - const struct impr_type *pimprove); + const struct impr_type *pimprove) + fc__attribute((nonnull(1))); bool wonder_is_built(const struct player *pplayer, - const struct impr_type *pimprove); + const struct impr_type *pimprove) + fc__attribute((nonnull(1))); struct city *city_from_wonder(const struct player *pplayer, - const struct impr_type *pimprove); + const struct impr_type *pimprove) + fc__attribute((nonnull(1))); bool wonder_visible_to_player(const struct impr_type *wonder, const struct player *pplayer, const struct player *owner, -- 2.51.0