From 20945d71db2f93909af751a10541837cef0a3edf Mon Sep 17 00:00:00 2001 From: Aleos Date: Wed, 20 May 2020 18:09:44 -0400 Subject: [PATCH] Removes nullpo checks from CSV2YAML (#4979) * Fixes #4791. * Removes two nullpo checks from CSV2YAML. * Fixes undefined reference compile errors. Thanks to @ecdarreola! --- src/tool/csv2yaml.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/tool/csv2yaml.cpp b/src/tool/csv2yaml.cpp index 729f891678..5aa379cafd 100644 --- a/src/tool/csv2yaml.cpp +++ b/src/tool/csv2yaml.cpp @@ -150,7 +150,8 @@ void script_set_constant_( const char* name, int64 value, const char* constant_n } const char* constant_lookup( int32 value, const char* prefix ){ - nullpo_retr( nullptr, prefix ); + if (prefix == nullptr) + return nullptr; for( auto const& pair : constants ){ // Same prefix group and same value @@ -163,7 +164,8 @@ const char* constant_lookup( int32 value, const char* prefix ){ } int64 constant_lookup_int(const char* constant) { - nullpo_retr(-100, constant); + if (constant == nullptr) + return -100; for (auto const &pair : constants) { if (strlen(pair.first) == strlen(constant) && strncasecmp(pair.first, constant, strlen(constant)) == 0) {