From 00160a426e48e9c5b7816f4c87c0b38877dbcc6c Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sun, 2 Aug 2026 07:52:53 +0300 Subject: [PATCH 43/43] rscompat.c: Replace NULL with nullptr See RM #2109 Signed-off-by: Marko Lindqvist --- server/ruleset/rscompat.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/server/ruleset/rscompat.c b/server/ruleset/rscompat.c index 36b478e3ec..8d3853b9ce 100644 --- a/server/ruleset/rscompat.c +++ b/server/ruleset/rscompat.c @@ -77,7 +77,7 @@ int rscompat_check_capabilities(struct section_file *file, if (!(datafile_options = secfile_lookup_str(file, "datafile.options"))) { log_fatal("\"%s\": ruleset capability problem:", filename); - ruleset_error(NULL, LOG_ERROR, "%s", secfile_error()); + ruleset_error(nullptr, LOG_ERROR, "%s", secfile_error()); return 0; } @@ -98,7 +98,7 @@ int rscompat_check_capabilities(struct section_file *file, log_fatal("\"%s\": ruleset datafile appears incompatible:", filename); log_fatal(" datafile options: %s", datafile_options); log_fatal(" supported options: %s", RULESET_CAPABILITIES); - ruleset_error(NULL, LOG_ERROR, "Capability problem"); + ruleset_error(nullptr, LOG_ERROR, "Capability problem"); return 0; } @@ -107,7 +107,7 @@ int rscompat_check_capabilities(struct section_file *file, " that we don't support:", filename); log_fatal(" datafile options: %s", datafile_options); log_fatal(" supported options: %s", RULESET_CAPABILITIES); - ruleset_error(NULL, LOG_ERROR, "Capability problem"); + ruleset_error(nullptr, LOG_ERROR, "Capability problem"); return 0; } @@ -115,12 +115,12 @@ int rscompat_check_capabilities(struct section_file *file, if (!secfile_lookup_int(file, &format, "datafile.format_version")) { log_error("\"%s\": lacking legal format_version field", filename); - ruleset_error(NULL, LOG_ERROR, "%s", secfile_error()); + ruleset_error(nullptr, LOG_ERROR, "%s", secfile_error()); return 0; } else if (format == 0) { log_error("\"%s\": Illegal format_version value", filename); - ruleset_error(NULL, LOG_ERROR, "Format version error"); + ruleset_error(nullptr, LOG_ERROR, "Format version error"); } return format; @@ -151,7 +151,7 @@ bool rscompat_check_cap_and_version(struct section_file *file, " other ruleset datafile(s):", filename); log_fatal(" datafile format version: %d", format_version); log_fatal(" expected format version: %d", info->version); - ruleset_error(NULL, LOG_ERROR, "Inconsistent format versions"); + ruleset_error(nullptr, LOG_ERROR, "Inconsistent format versions"); return FALSE; } @@ -176,7 +176,7 @@ rscompat_enabler_add_obligatory_hard_reqs(struct action_enabler *ae) * the beginning. */ bool needs_restart = FALSE; - while ((problem = action_enabler_suggest_repair(ae)) != NULL) { + while ((problem = action_enabler_suggest_repair(ae)) != nullptr) { /* A hard obligatory requirement is missing. */ int i; @@ -538,7 +538,7 @@ static int first_free_unit_type_user_flag(void) /* Find the first unused user defined unit type flag. */ for (flag = 0; flag < MAX_NUM_USER_UNIT_FLAGS; flag++) { - if (unit_type_flag_id_name_cb(flag + UTYF_USER_FLAG_1) == NULL) { + if (unit_type_flag_id_name_cb(flag + UTYF_USER_FLAG_1) == nullptr) { return flag; } } -- 2.53.0