Feature #2109 ยป 0043-rscompat.c-Replace-NULL-with-nullptr.patch
| server/ruleset/rscompat.c | ||
|---|---|---|
|
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;
|
||
|
}
|
||
| ... | ... | |
|
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;
|
||
|
}
|
||
| ... | ... | |
|
" 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;
|
||
|
}
|
||
| ... | ... | |
|
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;
|
||
| ... | ... | |
|
" 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;
|
||
|
}
|
||
| ... | ... | |
|
* 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;
|
||
| ... | ... | |
|
/* 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;
|
||
|
}
|
||
|
}
|
||