Fix some compiler warnings in irrlicht (#5144)

- Avoid dereferencing null pointer - Remove some unused variables
supertuxkart · Aug 11, 2024 · 386ac8f · 386ac8f
1 parent 427455a
commit 386ac8f
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 17 deletions.
diff --git a/lib/irrlicht/source/Irrlicht/CGUIContextMenu.cpp b/lib/irrlicht/source/Irrlicht/CGUIContextMenu.cpp
@@ -531,7 +531,6 @@ void CGUIContextMenu::draw()
 	// loop through all menu items
 
 	rect = AbsoluteRect;
-	s32 y = AbsoluteRect.UpperLeftCorner.Y;
 
 	for (s32 i=0; i<(s32)Items.size(); ++i)
 	{
@@ -549,7 +548,6 @@ void CGUIContextMenu::draw()
 			rect.UpperLeftCorner.Y += 1;
 			skin->draw2DRectangle(this, skin->getColor(EGDC_3D_HIGH_LIGHT), rect, clip);
 
-			y += 10;
 		}
 		else
 		{

diff --git a/lib/irrlicht/source/Irrlicht/CIrrDeviceSDL.cpp b/lib/irrlicht/source/Irrlicht/CIrrDeviceSDL.cpp
@@ -152,6 +152,8 @@ CIrrDeviceSDL::CIrrDeviceSDL(const SIrrlichtCreationParameters& param)
 #endif
 #ifdef ANDROID
 			Android_initDisplayCutout(&TopPadding, &BottomPadding, &LeftPadding, &RightPadding, &InitialOrientation);
+#else
+                        (void)InitialOrientation;
 #endif
 			core::stringc sdlversion = "Compiled SDL Version ";
 			sdlversion += Info.version.major;

diff --git a/lib/irrlicht/source/Irrlicht/CMeshManipulator.cpp b/lib/irrlicht/source/Irrlicht/CMeshManipulator.cpp
@@ -1493,7 +1493,6 @@ IMesh* CMeshManipulator::createForsythOptimizedMesh(const IMesh *mesh) const
 
 				// Main algorithm
 				u32 highest = 0;
-				u32 drawcalls = 0;
 				for (;;)
 				{
 					if (tc[highest].drawn)
@@ -1582,7 +1581,6 @@ IMesh* CMeshManipulator::createForsythOptimizedMesh(const IMesh *mesh) const
 					lru.add(tc[highest].ind[0]);
 					lru.add(tc[highest].ind[1]);
 					highest = lru.add(tc[highest].ind[2], true);
-					drawcalls++;
 				}
 
 				buf->setBoundingBox(mb->getBoundingBox());
@@ -1605,7 +1603,6 @@ IMesh* CMeshManipulator::createForsythOptimizedMesh(const IMesh *mesh) const
 
 				// Main algorithm
 				u32 highest = 0;
-				u32 drawcalls = 0;
 				for (;;)
 				{
 					if (tc[highest].drawn)
@@ -1694,7 +1691,6 @@ IMesh* CMeshManipulator::createForsythOptimizedMesh(const IMesh *mesh) const
 					lru.add(tc[highest].ind[0]);
 					lru.add(tc[highest].ind[1]);
 					highest = lru.add(tc[highest].ind[2]);
-					drawcalls++;
 				}
 
 				buf->setBoundingBox(mb->getBoundingBox());
@@ -1718,7 +1714,6 @@ IMesh* CMeshManipulator::createForsythOptimizedMesh(const IMesh *mesh) const
 
 				// Main algorithm
 				u32 highest = 0;
-				u32 drawcalls = 0;
 				for (;;)
 				{
 					if (tc[highest].drawn)
@@ -1807,7 +1802,6 @@ IMesh* CMeshManipulator::createForsythOptimizedMesh(const IMesh *mesh) const
 					lru.add(tc[highest].ind[0]);
 					lru.add(tc[highest].ind[1]);
 					highest = lru.add(tc[highest].ind[2]);
-					drawcalls++;
 				}
 
 				buf->setBoundingBox(mb->getBoundingBox());

diff --git a/lib/irrlicht/source/Irrlicht/CNullDriver.cpp b/lib/irrlicht/source/Irrlicht/CNullDriver.cpp
@@ -947,8 +947,9 @@ const SLight& CNullDriver::getDynamicLight(u32 idx) const
 {
 	if ( idx < Lights.size() )
 		return Lights[idx];
-	else
-		return *((SLight*)0);
+        static const SLight defaultLight;
+        os::Printer::log("Error: CNullDriver::getDynamicLight was invoked with an invalid index.", ELL_ERROR);
+        return defaultLight;
 }
 
 

diff --git a/lib/irrlicht/source/Irrlicht/COSOperator.cpp b/lib/irrlicht/source/Irrlicht/COSOperator.cpp
@@ -31,15 +31,15 @@ namespace irr
 {
 
 // constructor  linux
-	COSOperator::COSOperator(const core::stringc& osVersion, IrrlichtDevice* device)
-: OperatingSystem(osVersion), IrrDevice(device)
+   COSOperator::COSOperator(const core::stringc& osVersion, IrrlichtDevice* /*device*/)
+: OperatingSystem(osVersion)
 {
 }
 
 
 // constructor
 COSOperator::COSOperator(const core::stringc& osVersion) 
-: OperatingSystem(osVersion), IrrDevice(NULL)
+: OperatingSystem(osVersion)
 {
 	#ifdef _DEBUG
 	setDebugName("COSOperator");

diff --git a/lib/irrlicht/source/Irrlicht/COSOperator.h b/lib/irrlicht/source/Irrlicht/COSOperator.h
@@ -42,7 +42,6 @@ class COSOperator : public IOSOperator
 private:
 
 	core::stringc OperatingSystem;
-    IrrlichtDevice* IrrDevice;
 
 };
 

diff --git a/lib/irrlicht/source/Irrlicht/CSceneManager.cpp b/lib/irrlicht/source/Irrlicht/CSceneManager.cpp
@@ -906,8 +906,12 @@ const core::aabbox3d<f32>& CSceneManager::getBoundingBox() const
 {
 	_IRR_DEBUG_BREAK_IF(true) // Bounding Box of Scene Manager wanted.
 
-	// should never be used.
-	return *((core::aabbox3d<f32>*)0);
+        os::Printer::log("Unexpected call to CSceneManager::getBoundingBox()", ELL_ERROR);
+        // Static default bounding box to return in case this function is called unexpectedly
+        static const core::aabbox3d<f32> defaultBox;
+
+        // Should never be used, but we return a safe reference instead of dereferencing a null pointer.
+        return defaultBox;
 }
 
 

diff --git a/lib/irrlicht/source/Irrlicht/os.cpp b/lib/irrlicht/source/Irrlicht/os.cpp
@@ -236,7 +236,7 @@ namespace os
 	//! generates a pseudo random number
 	f32 Randomizer::frand()
 	{
-		return rand()*(1.f/rMax);
+           return rand()*(1.f/static_cast<f32>(rMax));
 	}
 
 	s32 Randomizer::randMax()