typo and minor optimization

OSGeo · Nov 19, 2021 · 88467ca · 88467ca
1 parent 7915151
commit 88467ca
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/gcore/gdalabstractbandblockcache.cpp b/gcore/gdalabstractbandblockcache.cpp
@@ -74,7 +74,7 @@ ApplyCacheHelperFlushHandler( const GDALDataset* currentDataset, const GDALDatas
 *
 * @param pfnCacheHelperHandlerNew new GDALCacheFlushHelperHandler, can be 0 to set none
 * @param cacheManager unused for now, just in case in the future a cache redesign could allow several cache block pools
-* @param pUserData custom use data, that must be remain valid until the handler is uninstalled
+* @param pUserData custom user data, that must remain valid until the handler is uninstalled
 * @return the previous GDALCacheFlushHelperHandler
 */
 

diff --git a/gcore/gdalrasterblock.cpp b/gcore/gdalrasterblock.cpp
@@ -989,9 +989,10 @@ CPLErr GDALRasterBlock::Internalize()
                     }
                     else if (nDisableDirtyBlockFlushCounter == 0)
                     {
-                        GDALDataset* otherDataset = poTarget->poBand->GetDataset();
-                        const bool canFlushOtherDataset = ApplyCacheHelperFlushHandler(poThisDS, otherDataset, 0);
-                        if( (poTarget->poBand->GetDataset() == poThisDS ) || canFlushOtherDataset)
+                        GDALDataset* targetDataset = poTarget->poBand->GetDataset();
+                        const bool isSameDataset = (targetDataset == poThisDS);
+                        const bool canFlushTargetDataset = isSameDataset || ApplyCacheHelperFlushHandler(poThisDS, targetDataset, 0);
+                        if( canFlushTargetDataset )
                         {
                             if( CPLAtomicCompareAndExchange(
                                     &(poTarget->nLockCount), 0, -1) )