Remove unnecessary nullptr checks. (#807)

Fixes #671.
KhronosGroup · Nov 29, 2023 · 072a4eb · 072a4eb
1 parent 26d7d3f
commit 072a4eb
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 26 deletions.
diff --git a/tests/loadtests/glloadtests/GLLoadTests.cpp b/tests/loadtests/glloadtests/GLLoadTests.cpp
@@ -35,9 +35,7 @@ GLLoadTests::GLLoadTests(const sampleInvocation samples[],
 
 GLLoadTests::~GLLoadTests()
 {
-    if (pCurSample != nullptr) {
-        delete pCurSample;
-    }
+    delete pCurSample;
 }
 
 bool
@@ -61,9 +59,7 @@ GLLoadTests::initialize(Args& args)
 void
 GLLoadTests::finalize()
 {
-    if (pCurSample != nullptr) {
-        delete pCurSample;
-    }
+    delete pCurSample;
     GLAppSDL::finalize();
 }
 
@@ -181,13 +177,11 @@ GLLoadTests::invokeSample(Direction dir)
 {
     const sampleInvocation* sampleInv = &siSamples[sampleIndex];
 
-    if (pCurSample != nullptr) {
-        delete pCurSample;
-        // Certain events can be triggered during new sample initialization
-        // while pCurSample is not valid, e.g. FOCUS_LOST. Protect against
-        // problems from this by indicating there is no current sample.
-        pCurSample = nullptr;
-    }
+    delete pCurSample;
+    // Certain events can be triggered during new sample initialization
+    // while pCurSample is not valid, e.g. FOCUS_LOST. Protect against
+    // problems from this by indicating there is no current sample.
+    pCurSample = nullptr;
 
     uint32_t unsupportedTypeExceptions = 0;
     std::string fileTitle;

diff --git a/tests/loadtests/vkloadtests/InstancedSampleBase.cpp b/tests/loadtests/vkloadtests/InstancedSampleBase.cpp
@@ -267,8 +267,7 @@ InstancedSampleBase::cleanup()
     quad.freeResources(vkctx.device);
     uniformDataVS.freeResources(vkctx.device);
 
-    if (uboVS.instance != nullptr)
-        delete[] uboVS.instance;
+    delete[] uboVS.instance;
 }
 
 void

diff --git a/tests/loadtests/vkloadtests/VulkanLoadTests.cpp b/tests/loadtests/vkloadtests/VulkanLoadTests.cpp
@@ -48,9 +48,7 @@ VulkanLoadTests::VulkanLoadTests(const sampleInvocation samples[],
 
 VulkanLoadTests::~VulkanLoadTests()
 {
-    if (pCurSample != nullptr) {
-        delete pCurSample;
-    }
+    delete pCurSample;
 }
 
 bool
@@ -73,9 +71,7 @@ VulkanLoadTests::initialize(Args& args)
 void
 VulkanLoadTests::finalize()
 {
-    if (pCurSample != nullptr) {
-        delete pCurSample;
-    }
+    delete pCurSample;
     VulkanAppSDL::finalize();
 }
 

diff --git a/tests/texturetests/texturetests.cc b/tests/texturetests/texturetests.cc
@@ -1,4 +1,4 @@
-/* -*- tab-width: 4; -*- */
+/* -*- tab-width: 4; -*- */
 /* vi: set sw=2 ts=4 expandtab: */
 
 /**
@@ -288,7 +288,7 @@ class ktxTextureTestBase : public ::testing::Test {
     }
 
     ~ktxTextureTestBase() {
-        if (ktxMemFile != NULL) delete ktxMemFile;
+        delete ktxMemFile;
     }
 
     KTX_error_code

diff --git a/tools/ktx2check/ktx2check.cpp b/tools/ktx2check/ktx2check.cpp
@@ -647,8 +647,8 @@ class ktxValidator : public ktxApp {
         }
 
         ~validationContext() {
-            if (pDfd4Format != nullptr) delete pDfd4Format;
-            if (pActualDfd != nullptr) delete pActualDfd;
+            delete pDfd4Format;
+            delete pActualDfd;
         }
 
         size_t kvDataEndOffset() {
@@ -793,7 +793,7 @@ class ktxValidator : public ktxApp {
         }
 
         void init(istream* is) {
-            if (pDfd4Format != nullptr) delete pDfd4Format;
+            delete pDfd4Format;
             inp = is;
             dataSizeFromLevelIndex = 0;
         }