Fix JUT_ASSERT and several other macros (#2711)

* Fix JUT_ASSERT to be a nested define

* Switch names that appear in asserts to be constants instead of defines

* Replace `0` in asserts with `NULL` or `FALSE`

* Fix fpclassify

* Fix ARRAY_SIZE

* Use G_CM3D_F_INF

* More fixes for fpclassify

* Remove FLOAT_LABEL

* Remove incorrect FLAG_ON macro

* Remove UNK_BSS macro

* Silence clangd unused header warning for PCH
This commit is contained in:
LagoLunatic
2025-09-28 16:11:07 -04:00
committed by GitHub
parent 737250d7f5
commit 6ec6fce8cb
1008 changed files with 3172 additions and 3237 deletions
+2 -2
View File
@@ -36,8 +36,8 @@ struct TControl {
}
int setMessageCode_inReset_(const TProcessor* pProcessor, u16 u16GroupID, u16 u16Index) {
JUT_ASSERT(138, pEntry_==0);
JUT_ASSERT(139, pszText_update_current_==0);
JUT_ASSERT(138, pEntry_==NULL);
JUT_ASSERT(139, pszText_update_current_==NULL);
JUT_ASSERT(140, oStack_renderingProcessor_.empty());
if (!setMessageCode_inSequence_(pProcessor, u16GroupID, u16Index)) {
+4 -4
View File
@@ -20,7 +20,7 @@ struct TReference {
/* 802A7B40 */ virtual const char* do_word(u32) const;
int on_parseCharacter(const char** ppszText) const {
JUT_ASSERT(97, pcResource_!=0);
JUT_ASSERT(97, pcResource_!=NULL);
return pcResource_->parseCharacter(ppszText);
}
@@ -46,7 +46,7 @@ struct TProcessor {
pResourceCache_(NULL),
pszCurrent_(NULL)
{
JUT_ASSERT(584, pReference_!=0);
JUT_ASSERT(584, pReference_!=NULL);
}
typedef bool (*pfnProcess_func)(TProcessor*);
@@ -175,7 +175,7 @@ struct TProcessor {
void on_character(int iCharacter) { do_character(iCharacter); }
const char* on_message_limited(u16 u16Index) const {
JUT_ASSERT(482, pResourceCache_!=0);
JUT_ASSERT(482, pResourceCache_!=NULL);
return pResourceCache_->getMessageText_messageIndex(u16Index);
}
@@ -190,7 +190,7 @@ struct TProcessor {
}
int setBegin_messageEntryText(const TProcessor* pProcessor, const void* pEntry, const char* pszText) {
JUT_ASSERT(306, pProcessor!=0);
JUT_ASSERT(306, pProcessor!=NULL);
setBegin_messageEntryText(pProcessor->getResourceCache(), pEntry, pszText);
return 1;
}
+2 -2
View File
@@ -41,7 +41,7 @@ struct TResource {
}
char* getMessageText_messageEntry(const void* pEntry) const {
JUT_ASSERT(141, pEntry!=0);
JUT_ASSERT(141, pEntry!=NULL);
return pMessageText_ + *(int*)pEntry;
}
@@ -124,7 +124,7 @@ struct TResourceContainer {
/* 802A90F0 */ void setEncoding_(u8 e);
int parseCharacter(const char** ppszText) const {
JUT_ASSERT(330, pfnParseCharacter_!=0);
JUT_ASSERT(330, pfnParseCharacter_!=NULL);
return pfnParseCharacter_(ppszText);
}