[asterisk-scf-commits] asterisk-scf/release/sip.git branch "master" updated.
Commits to the Asterisk SCF project code repositories
asterisk-scf-commits at lists.digium.com
Fri Apr 15 09:16:06 CDT 2011
branch "master" has been updated
via 4c8c74c547955dd93c9e15d2f5c188918517aeeb (commit)
via 0fafee70d034c4406eb11b37817b12a70b50304e (commit)
from ca95f560a6c8ccf5b3ffd2bff26249b982ecedea (commit)
Summary of changes:
src/PJSipLoggingModule.cpp | 4 ++--
src/PJSipSessionModule.cpp | 28 ++++++++++++++--------------
src/SipEndpointFactory.cpp | 2 +-
src/SipSession.cpp | 4 ++--
src/SipSessionManagerApp.cpp | 4 ++--
src/SipStateReplicatorApp.cpp | 4 ++--
src/SipStateReplicatorListener.cpp | 4 ++--
7 files changed, 25 insertions(+), 25 deletions(-)
- Log -----------------------------------------------------------------
commit 4c8c74c547955dd93c9e15d2f5c188918517aeeb
Merge: ca95f56 0fafee7
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Fri Apr 15 09:15:59 2011 -0500
Merge branch 'wip'
commit 0fafee70d034c4406eb11b37817b12a70b50304e
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Thu Apr 14 13:25:27 2011 -0500
Minor fixes for various code constructs that trip up GCC with new warning
options enabled (-Wextra, -Wconversion, -Wformat, and others).
diff --git a/src/PJSipLoggingModule.cpp b/src/PJSipLoggingModule.cpp
index 729aaf0..c94dec1 100644
--- a/src/PJSipLoggingModule.cpp
+++ b/src/PJSipLoggingModule.cpp
@@ -31,7 +31,7 @@ namespace AsteriskSCF
namespace SipSessionManager
{
-pj_status_t PJSipLoggingModule::load(pjsip_endpoint *endpt)
+pj_status_t PJSipLoggingModule::load(pjsip_endpoint*)
{
return PJ_SUCCESS;
}
@@ -79,7 +79,7 @@ pj_status_t PJSipLoggingModule::on_tx_response(pjsip_tx_data *tdata)
return PJ_SUCCESS;
}
-void PJSipLoggingModule::on_tsx_state(pjsip_transaction *tsx, pjsip_event *event)
+void PJSipLoggingModule::on_tsx_state(pjsip_transaction*, pjsip_event*)
{
}
diff --git a/src/PJSipSessionModule.cpp b/src/PJSipSessionModule.cpp
index 8717d6c..f527ad9 100644
--- a/src/PJSipSessionModule.cpp
+++ b/src/PJSipSessionModule.cpp
@@ -406,7 +406,7 @@ void PJSipSessionModule::replicateState(PJSipDialogModInfo *dlgInfo, PJSipTransa
}
}
-pj_status_t PJSipSessionModule::load(pjsip_endpoint *endpt)
+pj_status_t PJSipSessionModule::load(pjsip_endpoint*)
{
return PJ_SUCCESS;
}
@@ -803,25 +803,25 @@ pj_bool_t PJSipSessionModule::on_rx_request(pjsip_rx_data *rdata)
*
* Linking errors abound if these member functions are not defined, though.
*/
-pj_bool_t PJSipSessionModule::on_rx_response(pjsip_rx_data *rdata)
+pj_bool_t PJSipSessionModule::on_rx_response(pjsip_rx_data*)
{
return PJ_FALSE;
}
-pj_status_t PJSipSessionModule::on_tx_request(pjsip_tx_data *tdata)
+pj_status_t PJSipSessionModule::on_tx_request(pjsip_tx_data*)
{
return PJ_SUCCESS;
}
-pj_status_t PJSipSessionModule::on_tx_response(pjsip_tx_data *tdata)
+pj_status_t PJSipSessionModule::on_tx_response(pjsip_tx_data*)
{
return PJ_SUCCESS;
}
-void PJSipSessionModule::on_tsx_state(pjsip_transaction *tsx, pjsip_event *e)
+void PJSipSessionModule::on_tsx_state(pjsip_transaction*, pjsip_event*)
{
return;
}
-void PJSipSessionModule::handleInviteResponse(pjsip_inv_session *inv,
- pjsip_rx_data *rdata, pjsip_dialog *dlg)
+void PJSipSessionModule::handleInviteResponse(pjsip_inv_session* inv,
+ pjsip_rx_data* rdata, pjsip_dialog*)
{
int respCode = rdata->msg_info.msg->line.status.code;
PJSipSessionModInfo *session_mod_info = (PJSipSessionModInfo*)inv->mod_data[mModule.id];
@@ -1017,7 +1017,7 @@ void PJSipSessionModule::invOnStateChanged(pjsip_inv_session *inv, pjsip_event *
}
}
-void PJSipSessionModule::invOnNewSession(pjsip_inv_session *inv, pjsip_event *event)
+void PJSipSessionModule::invOnNewSession(pjsip_inv_session*, pjsip_event*)
{
//stub
}
@@ -1082,13 +1082,13 @@ void PJSipSessionModule::invOnTsxStateChanged(pjsip_inv_session *inv, pjsip_tran
}
}
-void PJSipSessionModule::invOnRxOffer(pjsip_inv_session *inv, const pjmedia_sdp_session *offer)
+void PJSipSessionModule::invOnRxOffer(pjsip_inv_session* inv, const pjmedia_sdp_session*)
{
PJSipSessionModInfo *session_mod_info = (PJSipSessionModInfo*)inv->mod_data[mModule.id];
pjsip_inv_set_sdp_answer(inv, session_mod_info->getSessionPtr()->createSDPOffer());
}
-void PJSipSessionModule::invOnCreateOffer(pjsip_inv_session *inv, pjmedia_sdp_session **p_offer)
+void PJSipSessionModule::invOnCreateOffer(pjsip_inv_session*, pjmedia_sdp_session**)
{
//stub
}
@@ -1129,7 +1129,7 @@ void PJSipSessionModule::invOnMediaUpdate(pjsip_inv_session *inv, pj_status_t st
{
FormatDiscoverySDPPtr params = new FormatDiscoverySDP();
params->category = "media_format";
- params->payload = pj_strtoul(&remote_sdp->media[stream]->desc.fmt[format]);
+ std::stringstream(pj_strbuf(&remote_sdp->media[stream]->desc.fmt[format])) >> params->payload;
params->type = std::string(pj_strbuf(&remote_sdp->media[stream]->desc.media),
pj_strlen(&remote_sdp->media[stream]->desc.media));
@@ -1200,14 +1200,14 @@ void PJSipSessionModule::invOnMediaUpdate(pjsip_inv_session *inv, pj_status_t st
}
}
-pjsip_redirect_op PJSipSessionModule::invOnRedirected(pjsip_inv_session *inv, const pjsip_uri *target,
- const pjsip_event *e)
+pjsip_redirect_op PJSipSessionModule::invOnRedirected(pjsip_inv_session*, const pjsip_uri*,
+ const pjsip_event*)
{
//stub
return PJSIP_REDIRECT_REJECT;
}
-pjsip_dialog *PJSipSessionModule::uaOnDialogForked(pjsip_dialog *first_set, pjsip_rx_data *rdata)
+pjsip_dialog *PJSipSessionModule::uaOnDialogForked(pjsip_dialog*, pjsip_rx_data*)
{
//stub
return NULL;
diff --git a/src/SipEndpointFactory.cpp b/src/SipEndpointFactory.cpp
index ea072c4..9016be3 100644
--- a/src/SipEndpointFactory.cpp
+++ b/src/SipEndpointFactory.cpp
@@ -33,7 +33,7 @@ SipEndpointPtr SipEndpointFactory::createEndpoint(const std::string& destination
return endpoint;
}
-void SipEndpointFactory::remove(const SipEndpointPtr& endpoint)
+void SipEndpointFactory::remove(const SipEndpointPtr&)
{
// TODO: Do we even need to remove sip endpoints yet?
// mEndpoints.erase(std::remove(mEndpoints.begin(), mEndpoints.end(), endpoint), mEndpoints.end());
diff --git a/src/SipSession.cpp b/src/SipSession.cpp
index e9609b6..f6e312d 100644
--- a/src/SipSession.cpp
+++ b/src/SipSession.cpp
@@ -587,7 +587,7 @@ pjmedia_sdp_session *SipSession::createSDPOffer()
pj_strdup2(mImplPriv->mDialog->pool, &sdp->origin.user, "AsteriskSCF");
pj_time_val tv;
pj_gettimeofday(&tv);
- sdp->origin.version = sdp->origin.id = tv.sec + 2208988800UL;
+ sdp->origin.version = sdp->origin.id = (pj_uint32_t) (tv.sec + 2208988800UL);
pj_strdup2(mImplPriv->mDialog->pool, &sdp->origin.net_type, "IN");
pj_strdup2(mImplPriv->mDialog->pool, &sdp->origin.addr_type, "IP4");
sdp->origin.addr = *pj_gethostname();
@@ -612,7 +612,7 @@ pjmedia_sdp_session *SipSession::createSDPOffer()
static_cast<pjmedia_sdp_media*>(pj_pool_zalloc(mImplPriv->mDialog->pool, sizeof(pjmedia_sdp_media)));
sdp->media[0] = media;
pj_strdup2(mImplPriv->mDialog->pool, &media->desc.media, "audio");
- media->desc.port = stream->getLocalPort();
+ media->desc.port = (pj_uint16_t) stream->getLocalPort();
media->desc.port_count = 1;
pj_strdup2(mImplPriv->mDialog->pool, &media->desc.transport, "RTP/AVP");
diff --git a/src/SipSessionManagerApp.cpp b/src/SipSessionManagerApp.cpp
index 34d4128..ecd5338 100644
--- a/src/SipSessionManagerApp.cpp
+++ b/src/SipSessionManagerApp.cpp
@@ -569,7 +569,7 @@ void SipSessionManager::initialize(const string& appName, const Ice::Communicato
/**
* Overload of the IceBox::Service::start method.
*/
-void SipSessionManager::start(const string& name, const Ice::CommunicatorPtr& ic, const Ice::StringSeq& args)
+void SipSessionManager::start(const string& name, const Ice::CommunicatorPtr& ic, const Ice::StringSeq&)
{
// Initialize this component.
initialize(name, ic);
@@ -621,7 +621,7 @@ void SipSessionManager::stop()
extern "C"
{
-ASTERISK_SCF_ICEBOX_EXPORT IceBox::Service* create(Ice::CommunicatorPtr communicator)
+ASTERISK_SCF_ICEBOX_EXPORT IceBox::Service* create(Ice::CommunicatorPtr)
{
return new SipSessionManager;
}
diff --git a/src/SipStateReplicatorApp.cpp b/src/SipStateReplicatorApp.cpp
index fae2b3b..9ad6f2b 100644
--- a/src/SipStateReplicatorApp.cpp
+++ b/src/SipStateReplicatorApp.cpp
@@ -214,7 +214,7 @@ void SipStateReplicatorService::initialize(const std::string& appName, const Ice
mAdapter->activate();
}
-void SipStateReplicatorService::start(const string &name, const Ice::CommunicatorPtr& ic, const Ice::StringSeq& args)
+void SipStateReplicatorService::start(const string& name, const Ice::CommunicatorPtr& ic, const Ice::StringSeq&)
{
initialize(name, ic);
// Plug into the Asterisk SCF discovery system so that the interfaces we provide
@@ -230,7 +230,7 @@ void SipStateReplicatorService::stop()
extern "C"
{
-ASTERISK_SCF_ICEBOX_EXPORT IceBox::Service* create(Ice::CommunicatorPtr communicator)
+ASTERISK_SCF_ICEBOX_EXPORT IceBox::Service* create(Ice::CommunicatorPtr)
{
return new SipStateReplicatorService;
}
diff --git a/src/SipStateReplicatorListener.cpp b/src/SipStateReplicatorListener.cpp
index 36c09e4..248e9b2 100644
--- a/src/SipStateReplicatorListener.cpp
+++ b/src/SipStateReplicatorListener.cpp
@@ -162,7 +162,7 @@ public:
pjsip_ua_unregister_dlg(pjsip_ua_instance(), localDialog);
pj_strdup2(localDialog->pool, &localDialog->local.info->tag, dialog->mLocalTag.c_str());
localDialog->local.tag_hval = pj_hash_calc(0, localDialog->local.info->tag.ptr,
- localDialog->local.info->tag.slen);
+ (unsigned int) localDialog->local.info->tag.slen);
pjsip_ua_register_dlg(pjsip_ua_instance(), localDialog);
}
@@ -170,7 +170,7 @@ public:
{
pj_strdup2(localDialog->pool, &localDialog->remote.info->tag, dialog->mRemoteTag.c_str());
localDialog->remote.tag_hval = pj_hash_calc(0, localDialog->remote.info->tag.ptr,
- localDialog->remote.info->tag.slen);
+ (unsigned int) localDialog->remote.info->tag.slen);
}
// TODO: Handle mRouteSet, which is not as easy as it sounds!
-----------------------------------------------------------------------
--
asterisk-scf/release/sip.git
More information about the asterisk-scf-commits
mailing list