streams: remove unused code

sipa · sipa · commit 67a3d5907683 · 2024-09-19T07:33:02.000-04:00
diff --git a/src/node/blockstorage.cpp b/src/node/blockstorage.cpp
@@ -684,10 +684,6 @@ bool BlockManager::UndoWriteToDisk(const CBlockUndo& blockundo, FlatFilePos& pos
 
     // Write undo data
     long fileOutPos = fileout.tell();
-    if (fileOutPos < 0) {
-        LogError("%s: ftell failed\n", __func__);
-        return false;
-    }
     pos.nPos = (unsigned int)fileOutPos;
     fileout << blockundo;
 
@@ -982,10 +978,6 @@ bool BlockManager::WriteBlockToDisk(const CBlock& block, FlatFilePos& pos) const
 
     // Write block
     long fileOutPos = fileout.tell();
-    if (fileOutPos < 0) {
-        LogError("%s: ftell failed\n", __func__);
-        return false;
-    }
     pos.nPos = (unsigned int)fileOutPos;
     fileout << TX_WITH_WITNESS(block);
 
diff --git a/src/node/utxo_snapshot.cpp b/src/node/utxo_snapshot.cpp
@@ -77,8 +77,6 @@ std::optional<uint256> ReadSnapshotBaseBlockhash(fs::path chaindir)
     afile.seek(0, SEEK_END);
     if (position != afile.tell()) {
         LogPrintf("[snapshot] warning: unexpected trailing data in %s\n", read_from_str);
-    } else if (afile.IsError()) {
-        LogPrintf("[snapshot] warning: i/o error reading %s\n", read_from_str);
     }
     return base_blockhash;
 }
diff --git a/src/streams.cpp b/src/streams.cpp
@@ -106,11 +106,6 @@ bool AutoFile::Commit()
     return ::FileCommit(m_file);
 }
 
-bool AutoFile::IsError()
-{
-    return ferror(m_file);
-}
-
 bool AutoFile::Truncate(unsigned size)
 {
     return ::TruncateFile(m_file, size);
diff --git a/src/streams.h b/src/streams.h
@@ -455,7 +455,6 @@ class AutoFile
     }
 
     bool Commit();
-    bool IsError();
     bool Truncate(unsigned size);
 };
 

Original file line number	Diff line number	Diff line change
`@@ -77,8 +77,6 @@ std::optional<uint256> ReadSnapshotBaseBlockhash(fs::path chaindir)`
`77`	`77`	`afile.seek(0, SEEK_END);`
`78`	`78`	`if (position != afile.tell()) {`
`79`	`79`	`LogPrintf("[snapshot] warning: unexpected trailing data in %s\n", read_from_str);`
`80`		`- } else if (afile.IsError()) {`
`81`		`- LogPrintf("[snapshot] warning: i/o error reading %s\n", read_from_str);`
`82`	`80`	`}`
`83`	`81`	`return base_blockhash;`
`84`	`82`	`}`
Original file line number	Diff line number	Diff line change
`@@ -106,11 +106,6 @@ bool AutoFile::Commit()`
`106`	`106`	`return ::FileCommit(m_file);`
`107`	`107`	`}`
`108`	`108`
`109`		`-bool AutoFile::IsError()`
`110`		`-{`
`111`		`- return ferror(m_file);`
`112`		`-}`
`113`		`-`
`114`	`109`	`bool AutoFile::Truncate(unsigned size)`
`115`	`110`	`{`
`116`	`111`	`return ::TruncateFile(m_file, size);`
Original file line number	Diff line number	Diff line change
`@@ -455,7 +455,6 @@ class AutoFile`
`455`	`455`	`}`
`456`	`456`
`457`	`457`	`bool Commit();`
`458`		`- bool IsError();`
`459`	`458`	`bool Truncate(unsigned size);`
`460`	`459`	`};`
`461`	`460`