From 68f83b40e7150eab8c8760722e1b091a252639cb Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sun, 30 Nov 2025 08:06:10 +0200 Subject: [PATCH 50/50] requirements.c: Replace NULL with nullptr See RM #1789 Signed-off-by: Marko Lindqvist --- common/requirements.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/common/requirements.c b/common/requirements.c index 195dd49380..f1d4361e2b 100644 --- a/common/requirements.c +++ b/common/requirements.c @@ -2158,7 +2158,7 @@ bool are_requirements_contradictions(const struct requirement *req1, /**********************************************************************//** Returns the first requirement in the specified requirement vector that - contradicts the specified requirement or NULL if no contradiction was + contradicts the specified requirement or nullptr if no contradiction was detected. @param req the requirement that may contradict the vector @param vec the requirement vector to look in @@ -6707,7 +6707,7 @@ bool is_req_active(const struct req_context *context, const struct civ_map *nmap = &(wld.map); enum fc_tristate eval; fc_thread_id self = fc_thread_self(); - struct thr_req_data *trdata = NULL; + struct thr_req_data *trdata = nullptr; fc_mutex_allocate(&trmutex); thr_req_data_list_iterate(trdatas, data) { @@ -6716,7 +6716,7 @@ bool is_req_active(const struct req_context *context, } } thr_req_data_list_iterate_end; - if (trdata == NULL) { + if (trdata == nullptr) { trdata = fc_malloc(sizeof(struct thr_req_data)); trdata->thr_id = self; thr_req_data_list_append(trdatas, trdata); -- 2.51.0