Skip to content

Commit e8c7802

Browse files
authored
Remove size_t argument from readSome (#321)
* Remove size_t argument from readSome * Removed unused function ambigousSize
1 parent b5c4efc commit e8c7802

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+43
-106
lines changed

example/02-kademlia/rendezvous_chat.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ class Session : public std::enable_shared_from_this<Session> {
4747

4848
stream_->readSome(
4949
*incoming_,
50-
incoming_->size(),
5150
[self = shared_from_this()](outcome::result<size_t> result) {
5251
if (not result) {
5352
self->close();

include/libp2p/basic/read.hpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ namespace libp2p {
1818
// read some bytes
1919
reader->readSome(
2020
out,
21-
out.size(),
2221
[weak{std::weak_ptr{reader}}, out, cb{std::move(cb)}](
2322
outcome::result<size_t> n_res) mutable {
2423
if (n_res.has_error()) {

include/libp2p/basic/reader.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ namespace libp2p::basic {
3232
* pointer, or having buffer as part of some class/struct, and using
3333
* enable_shared_from_this()
3434
*/
35-
virtual void readSome(BytesOut out, size_t bytes, ReadCallbackFunc cb) = 0;
35+
virtual void readSome(BytesOut out, ReadCallbackFunc cb) = 0;
3636

3737
/**
3838
* @brief Defers reporting result or error to callback to avoid reentrancy

include/libp2p/common/ambigous_size.hpp

Lines changed: 0 additions & 20 deletions
This file was deleted.

include/libp2p/connection/as_asio_read_write.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ namespace libp2p {
6868
boost::asio::mutable_buffer,
6969
MutableBufferSequence>::first(buffers)};
7070
impl->readSome(
71-
asioBuffer(buffer), buffer.size(), wrapCb(std::forward<Cb>(cb)));
71+
asioBuffer(buffer), wrapCb(std::forward<Cb>(cb)));
7272
}
7373

7474
template <typename ConstBufferSequence, typename Cb>

include/libp2p/connection/loopback_stream.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ namespace libp2p::connection {
4040
const override;
4141

4242
protected:
43-
void readSome(BytesOut out, size_t bytes, ReadCallbackFunc cb) override;
43+
void readSome(BytesOut out, ReadCallbackFunc cb) override;
4444

4545
void writeSome(BytesIn in, WriteCallbackFunc cb) override;
4646

include/libp2p/layer/websocket/ssl_connection.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ namespace libp2p::connection {
3232
outcome::result<void> close() override;
3333
bool isClosed() const override;
3434

35-
void readSome(BytesOut out, size_t bytes, ReadCallbackFunc cb) override;
35+
void readSome(BytesOut out, ReadCallbackFunc cb) override;
3636
void deferReadCallback(outcome::result<size_t> res,
3737
ReadCallbackFunc cb) override;
3838

include/libp2p/layer/websocket/ws_connection.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ namespace libp2p::connection {
6868

6969
bool isClosed() const override;
7070

71-
void readSome(BytesOut out, size_t bytes, ReadCallbackFunc cb) override;
71+
void readSome(BytesOut out, ReadCallbackFunc cb) override;
7272

7373
void deferReadCallback(outcome::result<size_t> res,
7474
ReadCallbackFunc cb) override;

include/libp2p/muxer/mplex/mplex_stream.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ namespace libp2p::connection {
5050

5151
~MplexStream() override = default;
5252

53-
void readSome(BytesOut out, size_t bytes, ReadCallbackFunc cb) override;
53+
void readSome(BytesOut out, ReadCallbackFunc cb) override;
5454

5555
void deferReadCallback(outcome::result<size_t> res,
5656
ReadCallbackFunc cb) override;

include/libp2p/muxer/mplex/mplexed_connection.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ namespace libp2p::connection {
6464

6565
/// usage of these four methods is highly not recommended or even forbidden:
6666
/// use stream over this connection instead
67-
void readSome(BytesOut out, size_t bytes, ReadCallbackFunc cb) override;
67+
void readSome(BytesOut out, ReadCallbackFunc cb) override;
6868
void writeSome(BytesIn in, WriteCallbackFunc cb) override;
6969

7070
void deferReadCallback(outcome::result<size_t> res,

0 commit comments

Comments
 (0)