[io] Remove duplicate code in TMemFile::ResetAfterMerge()

silverweed · silverweed · commit b50466052928 · 2025-12-03T15:38:19.000+01:00
diff --git a/io/io/src/TMemFile.cxx b/io/io/src/TMemFile.cxx
@@ -348,11 +348,6 @@ void TMemFile::ResetAfterMerge(TFileMergeInfo *info)
    fCacheRead    = 0;
    fCacheWrite   = 0;
    fReadCalls    = 0;
-   if (fFree) {
-      fFree->Delete();
-      delete fFree;
-      fFree = nullptr;
-   }
 
    fSysOffset   = 0;
    fBlockSeek   = &fBlockList;
@@ -375,7 +370,6 @@ void TMemFile::ResetAfterMerge(TFileMergeInfo *info)
             ((TDirectoryFile*)idcur)->ResetAfterMerge(info);
          }
       }
-
    }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -348,11 +348,6 @@ void TMemFile::ResetAfterMerge(TFileMergeInfo *info)`
`348`	`348`	`fCacheRead = 0;`
`349`	`349`	`fCacheWrite = 0;`
`350`	`350`	`fReadCalls = 0;`
`351`		`- if (fFree) {`
`352`		`- fFree->Delete();`
`353`		`- delete fFree;`
`354`		`- fFree = nullptr;`
`355`		`- }`
`356`	`351`
`357`	`352`	`fSysOffset = 0;`
`358`	`353`	`fBlockSeek = &fBlockList;`
`@@ -375,7 +370,6 @@ void TMemFile::ResetAfterMerge(TFileMergeInfo *info)`
`375`	`370`	`((TDirectoryFile*)idcur)->ResetAfterMerge(info);`
`376`	`371`	`}`
`377`	`372`	`}`
`378`		`-`
`379`	`373`	`}`
`380`	`374`	`}`
`381`	`375`