Skip to content

Commit 958e1a3

Browse files
streams: Remove unused seek(size_t)
1 parent 2607c38 commit 958e1a3

File tree

2 files changed

+9
-21
lines changed

2 files changed

+9
-21
lines changed

src/streams.h

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -126,12 +126,6 @@ class CVectorWriter
126126
{
127127
return nType;
128128
}
129-
void seek(size_t nSize)
130-
{
131-
nPos += nSize;
132-
if(nPos > vchData.size())
133-
vchData.resize(nPos);
134-
}
135129
private:
136130
const int nType;
137131
const int nVersion;
@@ -158,9 +152,11 @@ class VectorReader
158152
* @param[in] pos Starting position. Vector index where reads should start.
159153
*/
160154
VectorReader(int type, int version, const std::vector<unsigned char>& data, size_t pos)
161-
: m_type(type), m_version(version), m_data(data)
155+
: m_type(type), m_version(version), m_data(data), m_pos(pos)
162156
{
163-
seek(pos);
157+
if (m_pos > m_data.size()) {
158+
throw std::ios_base::failure("VectorReader(...): end of data (m_pos > m_data.size())");
159+
}
164160
}
165161

166162
/*
@@ -203,14 +199,6 @@ class VectorReader
203199
memcpy(dst, m_data.data() + m_pos, n);
204200
m_pos = pos_next;
205201
}
206-
207-
void seek(size_t n)
208-
{
209-
m_pos += n;
210-
if (m_pos > m_data.size()) {
211-
throw std::ios_base::failure("VectorReader::seek(): end of data");
212-
}
213-
}
214202
};
215203

216204
/** Double ended buffer combining vector and stream-like interfaces.

src/test/streams_tests.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -102,15 +102,15 @@ BOOST_AUTO_TEST_CASE(streams_vector_reader)
102102
BOOST_CHECK_THROW(reader >> d, std::ios_base::failure);
103103

104104
// Read a 4 bytes as a signed int from the beginning of the buffer.
105-
reader.seek(-6);
106-
reader >> d;
105+
VectorReader new_reader(SER_NETWORK, INIT_PROTO_VERSION, vch, 0);
106+
new_reader >> d;
107107
BOOST_CHECK_EQUAL(d, 67370753); // 1,255,3,4 in little-endian base-256
108-
BOOST_CHECK_EQUAL(reader.size(), 2);
109-
BOOST_CHECK(!reader.empty());
108+
BOOST_CHECK_EQUAL(new_reader.size(), 2);
109+
BOOST_CHECK(!new_reader.empty());
110110

111111
// Reading after end of byte vector throws an error even if the reader is
112112
// not totally empty.
113-
BOOST_CHECK_THROW(reader >> d, std::ios_base::failure);
113+
BOOST_CHECK_THROW(new_reader >> d, std::ios_base::failure);
114114
}
115115

116116
BOOST_AUTO_TEST_CASE(bitstream_reader_writer)

0 commit comments

Comments
 (0)