From e766b4d41de5c7d234bc1b694bd3c4a19396b7c4 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Fri, 1 May 2026 15:36:48 +0300 Subject: [PATCH 32/32] events.c: Replace NULL with nullptr See RM #2009 Signed-off-by: Marko Lindqvist --- common/events.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/common/events.c b/common/events.c index 7a06840f87..92a186436d 100644 --- a/common/events.c +++ b/common/events.c @@ -62,10 +62,11 @@ static const char *event_sections[] = { /* TRANS: "Vote" as a process */ N_("Vote: %s"), N_("Wonder: %s"), - NULL + nullptr }; -#define GEN_EV(event, section, descr) { #event, NULL, section, descr, NULL, event } +#define GEN_EV(event, section, descr) \ + { #event, nullptr, section, descr, nullptr, event } /* * Holds information about all event types. The entries don't have @@ -246,7 +247,7 @@ enum event_type sorted_events[E_COUNT]; **************************************************************************/ const char *get_event_message_text(enum event_type event) { - fc_assert_ret_val(event_type_is_valid(event), NULL); + fc_assert_ret_val(event_type_is_valid(event), nullptr); if (events[event_to_index[event]].event == event) { return events[event_to_index[event]].full_descr; @@ -275,14 +276,14 @@ static int compar_event_message_texts(const void *i1, const void *i2) **************************************************************************/ const char *get_event_tag(enum event_type event) { - fc_assert_ret_val(event_type_is_valid(event), NULL); + fc_assert_ret_val(event_type_is_valid(event), nullptr); if (events[event_to_index[event]].event == event) { return events[event_to_index[event]].tag_name; } - log_error("unknown event %d", event); + log_error("Unknown event %d", event); - return NULL; + return nullptr; } /**********************************************************************//** @@ -380,6 +381,6 @@ void events_free(void) for (i = 0; i <= event_type_max(); i++) { free(events[i].full_descr); - events[i].full_descr = NULL; + events[i].full_descr = nullptr; } } -- 2.53.0