diff options
-rw-r--r-- | src/flatfile.h | 7 | ||||
-rw-r--r-- | src/index/disktxpos.h | 12 | ||||
-rw-r--r-- | src/test/flatfile_tests.cpp | 3 | ||||
-rw-r--r-- | src/test/fuzz/flatfile.cpp | 2 |
4 files changed, 8 insertions, 16 deletions
diff --git a/src/flatfile.h b/src/flatfile.h index 04f6373a24..e4be9a9cb1 100644 --- a/src/flatfile.h +++ b/src/flatfile.h @@ -13,12 +13,12 @@ struct FlatFilePos { - int nFile; - unsigned int nPos; + int nFile{-1}; + unsigned int nPos{0}; SERIALIZE_METHODS(FlatFilePos, obj) { READWRITE(VARINT_MODE(obj.nFile, VarIntMode::NONNEGATIVE_SIGNED), VARINT(obj.nPos)); } - FlatFilePos() : nFile(-1), nPos(0) {} + FlatFilePos() {} FlatFilePos(int nFileIn, unsigned int nPosIn) : nFile(nFileIn), @@ -33,7 +33,6 @@ struct FlatFilePos return !(a == b); } - void SetNull() { nFile = -1; nPos = 0; } bool IsNull() const { return (nFile == -1); } std::string ToString() const; diff --git a/src/index/disktxpos.h b/src/index/disktxpos.h index 3166053226..7718755b78 100644 --- a/src/index/disktxpos.h +++ b/src/index/disktxpos.h @@ -10,7 +10,7 @@ struct CDiskTxPos : public FlatFilePos { - unsigned int nTxOffset; // after header + unsigned int nTxOffset{0}; // after header SERIALIZE_METHODS(CDiskTxPos, obj) { @@ -21,15 +21,7 @@ struct CDiskTxPos : public FlatFilePos CDiskTxPos(const FlatFilePos &blockIn, unsigned int nTxOffsetIn) : FlatFilePos(blockIn.nFile, blockIn.nPos), nTxOffset(nTxOffsetIn) { } - CDiskTxPos() { - SetNull(); - } - - void SetNull() { - FlatFilePos::SetNull(); - nTxOffset = 0; - } + CDiskTxPos() {} }; - #endif // BITCOIN_INDEX_DISKTXPOS_H diff --git a/src/test/flatfile_tests.cpp b/src/test/flatfile_tests.cpp index 9931d19c2b..54c30ed314 100644 --- a/src/test/flatfile_tests.cpp +++ b/src/test/flatfile_tests.cpp @@ -23,6 +23,9 @@ BOOST_AUTO_TEST_CASE(flatfile_filename) FlatFileSeq seq2(data_dir / "a", "b", 16 * 1024); BOOST_CHECK_EQUAL(seq2.FileName(pos), data_dir / "a" / "b00456.dat"); + + // Check default constructor IsNull + assert(FlatFilePos{}.IsNull()); } BOOST_AUTO_TEST_CASE(flatfile_open) diff --git a/src/test/fuzz/flatfile.cpp b/src/test/fuzz/flatfile.cpp index d142e374b1..b5c82c14b4 100644 --- a/src/test/fuzz/flatfile.cpp +++ b/src/test/fuzz/flatfile.cpp @@ -25,6 +25,4 @@ FUZZ_TARGET(flatfile) assert((*flat_file_pos == *another_flat_file_pos) != (*flat_file_pos != *another_flat_file_pos)); } (void)flat_file_pos->ToString(); - flat_file_pos->SetNull(); - assert(flat_file_pos->IsNull()); } |