From ce9c974106ddc3a0ef99de98895937db2acb6a8f Mon Sep 17 00:00:00 2001
From: Guillaume Roguez <guillaume.roguez@savoirfairelinux.com>
Date: Fri, 13 Mar 2015 11:22:28 -0400
Subject: [PATCH] fix routines that not return but shall be
Discovered since -Wno-return-type removal
Notice this patch fixes a big issue in IceTransport class!
Refs #67228
Change-Id: Ib5f2a6ee469030d8667296481bd3a514788389d7
---
daemon/src/client/callmanager.cpp | 2 +-
daemon/src/ice_transport.cpp | 7 ++++---
daemon/src/managerimpl.cpp | 5 +++--
daemon/src/managerimpl.h | 2 +-
daemon/src/ringdht/sips_transport_ice.cpp | 8 +++++---
daemon/src/upnp/upnp_control.cpp | 3 ++-
6 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/daemon/src/client/callmanager.cpp b/daemon/src/client/callmanager.cpp
index 7703159850..90ace8c81d 100644
--- a/daemon/src/client/callmanager.cpp
+++ b/daemon/src/client/callmanager.cpp
@@ -292,7 +292,7 @@ startTone(int32_t start, int32_t type)
bool
switchInput(const std::string& callID, const std::string& resource)
{
- ring::Manager::instance().switchInput(callID, resource);
+ return ring::Manager::instance().switchInput(callID, resource);
}
void
diff --git a/daemon/src/ice_transport.cpp b/daemon/src/ice_transport.cpp
index 85d5a6c47d..afa7e6a6df 100644
--- a/daemon/src/ice_transport.cpp
+++ b/daemon/src/ice_transport.cpp
@@ -242,7 +242,7 @@ IceTransport::setSlaveSession()
}
return true;
}
- createIceSession(PJ_ICE_SESS_ROLE_CONTROLLED);
+ return createIceSession(PJ_ICE_SESS_ROLE_CONTROLLED);
}
bool
@@ -441,9 +441,10 @@ IceTransport::getLocalCandidatesAddr(unsigned comp_id) const
return cand_addrs;
}
- for (unsigned i=0; i<cand_cnt; ++i) {
+ for (unsigned i=0; i<cand_cnt; ++i)
cand_addrs.push_back(cand[i].addr);
- }
+
+ return cand_addrs;
}
void
diff --git a/daemon/src/managerimpl.cpp b/daemon/src/managerimpl.cpp
index de963720ef..1c11127a0a 100644
--- a/daemon/src/managerimpl.cpp
+++ b/daemon/src/managerimpl.cpp
@@ -2090,15 +2090,16 @@ ManagerImpl::getCurrentAudioDevicesIndex()
return v;
}
-void
+bool
ManagerImpl::switchInput(const std::string& call_id, const std::string& res)
{
auto call = getCallFromCallID(call_id);
if (!call) {
RING_ERR("Call %s is NULL", call_id.c_str());
- return;
+ return false;
}
call->switchInput(res);
+ return true;
}
int
diff --git a/daemon/src/managerimpl.h b/daemon/src/managerimpl.h
index 42d2b150c5..3bc5208664 100644
--- a/daemon/src/managerimpl.h
+++ b/daemon/src/managerimpl.h
@@ -559,7 +559,7 @@ class ManagerImpl {
bool isAGCEnabled() const;
void setAGCState(bool enabled);
- void switchInput(const std::string& callid, const std::string& res);
+ bool switchInput(const std::string& callid, const std::string& res);
/**
* Ringtone option.
diff --git a/daemon/src/ringdht/sips_transport_ice.cpp b/daemon/src/ringdht/sips_transport_ice.cpp
index deaf6b1754..a3210a72fb 100644
--- a/daemon/src/ringdht/sips_transport_ice.cpp
+++ b/daemon/src/ringdht/sips_transport_ice.cpp
@@ -320,6 +320,8 @@ SipsIceTransport::startTlsSession()
// start handshake
handshakeStart_ = clock::now();
state_ = TlsConnectionState::HANDSHAKING;
+
+ return PJ_SUCCESS;
}
void
@@ -646,9 +648,9 @@ SipsIceTransport::setup()
if (is_server_) {
gnutls_key_generate(&cookie_key_, GNUTLS_COOKIE_KEY_SIZE);
state_ = TlsConnectionState::COOKIE;
- } else
- startTlsSession();
- return true;
+ return true;
+ }
+ return startTlsSession();
}
void
diff --git a/daemon/src/upnp/upnp_control.cpp b/daemon/src/upnp/upnp_control.cpp
index 7e7e5f34d7..c30dbaefab 100644
--- a/daemon/src/upnp/upnp_control.cpp
+++ b/daemon/src/upnp/upnp_control.cpp
@@ -100,7 +100,8 @@ Controller::addAnyMapping(uint16_t port_desired,
bool unique,
uint16_t *port_used)
{
- addAnyMapping(port_desired, port_desired, type, true, unique, port_used);
+ return addAnyMapping(port_desired, port_desired, type, true, unique,
+ port_used);
}
void
--
GitLab