From 9848890590b0d619a421b6c03fa7cd70edc9be18 Mon Sep 17 00:00:00 2001 From: Victor Boivie Date: Thu, 10 Mar 2022 20:25:10 +0100 Subject: [PATCH] dcsctp: Remove handover_state from RRSendQueue It's not used as a constructor parameter, but instead invoked by calling RestoreFromState. Removing this parameter avoids confusion. Bug: None Change-Id: I3bb8a0135808e3ae010be6d37439513517f71832 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/254820 Auto-Submit: Victor Boivie Reviewed-by: Sergey Sukhanov Commit-Queue: Sergey Sukhanov Cr-Commit-Position: refs/heads/main@{#36188} --- net/dcsctp/tx/rr_send_queue.cc | 3 +-- net/dcsctp/tx/rr_send_queue.h | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/net/dcsctp/tx/rr_send_queue.cc b/net/dcsctp/tx/rr_send_queue.cc index a20ccb2448..f8f5ff2946 100644 --- a/net/dcsctp/tx/rr_send_queue.cc +++ b/net/dcsctp/tx/rr_send_queue.cc @@ -32,8 +32,7 @@ RRSendQueue::RRSendQueue(absl::string_view log_prefix, size_t buffer_size, std::function on_buffered_amount_low, size_t total_buffered_amount_low_threshold, - std::function on_total_buffered_amount_low, - const DcSctpSocketHandoverState* handover_state) + std::function on_total_buffered_amount_low) : log_prefix_(std::string(log_prefix) + "fcfs: "), buffer_size_(buffer_size), on_buffered_amount_low_(std::move(on_buffered_amount_low)), diff --git a/net/dcsctp/tx/rr_send_queue.h b/net/dcsctp/tx/rr_send_queue.h index 3007cd0fe8..fecb6e0f2e 100644 --- a/net/dcsctp/tx/rr_send_queue.h +++ b/net/dcsctp/tx/rr_send_queue.h @@ -47,8 +47,7 @@ class RRSendQueue : public SendQueue { size_t buffer_size, std::function on_buffered_amount_low, size_t total_buffered_amount_low_threshold, - std::function on_total_buffered_amount_low, - const DcSctpSocketHandoverState* handover_state = nullptr); + std::function on_total_buffered_amount_low); // Indicates if the buffer is full. Note that it's up to the caller to ensure // that the buffer is not full prior to adding new items to it.