Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-14 05:45:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 855335 Patch 2 - Signaling fix warnings format-extra-args and format-security r=jesup

Browse Source
This commit is contained in:
Ethan Hugg 2013-04-11 14:42:39 -07:00
parent 65b0469d80
commit ec6d7ab6bd
10 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
media/webrtc/signaling/src/media-conduit/AudioConduit.cpp
View File

@ -640,7 +640,7 @@ int WebrtcAudioConduit::SendPacket(int channel, const void* data, int 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);
return -1;
} else {
@ -665,7 +665,7 @@ int WebrtcAudioConduit::SendRTCPPacket(int channel, const void* data, int 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);
return -1;
} else {

3
media/webrtc/signaling/src/media/VcmSIPCCBinding.cpp
View File

@ -720,7 +720,8 @@ static short vcmSetIceCandidate_m(const char *peerconnection,
NS_DISPATCH_NORMAL);
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;
}

8
media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp
View File

@ -755,7 +755,7 @@ PeerConnectionImpl::NotifyConnection()
{
PC_AUTO_ENTER_API_CALL_NO_CHECK();
CSFLogDebug(logTag, __FUNCTION__);
CSFLogDebug(logTag, "%s", __FUNCTION__);
#ifdef MOZILLA_INTERNAL_API
nsCOMPtr<IPeerConnectionObserver> pco = do_QueryReferent(mPCObserver);
@ -774,7 +774,7 @@ PeerConnectionImpl::NotifyClosedConnection()
{
PC_AUTO_ENTER_API_CALL_NO_CHECK();
CSFLogDebug(logTag, __FUNCTION__);
CSFLogDebug(logTag, "%s", __FUNCTION__);
#ifdef MOZILLA_INTERNAL_API
nsCOMPtr<IPeerConnectionObserver> pco = do_QueryReferent(mPCObserver);
@ -1218,7 +1218,7 @@ PeerConnectionImpl::CheckApiState(bool assert_ice_ready) const
NS_IMETHODIMP
PeerConnectionImpl::Close(bool aIsSynchronous)
{
CSFLogDebug(logTag, __FUNCTION__);
CSFLogDebug(logTag, "%s", __FUNCTION__);
PC_AUTO_ENTER_API_CALL_NO_CHECK();
return CloseInt(aIsSynchronous);
@ -1413,7 +1413,7 @@ PeerConnectionImpl::IceStateChange_m(IceState aState)
{
PC_AUTO_ENTER_API_CALL(false);
CSFLogDebug(logTag, __FUNCTION__);
CSFLogDebug(logTag, "%s", __FUNCTION__);
mIceState = aState;

2
media/webrtc/signaling/src/sipcc/core/ccapp/ccapi_call.c
View File

@ -202,7 +202,7 @@ cc_return_t CCAPI_Call_endConsultativeCall(cc_call_handle_t handle){
attr != CC_ATTR_XFR_CONSULT &&
attr != CC_ATTR_LOCAL_CONF_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);
return CC_FAILURE;
}

6
media/webrtc/signaling/src/sipcc/core/gsm/dcsm.c
View File

@ -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
* 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));
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 (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));
}
}
@ -679,7 +679,7 @@ dcsm_init (void)
dcsm_match_event);
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));
}

6
media/webrtc/signaling/src/sipcc/core/gsm/fsmcac.c
View File

@ -89,7 +89,7 @@ fsm_get_new_cac_data (void)
cac_mem = (cac_data_t *) cpr_malloc(sizeof(cac_data_t));
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));
return (NULL);
}
@ -201,7 +201,7 @@ fsm_init_cac_failure_timer(cac_data_t *cac_data, uint32_t timeout)
gsm_msgq);
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));
return(FALSE);
}
@ -271,7 +271,7 @@ void fsm_cac_init (void)
fsm_cac_match_call_id);
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));
}

2
media/webrtc/signaling/src/sipcc/core/gsm/lsm.c
View File

@ -386,7 +386,7 @@ void lsm_set_lcb_prevent_ringing (callid_t call_id)
FSM_FOR_ALL_CBS(lcb, lsm_lcbs, LSM_MAX_LCBS) {
if (lcb->state == LSM_S_RINGIN) {
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);
FSM_SET_FLAGS(lcb->flags, LSM_FLAGS_PREVENT_RINGING);
}

2
media/webrtc/signaling/src/sipcc/core/includes/phone_debug.h
View File

@ -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_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_F_PREFIX "DCSM : %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 MED_F_PREFIX "MED : %s : "

2
media/webrtc/signaling/src/sipcc/core/sipstack/ccsip_core.c
View File

@ -4409,7 +4409,7 @@ ccsip_handle_sentbye_ev_sip_fxx (ccsipCCB_t *ccb, sipSMEvent_t *event)
if (cred_get_credentials_r(ccb, &credentials) == FALSE) {
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),
ccb->index, ccb->authen.cred_type, MAX_RETRIES_401);
ccb->index, MAX_RETRIES_401);
free_sip_message(response);
sip_cc_release_complete(ccb->gsm_id, ccb->dn_line, CC_CAUSE_ERROR);

4
media/webrtc/signaling/src/sipcc/core/src-common/pres_sub_not_handler.c
View File

@ -800,7 +800,7 @@ unsolicited_notify_ind_cb (ccsip_sub_not_data_t *msg_data)
presentity_url = strchr(event_body_p->presence_body.entity, ':');
if (presentity_url == NULL)
{
BLF_ERROR("MSC: Error parsing presentity_url", fname);
BLF_ERROR("MSC: %s: Error parsing presentity_url", fname);
return;
}
@ -960,7 +960,7 @@ static void sub_handler_initialized (void)
presentity_url = strchr(pending_notify_p->presentity, ':');
if (presentity_url == NULL)
{
BLF_ERROR("MSC: Error parsing presentity_url", fname);
BLF_ERROR("MSC: %s: Error parsing presentity_url", fname);
return;
}