From 54fbaba6332cbcbc4489cadcb9431909f396767e Mon Sep 17 00:00:00 2001
From: Guillaume Roguez <guillaume.roguez@savoirfairelinux.com>
Date: Thu, 30 Nov 2017 14:56:52 -0500
Subject: [PATCH] ice: remove unused API
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Remove IceTransport::getNextPacketSize() API and IceSocket one.
Unused and on-going to be deprecated API.
Change-Id: I6cdf72e81838411060e3cae636b156f309200e14
Reviewed-by: Nicolas Jäger <nicolas.jager@savoirfairelinux.com>
---
src/ice_socket.h | 1 -
src/ice_transport.cpp | 19 -------------------
src/ice_transport.h | 2 --
3 files changed, 22 deletions(-)
diff --git a/src/ice_socket.h b/src/ice_socket.h
index a35fb64269..ba12a1b04e 100644
--- a/src/ice_socket.h
+++ b/src/ice_socket.h
@@ -46,7 +46,6 @@ class IceSocket
void close();
ssize_t recv(unsigned char* buf, size_t len);
ssize_t send(const unsigned char* buf, size_t len);
- ssize_t getNextPacketSize() const;
ssize_t waitForData(unsigned int timeout);
void setOnRecv(IceRecvCb cb);
uint16_t getTransportOverhead();
diff --git a/src/ice_transport.cpp b/src/ice_transport.cpp
index 791b9303a4..750f4453df 100644
--- a/src/ice_transport.cpp
+++ b/src/ice_transport.cpp
@@ -934,17 +934,6 @@ IceTransport::send(int comp_id, const unsigned char* buf, size_t len)
return len;
}
-ssize_t
-IceTransport::getNextPacketSize(int comp_id)
-{
- auto& io = compIO_[comp_id];
- std::lock_guard<std::mutex> lk(io.mutex);
- if (io.queue.empty()) {
- return 0;
- }
- return io.queue.front().datalen;
-}
-
int
IceTransport::waitForInitialization(unsigned timeout)
{
@@ -1053,14 +1042,6 @@ IceSocket::send(const unsigned char* buf, size_t len)
return ice_transport_->send(compId_, buf, len);
}
-ssize_t
-IceSocket::getNextPacketSize() const
-{
- if (!ice_transport_.get())
- return -1;
- return ice_transport_->getNextPacketSize(compId_);
-}
-
ssize_t
IceSocket::waitForData(unsigned int timeout)
{
diff --git a/src/ice_transport.h b/src/ice_transport.h
index 990c88d1de..9103e29db8 100644
--- a/src/ice_transport.h
+++ b/src/ice_transport.h
@@ -200,8 +200,6 @@ class IceTransport {
ssize_t send(int comp_id, const unsigned char* buf, size_t len);
- ssize_t getNextPacketSize(int comp_id);
-
int waitForInitialization(unsigned timeout);
int waitForNegotiation(unsigned timeout);
--
GitLab