foster/bitcoin-bitcoin-core
0
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-02-03 09:56:38 -05:00
Code Issues Activity

Refactor: Remove unused FlatFilePos::SetNull

Browse source
This commit is contained in:
MarcoFalke 2023-03-21 13:54:51 +01:00
parent 40e1c4d402
commit fa67b8181c
No known key found for this signature in database
4 changed files with 8 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/flatfile.h
View file

@ -13,12 +13,12 @@
struct FlatFilePos struct FlatFilePos
{ {
int nFile; int nFile{-1};
unsigned int nPos; unsigned int nPos{0};
SERIALIZE_METHODS(FlatFilePos, obj) { READWRITE(VARINT_MODE(obj.nFile, VarIntMode::NONNEGATIVE_SIGNED), VARINT(obj.nPos)); } 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) : FlatFilePos(int nFileIn, unsigned int nPosIn) :
nFile(nFileIn), nFile(nFileIn),
@ -33,7 +33,6 @@ struct FlatFilePos
return !(a == b); return !(a == b);
} }
void SetNull() { nFile = -1; nPos = 0; }
bool IsNull() const { return (nFile == -1); } bool IsNull() const { return (nFile == -1); }
std::string ToString() const; std::string ToString() const;

12
src/index/disktxpos.h
View file

@ -10,7 +10,7 @@
struct CDiskTxPos : public FlatFilePos struct CDiskTxPos : public FlatFilePos
{ {
unsigned int nTxOffset; // after header unsigned int nTxOffset{0}; // after header
SERIALIZE_METHODS(CDiskTxPos, obj) 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(const FlatFilePos &blockIn, unsigned int nTxOffsetIn) : FlatFilePos(blockIn.nFile, blockIn.nPos), nTxOffset(nTxOffsetIn) {
} }
CDiskTxPos() { CDiskTxPos() {}
SetNull();
}
void SetNull() {
FlatFilePos::SetNull();
nTxOffset = 0;
}
}; };
#endif // BITCOIN_INDEX_DISKTXPOS_H #endif // BITCOIN_INDEX_DISKTXPOS_H

3
src/test/flatfile_tests.cpp
View file

@ -23,6 +23,9 @@ BOOST_AUTO_TEST_CASE(flatfile_filename)
FlatFileSeq seq2(data_dir / "a", "b", 16 * 1024); FlatFileSeq seq2(data_dir / "a", "b", 16 * 1024);
BOOST_CHECK_EQUAL(seq2.FileName(pos), data_dir / "a" / "b00456.dat"); BOOST_CHECK_EQUAL(seq2.FileName(pos), data_dir / "a" / "b00456.dat");
// Check default constructor IsNull
assert(FlatFilePos{}.IsNull());
} }
BOOST_AUTO_TEST_CASE(flatfile_open) BOOST_AUTO_TEST_CASE(flatfile_open)

2
src/test/fuzz/flatfile.cpp
View file

@ -25,6 +25,4 @@ FUZZ_TARGET(flatfile)
assert((*flat_file_pos == *another_flat_file_pos) != (*flat_file_pos != *another_flat_file_pos)); assert((*flat_file_pos == *another_flat_file_pos) != (*flat_file_pos != *another_flat_file_pos));
} }
(void)flat_file_pos->ToString(); (void)flat_file_pos->ToString();
flat_file_pos->SetNull();
assert(flat_file_pos->IsNull());
} }