silence warning

OSGeo · Jan 20, 2022 · f2e6296 · f2e6296
1 parent aa97abb
commit f2e6296
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/gcore/gdalabstractbandblockcache.cpp b/gcore/gdalabstractbandblockcache.cpp
@@ -60,11 +60,13 @@ bool CPL_STDCALL
 ApplyCacheHelperFlushHandler( const GDALDataset* currentDataset, const GDALDataset* datasetThatCouldBeFlushed, void* cacheManager)
 {
     bool result = false;
-    if( pfnCacheFlushHelperHandler != nullptr ) //quick test to avoid locking
+    volatile GDALCacheFlushHelperHandler* pPfnCacheFlushHelperHandler = &pfnCacheFlushHelperHandler;//to avoid compiler warning about "inner-if" always true
+    if(pPfnCacheFlushHelperHandler != nullptr ) //quick test to avoid locking
     {
         CPLMutexHolderD( &hCacheHelperMutex );
-        if( pfnCacheFlushHelperHandler != nullptr )
-            result = pfnCacheFlushHelperHandler(currentDataset, datasetThatCouldBeFlushed, cacheManager, pCacheFlushHelperHandlerUserData);
+        GDALCacheFlushHelperHandler _pfnCacheFlushHelperHandler = *pPfnCacheFlushHelperHandler;
+        if( _pfnCacheFlushHelperHandler != nullptr )
+            result = _pfnCacheFlushHelperHandler(currentDataset, datasetThatCouldBeFlushed, cacheManager, pCacheFlushHelperHandlerUserData);
     }
     return result;
 }