mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-14 05:45:37 +00:00
Bug 855335 Patch 2 - Signaling fix warnings format-extra-args and format-security r=jesup
This commit is contained in:
parent
65b0469d80
commit
ec6d7ab6bd
@ -640,7 +640,7 @@ int WebrtcAudioConduit::SendPacket(int channel, const void* data, int len)
|
|||||||
{
|
{
|
||||||
return mOtherDirection->SendPacket(channel, data, len);
|
return mOtherDirection->SendPacket(channel, data, len);
|
||||||
}
|
}
|
||||||
CSFLogDebug(logTag, "%s : Asked to send RTP without an RTP sender",
|
CSFLogDebug(logTag, "%s : Asked to send RTP without an RTP sender on channel %d",
|
||||||
__FUNCTION__, channel);
|
__FUNCTION__, channel);
|
||||||
return -1;
|
return -1;
|
||||||
} else {
|
} else {
|
||||||
@ -665,7 +665,7 @@ int WebrtcAudioConduit::SendRTCPPacket(int channel, const void* data, int len)
|
|||||||
{
|
{
|
||||||
return mOtherDirection->SendRTCPPacket(channel, data, len);
|
return mOtherDirection->SendRTCPPacket(channel, data, len);
|
||||||
}
|
}
|
||||||
CSFLogDebug(logTag, "%s : Asked to send RTCP without an RTP receiver",
|
CSFLogDebug(logTag, "%s : Asked to send RTCP without an RTP receiver on channel %d",
|
||||||
__FUNCTION__, channel);
|
__FUNCTION__, channel);
|
||||||
return -1;
|
return -1;
|
||||||
} else {
|
} else {
|
||||||
|
@ -720,7 +720,8 @@ static short vcmSetIceCandidate_m(const char *peerconnection,
|
|||||||
NS_DISPATCH_NORMAL);
|
NS_DISPATCH_NORMAL);
|
||||||
|
|
||||||
if (!NS_SUCCEEDED(rv)) {
|
if (!NS_SUCCEEDED(rv)) {
|
||||||
CSFLogError( logTag, "%s(): Could not dispatch to ICE thread", __FUNCTION__, level);
|
CSFLogError( logTag, "%s(): Could not dispatch to ICE thread, level %u",
|
||||||
|
__FUNCTION__, level);
|
||||||
return VCM_ERROR;
|
return VCM_ERROR;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -755,7 +755,7 @@ PeerConnectionImpl::NotifyConnection()
|
|||||||
{
|
{
|
||||||
PC_AUTO_ENTER_API_CALL_NO_CHECK();
|
PC_AUTO_ENTER_API_CALL_NO_CHECK();
|
||||||
|
|
||||||
CSFLogDebug(logTag, __FUNCTION__);
|
CSFLogDebug(logTag, "%s", __FUNCTION__);
|
||||||
|
|
||||||
#ifdef MOZILLA_INTERNAL_API
|
#ifdef MOZILLA_INTERNAL_API
|
||||||
nsCOMPtr<IPeerConnectionObserver> pco = do_QueryReferent(mPCObserver);
|
nsCOMPtr<IPeerConnectionObserver> pco = do_QueryReferent(mPCObserver);
|
||||||
@ -774,7 +774,7 @@ PeerConnectionImpl::NotifyClosedConnection()
|
|||||||
{
|
{
|
||||||
PC_AUTO_ENTER_API_CALL_NO_CHECK();
|
PC_AUTO_ENTER_API_CALL_NO_CHECK();
|
||||||
|
|
||||||
CSFLogDebug(logTag, __FUNCTION__);
|
CSFLogDebug(logTag, "%s", __FUNCTION__);
|
||||||
|
|
||||||
#ifdef MOZILLA_INTERNAL_API
|
#ifdef MOZILLA_INTERNAL_API
|
||||||
nsCOMPtr<IPeerConnectionObserver> pco = do_QueryReferent(mPCObserver);
|
nsCOMPtr<IPeerConnectionObserver> pco = do_QueryReferent(mPCObserver);
|
||||||
@ -1218,7 +1218,7 @@ PeerConnectionImpl::CheckApiState(bool assert_ice_ready) const
|
|||||||
NS_IMETHODIMP
|
NS_IMETHODIMP
|
||||||
PeerConnectionImpl::Close(bool aIsSynchronous)
|
PeerConnectionImpl::Close(bool aIsSynchronous)
|
||||||
{
|
{
|
||||||
CSFLogDebug(logTag, __FUNCTION__);
|
CSFLogDebug(logTag, "%s", __FUNCTION__);
|
||||||
PC_AUTO_ENTER_API_CALL_NO_CHECK();
|
PC_AUTO_ENTER_API_CALL_NO_CHECK();
|
||||||
|
|
||||||
return CloseInt(aIsSynchronous);
|
return CloseInt(aIsSynchronous);
|
||||||
@ -1413,7 +1413,7 @@ PeerConnectionImpl::IceStateChange_m(IceState aState)
|
|||||||
{
|
{
|
||||||
PC_AUTO_ENTER_API_CALL(false);
|
PC_AUTO_ENTER_API_CALL(false);
|
||||||
|
|
||||||
CSFLogDebug(logTag, __FUNCTION__);
|
CSFLogDebug(logTag, "%s", __FUNCTION__);
|
||||||
|
|
||||||
mIceState = aState;
|
mIceState = aState;
|
||||||
|
|
||||||
|
@ -202,7 +202,7 @@ cc_return_t CCAPI_Call_endConsultativeCall(cc_call_handle_t handle){
|
|||||||
attr != CC_ATTR_XFR_CONSULT &&
|
attr != CC_ATTR_XFR_CONSULT &&
|
||||||
attr != CC_ATTR_LOCAL_CONF_CONSULT &&
|
attr != CC_ATTR_LOCAL_CONF_CONSULT &&
|
||||||
attr != CC_ATTR_LOCAL_XFER_CONSULT) {
|
attr != CC_ATTR_LOCAL_XFER_CONSULT) {
|
||||||
DEF_DEBUG(DEB_F_PREFIX"This method only calls on a consultative call",
|
DEF_DEBUG(DEB_F_PREFIX"This method only calls on a consultative call, handle %u",
|
||||||
DEB_F_PREFIX_ARGS(SIP_CC_PROV, "CCAPI_Call_endConsultativeCall"), handle);
|
DEB_F_PREFIX_ARGS(SIP_CC_PROV, "CCAPI_Call_endConsultativeCall"), handle);
|
||||||
return CC_FAILURE;
|
return CC_FAILURE;
|
||||||
}
|
}
|
||||||
|
@ -269,7 +269,7 @@ static void dcsm_add_call_id_to_list (callid_t call_id)
|
|||||||
/* Should never happen as there is a space to store call_id
|
/* Should never happen as there is a space to store call_id
|
||||||
* for each calls
|
* for each calls
|
||||||
*/
|
*/
|
||||||
DCSM_ERROR(DCSM_F_PREFIX"DCSM No space to store call_id.\n",
|
DCSM_ERROR(DEB_F_PREFIX"DCSM No space to store call_id.\n",
|
||||||
DEB_F_PREFIX_ARGS("DCSM", fname));
|
DEB_F_PREFIX_ARGS("DCSM", fname));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -380,7 +380,7 @@ dcsm_update_gsm_state (fsm_fcb_t *fcb, callid_t call_id, int state)
|
|||||||
*/
|
*/
|
||||||
if (sll_count(dcsm_cb.s_msg_list) > 0 ) {
|
if (sll_count(dcsm_cb.s_msg_list) > 0 ) {
|
||||||
if (gsm_send_msg(DCSM_EV_READY, NULL, 0) == CPR_FAILURE) {
|
if (gsm_send_msg(DCSM_EV_READY, NULL, 0) == CPR_FAILURE) {
|
||||||
DCSM_ERROR(DCSM_F_PREFIX"send DCSM_EV_READY ERROR.\n",
|
DCSM_ERROR(DEB_F_PREFIX"send DCSM_EV_READY ERROR.\n",
|
||||||
DEB_F_PREFIX_ARGS(DCSM, fname));
|
DEB_F_PREFIX_ARGS(DCSM, fname));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -679,7 +679,7 @@ dcsm_init (void)
|
|||||||
dcsm_match_event);
|
dcsm_match_event);
|
||||||
|
|
||||||
if (dcsm_cb.s_msg_list == NULL) {
|
if (dcsm_cb.s_msg_list == NULL) {
|
||||||
DCSM_ERROR(DCSM_F_PREFIX"DCSM CB creation failed.\n",
|
DCSM_ERROR(DEB_F_PREFIX"DCSM CB creation failed.\n",
|
||||||
DEB_F_PREFIX_ARGS("DCSM", fname));
|
DEB_F_PREFIX_ARGS("DCSM", fname));
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -89,7 +89,7 @@ fsm_get_new_cac_data (void)
|
|||||||
cac_mem = (cac_data_t *) cpr_malloc(sizeof(cac_data_t));
|
cac_mem = (cac_data_t *) cpr_malloc(sizeof(cac_data_t));
|
||||||
|
|
||||||
if (cac_mem == NULL) {
|
if (cac_mem == NULL) {
|
||||||
CAC_ERROR(CAC_F_PREFIX"No memory for CAC data.\n",
|
CAC_ERROR(DEB_F_PREFIX"No memory for CAC data.\n",
|
||||||
DEB_F_PREFIX_ARGS("CAC", fname));
|
DEB_F_PREFIX_ARGS("CAC", fname));
|
||||||
return (NULL);
|
return (NULL);
|
||||||
}
|
}
|
||||||
@ -201,7 +201,7 @@ fsm_init_cac_failure_timer(cac_data_t *cac_data, uint32_t timeout)
|
|||||||
gsm_msgq);
|
gsm_msgq);
|
||||||
|
|
||||||
if (cac_data->cac_fail_timer == NULL) {
|
if (cac_data->cac_fail_timer == NULL) {
|
||||||
CAC_ERROR(CAC_F_PREFIX"CAC Timer allocation failed.\n",
|
CAC_ERROR(DEB_F_PREFIX"CAC Timer allocation failed.\n",
|
||||||
DEB_F_PREFIX_ARGS("CAC", fname));
|
DEB_F_PREFIX_ARGS("CAC", fname));
|
||||||
return(FALSE);
|
return(FALSE);
|
||||||
}
|
}
|
||||||
@ -271,7 +271,7 @@ void fsm_cac_init (void)
|
|||||||
fsm_cac_match_call_id);
|
fsm_cac_match_call_id);
|
||||||
|
|
||||||
if (s_cac_list == NULL) {
|
if (s_cac_list == NULL) {
|
||||||
CAC_ERROR(CAC_F_PREFIX"CAC list creation failed.\n",
|
CAC_ERROR(DEB_F_PREFIX"CAC list creation failed.\n",
|
||||||
DEB_F_PREFIX_ARGS("CAC", fname));
|
DEB_F_PREFIX_ARGS("CAC", fname));
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -386,7 +386,7 @@ void lsm_set_lcb_prevent_ringing (callid_t call_id)
|
|||||||
FSM_FOR_ALL_CBS(lcb, lsm_lcbs, LSM_MAX_LCBS) {
|
FSM_FOR_ALL_CBS(lcb, lsm_lcbs, LSM_MAX_LCBS) {
|
||||||
if (lcb->state == LSM_S_RINGIN) {
|
if (lcb->state == LSM_S_RINGIN) {
|
||||||
if ((lcb->gcid != NULL) && (strncmp(gcid, lcb->gcid, CC_GCID_LEN) == 0)) {
|
if ((lcb->gcid != NULL) && (strncmp(gcid, lcb->gcid, CC_GCID_LEN) == 0)) {
|
||||||
LSM_DEBUG(DEB_L_C_F_PREFIX"found ringing call.\n",
|
LSM_DEBUG(DEB_L_C_F_PREFIX"found ringing call, gcid %s",
|
||||||
DEB_L_C_F_PREFIX_ARGS(LSM, lcb->line, lcb->call_id, "lsm_set_lcb_prevent_ringing"), gcid);
|
DEB_L_C_F_PREFIX_ARGS(LSM, lcb->line, lcb->call_id, "lsm_set_lcb_prevent_ringing"), gcid);
|
||||||
FSM_SET_FLAGS(lcb->flags, LSM_FLAGS_PREVENT_RINGING);
|
FSM_SET_FLAGS(lcb->flags, LSM_FLAGS_PREVENT_RINGING);
|
||||||
}
|
}
|
||||||
|
@ -285,9 +285,7 @@ extern int32_t nbuginf(const char *_format, ...);
|
|||||||
|
|
||||||
|
|
||||||
#define CAC_L_C_F_PREFIX "CAC : %d/%d : %s : " // requires 3 args: line_id, call_id, fname
|
#define CAC_L_C_F_PREFIX "CAC : %d/%d : %s : " // requires 3 args: line_id, call_id, fname
|
||||||
#define CAC_F_PREFIX "CAC : %s : " // requires 1 arg: fname
|
|
||||||
#define DCSM_L_C_F_PREFIX "DCSM : %d/%d : %s : " // requires 3 args: line_id, call_id, fname
|
#define DCSM_L_C_F_PREFIX "DCSM : %d/%d : %s : " // requires 3 args: line_id, call_id, fname
|
||||||
#define DCSM_F_PREFIX "DCSM : %s : " // requires 1 arg: fname
|
|
||||||
#define CFG_F_PREFIX "CFG : %s : " // requires 1 arg: fname
|
#define CFG_F_PREFIX "CFG : %s : " // requires 1 arg: fname
|
||||||
#define PLAT_COMMON_F_PREFIX "PLAT_COMMON : %s : " // requires 1 arg: fname
|
#define PLAT_COMMON_F_PREFIX "PLAT_COMMON : %s : " // requires 1 arg: fname
|
||||||
#define MED_F_PREFIX "MED : %s : "
|
#define MED_F_PREFIX "MED : %s : "
|
||||||
|
@ -4409,7 +4409,7 @@ ccsip_handle_sentbye_ev_sip_fxx (ccsipCCB_t *ccb, sipSMEvent_t *event)
|
|||||||
if (cred_get_credentials_r(ccb, &credentials) == FALSE) {
|
if (cred_get_credentials_r(ccb, &credentials) == FALSE) {
|
||||||
CCSIP_DEBUG_STATE(DEB_L_C_F_PREFIX"retries exceeded: %d/%d\n",
|
CCSIP_DEBUG_STATE(DEB_L_C_F_PREFIX"retries exceeded: %d/%d\n",
|
||||||
DEB_L_C_F_PREFIX_ARGS(SIP_CALL_STATUS, ccb->dn_line, ccb->gsm_id, fname),
|
DEB_L_C_F_PREFIX_ARGS(SIP_CALL_STATUS, ccb->dn_line, ccb->gsm_id, fname),
|
||||||
ccb->index, ccb->authen.cred_type, MAX_RETRIES_401);
|
ccb->index, MAX_RETRIES_401);
|
||||||
|
|
||||||
free_sip_message(response);
|
free_sip_message(response);
|
||||||
sip_cc_release_complete(ccb->gsm_id, ccb->dn_line, CC_CAUSE_ERROR);
|
sip_cc_release_complete(ccb->gsm_id, ccb->dn_line, CC_CAUSE_ERROR);
|
||||||
|
@ -800,7 +800,7 @@ unsolicited_notify_ind_cb (ccsip_sub_not_data_t *msg_data)
|
|||||||
presentity_url = strchr(event_body_p->presence_body.entity, ':');
|
presentity_url = strchr(event_body_p->presence_body.entity, ':');
|
||||||
if (presentity_url == NULL)
|
if (presentity_url == NULL)
|
||||||
{
|
{
|
||||||
BLF_ERROR("MSC: Error parsing presentity_url", fname);
|
BLF_ERROR("MSC: %s: Error parsing presentity_url", fname);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -960,7 +960,7 @@ static void sub_handler_initialized (void)
|
|||||||
presentity_url = strchr(pending_notify_p->presentity, ':');
|
presentity_url = strchr(pending_notify_p->presentity, ':');
|
||||||
if (presentity_url == NULL)
|
if (presentity_url == NULL)
|
||||||
{
|
{
|
||||||
BLF_ERROR("MSC: Error parsing presentity_url", fname);
|
BLF_ERROR("MSC: %s: Error parsing presentity_url", fname);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user