Fix all -Wconversion-null warnings

This commit is contained in:
Luke Street
2026-02-28 15:59:24 -07:00
parent c786f40a23
commit 0631cfe894
54 changed files with 108 additions and 100 deletions
+1 -1
View File
@@ -917,7 +917,7 @@ JUTTexture* J2DPictureEx::getTexture(u8 param_0) const {
u8 J2DPictureEx::getTextureCount() const {
if (mMaterial == NULL) {
return NULL;
return 0;
}
return mMaterial->getTexGenBlock()->getTexGenNum();
+1 -1
View File
@@ -227,7 +227,7 @@ void J3DShape::makeVtxArrayCmd() {
if (array[i] != 0)
GDSetArray((GXAttr)(i + GX_VA_POS), array[i], stride[i]);
else
GDSetArrayRaw((GXAttr)(i + GX_VA_POS), NULL, stride[i]);
GDSetArrayRaw((GXAttr)(i + GX_VA_POS), 0, stride[i]);
}
}
+1 -1
View File
@@ -42,7 +42,7 @@ JASWaveArc* JASSimpleWaveBank::getWaveArc(u32 no) {
int JASSimpleWaveBank::TWaveHandle::getWavePtr() const {
void* base = mHeap->getBase();
if (base == NULL) {
return NULL;
return 0;
}
return (intptr_t)base + mWaveInfo.field_0x08;
}
+1 -1
View File
@@ -40,7 +40,7 @@ namespace {
field_0x4 = stack_14.getNumFiles();
field_0x8 = new s32[field_0x4];
if (!field_0x8) {
field_0x4 = NULL;
field_0x4 = 0;
return;
}
for (u32 i = 0; i < field_0x4; i++) {
+1 -1
View File
@@ -69,7 +69,7 @@ JKRAram::JKRAram(u32 audio_buffer_size, u32 audio_graph_size, s32 priority)
if (mAramMemorySize) {
mAramMemoryPtr = ARAlloc(mAramMemorySize);
} else {
mAramMemoryPtr = NULL;
mAramMemoryPtr = 0;
}
OS_REPORT("ARAM audio area %08x: %08x\n", mAudioMemoryPtr, mAudioMemorySize);
+1 -1
View File
@@ -192,7 +192,7 @@ u32 JKRFileCache::readResource(void* dst, u32 dstLength, u32, const char* path)
if (findFile(finalPath, path)) {
return readResource(dst, dstLength, filePath);
}
return NULL;
return 0;
}
void JKRFileCache::removeResourceAll(void) {
+1 -1
View File
@@ -73,7 +73,7 @@ void JKRThread::setCommon_mesgQueue(JKRHeap* heap, int message_count) {
sThreadList.append(&mThreadListLink);
mCurrentHeap = NULL;
mCurrentHeapError = NULL;
mCurrentHeapError = 0;
}
void JKRThread::setCommon_heapSpecified(JKRHeap* heap, u32 stack_size, int param_3) {
+1 -1
View File
@@ -39,7 +39,7 @@ void JPABaseEmitter::init(JPAEmitterManager* param_0, JPAResource* param_1) {
mGlobalPrmClr.r = mGlobalPrmClr.g = mGlobalPrmClr.b = mGlobalPrmClr.a = mGlobalEnvClr.r = mGlobalEnvClr.g = mGlobalEnvClr.b = mGlobalEnvClr.a = 0xff;
param_1->getBsp()->getPrmClr(&mPrmClr);
param_1->getBsp()->getEnvClr(&mEnvClr);
mpUserWork = NULL;
mpUserWork = 0;
mScaleOut = 1.0f;
mEmitCount = 0.0f;
initStatus(0x30);