From fd4912d1c2c99393945bd75d8e1ab0537359cdc2 Mon Sep 17 00:00:00 2001 From: Ethan Hugg Date: Wed, 10 Apr 2013 11:17:30 -0700 Subject: [PATCH] Bug 855335 - Signaling - fix Wformat warnings in logging r=jesup --- .../signaling/src/media/VcmSIPCCBinding.cpp | 4 ++-- .../src/sipcc/core/ccapp/cc_call_feature.c | 2 +- .../src/sipcc/core/ccapp/ccapi_call.c | 6 ++--- .../src/sipcc/core/ccapp/ccapi_call_info.c | 2 +- .../src/sipcc/core/ccapp/ccapi_config.c | 2 +- .../src/sipcc/core/ccapp/ccapi_device_info.c | 4 ++-- .../src/sipcc/core/ccapp/ccapi_line_info.c | 12 +++++----- .../src/sipcc/core/ccapp/ccapi_snapshot.c | 2 +- .../src/sipcc/core/ccapp/ccapp_task.c | 6 ++--- .../src/sipcc/core/ccapp/ccprovider.c | 4 ++-- .../src/sipcc/core/ccapp/conf_roster.c | 2 +- .../src/sipcc/core/common/platform_api.c | 4 ++-- .../signaling/src/sipcc/core/common/ui.c | 2 +- .../signaling/src/sipcc/core/gsm/ccapi.c | 2 +- .../signaling/src/sipcc/core/gsm/fsmb2bcnf.c | 2 +- .../signaling/src/sipcc/core/gsm/fsmcnf.c | 2 +- .../signaling/src/sipcc/core/gsm/gsm_sdp.c | 4 ++-- .../webrtc/signaling/src/sipcc/core/gsm/lsm.c | 24 +++++++++---------- .../webrtc/signaling/src/sipcc/core/gsm/sm.c | 2 +- .../src/sipcc/core/sipstack/ccsip_core.c | 19 ++++++++------- .../src/sipcc/core/sipstack/ccsip_info.c | 2 +- .../sipcc/core/sipstack/ccsip_platform_tcp.c | 6 ++--- .../core/sipstack/ccsip_platform_timers.c | 10 ++++---- .../src/sipcc/core/sipstack/ccsip_pmh.c | 2 +- .../src/sipcc/core/sipstack/ccsip_register.c | 6 ++--- .../sipcc/core/sipstack/ccsip_subsmanager.c | 24 +++++++++---------- .../src/sipcc/core/sipstack/ccsip_task.c | 2 +- .../sipcc/core/sipstack/sip_common_regmgr.c | 6 ++--- .../core/sipstack/sip_common_transport.c | 4 ++-- .../sipcc/core/sipstack/sip_platform_task.c | 2 +- .../src/sipcc/core/src-common/kpmlmap.c | 22 ++++++++--------- .../core/src-common/pres_sub_not_handler.c | 2 +- .../src/softphonewrapper/CC_SIPCCService.cpp | 8 +++---- 33 files changed, 102 insertions(+), 101 deletions(-) diff --git a/media/webrtc/signaling/src/media/VcmSIPCCBinding.cpp b/media/webrtc/signaling/src/media/VcmSIPCCBinding.cpp index 1400de30955..d8770d453af 100644 --- a/media/webrtc/signaling/src/media/VcmSIPCCBinding.cpp +++ b/media/webrtc/signaling/src/media/VcmSIPCCBinding.cpp @@ -461,7 +461,7 @@ static short vcmRxAllocICE_m(cc_mcapid_t mcap_id, } std::vector candidates = stream->GetCandidates(); - CSFLogDebug( logTag, "%s: Got %d candidates", __FUNCTION__, candidates.size()); + CSFLogDebug( logTag, "%s: Got %lu candidates", __FUNCTION__, candidates.size()); std::string default_addr; int default_port; @@ -2765,7 +2765,7 @@ vcmCreateTransportFlow(sipcc::PeerConnectionImpl *pc, int level, bool rtcp, * This function should only be called on the main thread. * */ -static void vcmOnSdpParseError_m(nsAutoPtr peerconnection, +static void vcmOnSdpParseError_m(nsAutoPtr peerconnection, nsAutoPtr message) { sipcc::PeerConnectionWrapper pc(peerconnection->c_str()); diff --git a/media/webrtc/signaling/src/sipcc/core/ccapp/cc_call_feature.c b/media/webrtc/signaling/src/sipcc/core/ccapp/cc_call_feature.c index ec330a8552d..1d44b8a0749 100644 --- a/media/webrtc/signaling/src/sipcc/core/ccapp/cc_call_feature.c +++ b/media/webrtc/signaling/src/sipcc/core/ccapp/cc_call_feature.c @@ -118,7 +118,7 @@ cc_return_t cc_invokeFeatureSDPMode(cc_call_handle_t call_handle, callFeature.featData.ccData.level = level; callFeature.featData.ccData.constraints = constraints; - CCAPP_DEBUG(DEB_F_PREFIX"cc_invokeFeatureSDPMode:sid=%d, line=%d, cid=%d, fid=%d, video_pref=%s data=%s\n", + CCAPP_DEBUG(DEB_F_PREFIX"cc_invokeFeatureSDPMode:sid=%d, line=%d, cid=%d, fid=%d, data=%s\n", DEB_F_PREFIX_ARGS("cc_call_feature", "cc_invokeFeatureSDPMode"), callFeature.session_id, GET_LINE_ID(call_handle), diff --git a/media/webrtc/signaling/src/sipcc/core/ccapp/ccapi_call.c b/media/webrtc/signaling/src/sipcc/core/ccapp/ccapi_call.c index bfb8a82f02e..8ed47ec25d9 100644 --- a/media/webrtc/signaling/src/sipcc/core/ccapp/ccapi_call.c +++ b/media/webrtc/signaling/src/sipcc/core/ccapp/ccapi_call.c @@ -52,7 +52,7 @@ void CCAPI_Call_retainCallInfo(cc_callinfo_ref_t ref) { */ void CCAPI_Call_releaseCallInfo(cc_callinfo_ref_t ref) { if (ref != NULL ) { - DEF_DEBUG(DEB_F_PREFIX"ref=0x%x: count=%d", + DEF_DEBUG(DEB_F_PREFIX"ref=%p: count=%d", DEB_F_PREFIX_ARGS(SIP_CC_PROV, "CCAPI_Call_releaseCallInfo"), ref, ref->ref_count); ref->ref_count--; if ( ref->ref_count == 0 ) { @@ -349,7 +349,7 @@ cc_return_t CCAPI_Call_sendInfo (cc_call_handle_t handle, cc_string_t infopackag cc_return_t CCAPI_Call_setAudioMute (cc_call_handle_t handle, cc_boolean val) { unsigned int session_id = ccpro_get_sessionId_by_callid(GET_CALL_ID(handle)); session_data_t * sess_data_p = (session_data_t *)findhash(session_id); - DEF_DEBUG(DEB_F_PREFIX": val=%d, handle=%d datap=%x", + DEF_DEBUG(DEB_F_PREFIX": val=%d, handle=%d datap=%p", DEB_F_PREFIX_ARGS(SIP_CC_PROV, "CCAPI_Call_setAudioMute"), val, handle, sess_data_p); if ( sess_data_p != NULL ) { sess_data_p->audio_mute = val; @@ -367,7 +367,7 @@ cc_return_t CCAPI_Call_setAudioMute (cc_call_handle_t handle, cc_boolean val) { cc_return_t CCAPI_Call_setVideoMute (cc_call_handle_t handle, cc_boolean val){ unsigned int session_id = ccpro_get_sessionId_by_callid(GET_CALL_ID(handle)); session_data_t * sess_data_p = (session_data_t *)findhash(session_id); - DEF_DEBUG(DEB_F_PREFIX": val=%d, handle=%d datap=%x", + DEF_DEBUG(DEB_F_PREFIX": val=%d, handle=%d datap=%p", DEB_F_PREFIX_ARGS(SIP_CC_PROV, "CCAPI_Call_setVideoMute"), val, handle, sess_data_p); if ( sess_data_p != NULL ) { sess_data_p->video_mute = val; diff --git a/media/webrtc/signaling/src/sipcc/core/ccapp/ccapi_call_info.c b/media/webrtc/signaling/src/sipcc/core/ccapp/ccapi_call_info.c index 261dda4611d..78c1c25b923 100644 --- a/media/webrtc/signaling/src/sipcc/core/ccapp/ccapi_call_info.c +++ b/media/webrtc/signaling/src/sipcc/core/ccapp/ccapi_call_info.c @@ -660,7 +660,7 @@ cc_calllog_ref_t CCAPI_CallInfo_getCallLogRef(cc_callinfo_ref_t handle) CCAPP_DEBUG(DEB_F_PREFIX"Entering\n", DEB_F_PREFIX_ARGS(SIP_CC_PROV, fname)); if ( data != NULL){ - CCAPP_DEBUG(DEB_F_PREFIX"returned %x\n", DEB_F_PREFIX_ARGS(SIP_CC_PROV, fname), &data->call_log); + CCAPP_DEBUG(DEB_F_PREFIX"returned %p", DEB_F_PREFIX_ARGS(SIP_CC_PROV, fname), &data->call_log); return &data->call_log; } diff --git a/media/webrtc/signaling/src/sipcc/core/ccapp/ccapi_config.c b/media/webrtc/signaling/src/sipcc/core/ccapp/ccapi_config.c index e5429011916..bf42c6422d5 100644 --- a/media/webrtc/signaling/src/sipcc/core/ccapp/ccapi_config.c +++ b/media/webrtc/signaling/src/sipcc/core/ccapp/ccapi_config.c @@ -29,7 +29,7 @@ void CCAPI_Start_response(int device_handle, const char *device_name, const char static const char fname[] = "CCAPI_Start_response"; if (is_empty_str((char*)sipUser) || is_empty_str((char*)sipDomain)) { - CCAPP_ERROR(DEB_F_PREFIX" invalid registration details user=%x, domain=%x\n", DEB_F_PREFIX_ARGS(CC_API, fname), sipUser, sipDomain); + CCAPP_ERROR(DEB_F_PREFIX" invalid registration details user=%s, domain=%s\n", DEB_F_PREFIX_ARGS(CC_API, fname), sipUser, sipDomain); return; } diff --git a/media/webrtc/signaling/src/sipcc/core/ccapp/ccapi_device_info.c b/media/webrtc/signaling/src/sipcc/core/ccapp/ccapi_device_info.c index 92d6d9e897a..46db0bef5af 100644 --- a/media/webrtc/signaling/src/sipcc/core/ccapp/ccapi_device_info.c +++ b/media/webrtc/signaling/src/sipcc/core/ccapp/ccapi_device_info.c @@ -61,7 +61,7 @@ cc_boolean CCAPI_DeviceInfo_isPhoneIdle(cc_deviceinfo_ref_t handle) break; } } - CCAPP_DEBUG(DEB_F_PREFIX"idle state=%d session_id=0x%x call-state=%d handle=%x\n", + CCAPP_DEBUG(DEB_F_PREFIX"idle state=%d session_id=0x%x call-state=%d handle=%p", DEB_F_PREFIX_ARGS(SIP_CC_PROV, fname), ret, (session_data != NULL)? session_data->sess_id: 0, (session_data != NULL)? session_data->state: 0, @@ -317,7 +317,7 @@ cc_string_t CCAPI_DeviceInfo_getNotifyPrompt (cc_deviceinfo_ref_t handle) CCAPP_DEBUG(DEB_F_PREFIX"Entering\n", DEB_F_PREFIX_ARGS(SIP_CC_PROV, fname)); if (ref != NULL) { - CCAPP_DEBUG(DEB_F_PREFIX"returned %02X\n", DEB_F_PREFIX_ARGS(SIP_CC_PROV, fname), (ref->not_prompt)); + CCAPP_DEBUG(DEB_F_PREFIX"returned %p", DEB_F_PREFIX_ARGS(SIP_CC_PROV, fname), (ref->not_prompt)); return ref->not_prompt; } diff --git a/media/webrtc/signaling/src/sipcc/core/ccapp/ccapi_line_info.c b/media/webrtc/signaling/src/sipcc/core/ccapp/ccapi_line_info.c index dda2969e270..b5798d910bc 100644 --- a/media/webrtc/signaling/src/sipcc/core/ccapp/ccapi_line_info.c +++ b/media/webrtc/signaling/src/sipcc/core/ccapp/ccapi_line_info.c @@ -201,7 +201,7 @@ cc_uint32_t CCAPI_lineInfo_getMWIStatus(cc_lineinfo_ref_t line) CCAPP_DEBUG(DEB_F_PREFIX"Entering\n", DEB_F_PREFIX_ARGS(SIP_CC_PROV, fname)); if ( info != NULL ) { - CCAPP_DEBUG(DEB_F_PREFIX"returned %d, status %d\n", DEB_F_PREFIX_ARGS(SIP_CC_PROV, fname), info->mwi, info->mwi.status); + CCAPP_DEBUG(DEB_F_PREFIX"returned status %d", DEB_F_PREFIX_ARGS(SIP_CC_PROV, fname), info->mwi.status); return info->mwi.status; } return 0; @@ -220,7 +220,7 @@ cc_uint32_t CCAPI_lineInfo_getMWIType(cc_lineinfo_ref_t line) CCAPP_DEBUG(DEB_F_PREFIX"Entering\n", DEB_F_PREFIX_ARGS(SIP_CC_PROV, fname)); if ( info != NULL ) { - CCAPP_DEBUG(DEB_F_PREFIX"returned %d, type %d\n", DEB_F_PREFIX_ARGS(SIP_CC_PROV, fname), info->mwi, info->mwi.type); + CCAPP_DEBUG(DEB_F_PREFIX"returned type %d", DEB_F_PREFIX_ARGS(SIP_CC_PROV, fname), info->mwi.type); return info->mwi.type; } return 0; @@ -239,7 +239,7 @@ cc_uint32_t CCAPI_lineInfo_getMWINewMsgCount(cc_lineinfo_ref_t line) CCAPP_DEBUG(DEB_F_PREFIX"Entering\n", DEB_F_PREFIX_ARGS(SIP_CC_PROV, fname)); if ( info != NULL ) { - CCAPP_DEBUG(DEB_F_PREFIX"returned %d, new count %d\n", DEB_F_PREFIX_ARGS(SIP_CC_PROV, fname), info->mwi, info->mwi.new_count); + CCAPP_DEBUG(DEB_F_PREFIX"returned new count %d", DEB_F_PREFIX_ARGS(SIP_CC_PROV, fname), info->mwi.new_count); return info->mwi.new_count; } return 0; @@ -257,7 +257,7 @@ cc_uint32_t CCAPI_lineInfo_getMWIOldMsgCount(cc_lineinfo_ref_t line) CCAPP_DEBUG(DEB_F_PREFIX"Entering\n", DEB_F_PREFIX_ARGS(SIP_CC_PROV, fname)); if ( info != NULL ) { - CCAPP_DEBUG(DEB_F_PREFIX"returned %d, old_count %d\n", DEB_F_PREFIX_ARGS(SIP_CC_PROV, fname), info->mwi, info->mwi.old_count); + CCAPP_DEBUG(DEB_F_PREFIX"returned old_count %d", DEB_F_PREFIX_ARGS(SIP_CC_PROV, fname), info->mwi.old_count); return info->mwi.old_count; } return 0; @@ -276,7 +276,7 @@ cc_uint32_t CCAPI_lineInfo_getMWIPrioNewMsgCount(cc_lineinfo_ref_t line) CCAPP_DEBUG(DEB_F_PREFIX"Entering\n", DEB_F_PREFIX_ARGS(SIP_CC_PROV, fname)); if ( info != NULL ) { - CCAPP_DEBUG(DEB_F_PREFIX"returned %d , pri_new count %d\n", DEB_F_PREFIX_ARGS(SIP_CC_PROV, fname), info->mwi, info->mwi.pri_new_count); + CCAPP_DEBUG(DEB_F_PREFIX"returned pri_new count %d", DEB_F_PREFIX_ARGS(SIP_CC_PROV, fname), info->mwi.pri_new_count); return info->mwi.pri_new_count; } return 0; @@ -294,7 +294,7 @@ cc_uint32_t CCAPI_lineInfo_getMWIPrioOldMsgCount(cc_lineinfo_ref_t line) CCAPP_DEBUG(DEB_F_PREFIX"Entering\n", DEB_F_PREFIX_ARGS(SIP_CC_PROV, fname)); if ( info != NULL ) { - CCAPP_DEBUG(DEB_F_PREFIX"returned %d, pri old_count %d\n", DEB_F_PREFIX_ARGS(SIP_CC_PROV, fname), info->mwi, info->mwi.pri_old_count); + CCAPP_DEBUG(DEB_F_PREFIX"returned pri old_count %d", DEB_F_PREFIX_ARGS(SIP_CC_PROV, fname), info->mwi.pri_old_count); return info->mwi.pri_old_count; } return 0; diff --git a/media/webrtc/signaling/src/sipcc/core/ccapp/ccapi_snapshot.c b/media/webrtc/signaling/src/sipcc/core/ccapp/ccapi_snapshot.c index d177c097063..6bd5aeae40b 100644 --- a/media/webrtc/signaling/src/sipcc/core/ccapp/ccapi_snapshot.c +++ b/media/webrtc/signaling/src/sipcc/core/ccapp/ccapi_snapshot.c @@ -423,7 +423,7 @@ void ccsnap_gen_lineEvent(ccapi_line_event_e event, cc_lineid_t handle){ CCAPP_DEBUG(DEB_F_PREFIX"data->reg_state=%d \n", DEB_F_PREFIX_ARGS(SIP_CC_PROV, fname), line_info->reg_state); CCAPP_DEBUG(DEB_F_PREFIX"data->isCFWD=%d \n", DEB_F_PREFIX_ARGS(SIP_CC_PROV, fname), line_info->isCFWD); CCAPP_DEBUG(DEB_F_PREFIX"data->isLocalCFWD=%d \n", DEB_F_PREFIX_ARGS(SIP_CC_PROV, fname), line_info->isLocalCFWD); - CCAPP_DEBUG(DEB_F_PREFIX"data->mwi=%d \n", DEB_F_PREFIX_ARGS(SIP_CC_PROV, fname), line_info->mwi); + CCAPP_DEBUG(DEB_F_PREFIX"data->mwi=%d \n", DEB_F_PREFIX_ARGS(SIP_CC_PROV, fname), line_info->mwi.status); CCAPP_DEBUG(DEB_F_PREFIX"data->name=%s \n", DEB_F_PREFIX_ARGS(SIP_CC_PROV, fname), line_info->name); CCAPP_DEBUG(DEB_F_PREFIX"data->dn=%s \n", DEB_F_PREFIX_ARGS(SIP_CC_PROV, fname), line_info->dn); CCAPP_DEBUG(DEB_F_PREFIX"data->cfwd_dest=%s \n", DEB_F_PREFIX_ARGS(SIP_CC_PROV, fname), line_info->cfwd_dest); diff --git a/media/webrtc/signaling/src/sipcc/core/ccapp/ccapp_task.c b/media/webrtc/signaling/src/sipcc/core/ccapp/ccapp_task.c index 4785be4a1be..0c6b6093ed4 100644 --- a/media/webrtc/signaling/src/sipcc/core/ccapp/ccapp_task.c +++ b/media/webrtc/signaling/src/sipcc/core/ccapp/ccapp_task.c @@ -25,7 +25,7 @@ void addCcappListener(appListener* listener, int type) { listener_t *alistener = NULL; - CCAPP_DEBUG(DEB_F_PREFIX"Entered: listenr=0x%x, type=%d\n", DEB_F_PREFIX_ARGS(SIP_CC_PROV, "addCcappListener"), + CCAPP_DEBUG(DEB_F_PREFIX"Entered: listenr=%p, type=%d", DEB_F_PREFIX_ARGS(SIP_CC_PROV, "addCcappListener"), listener, type); if (listener == NULL) @@ -44,7 +44,7 @@ void addCcappListener(appListener* listener, int type) { alistener->listener_p = listener; sll_lite_link_tail(&sll_list, (sll_lite_node_t *)alistener); - CCAPP_DEBUG(DEB_F_PREFIX"Added: listenr=0x%x, type=%d\n", DEB_F_PREFIX_ARGS(SIP_CC_PROV, "addCcappListener"), + CCAPP_DEBUG(DEB_F_PREFIX"Added: listenr=%p, type=%d", DEB_F_PREFIX_ARGS(SIP_CC_PROV, "addCcappListener"), alistener->listener_p, alistener->type); } @@ -59,7 +59,7 @@ appListener *getCcappListener(int type) { iterator = sll_list.head_p; while (iterator) { temp_info = (listener_t *)iterator; - CCAPP_DEBUG(DEB_F_PREFIX"appid=%d, listener=0x%x\n", + CCAPP_DEBUG(DEB_F_PREFIX"appid=%d, listener=%p", DEB_F_PREFIX_ARGS(SIP_CC_PROV, fname), temp_info->type, temp_info->listener_p); if (temp_info->type == type) { { diff --git a/media/webrtc/signaling/src/sipcc/core/ccapp/ccprovider.c b/media/webrtc/signaling/src/sipcc/core/ccapp/ccprovider.c index 8e69da7a302..82b6669743a 100755 --- a/media/webrtc/signaling/src/sipcc/core/ccapp/ccprovider.c +++ b/media/webrtc/signaling/src/sipcc/core/ccapp/ccprovider.c @@ -1874,7 +1874,7 @@ static void freeRcvdInfo(session_rcvd_info_t *rcvdInfo) void dump_msg(char * name, unsigned int *msg, int len, unsigned int cmd) { int i,j; - CCAPP_DEBUG(DEB_F_PREFIX"\n%s %x %d cmd=%d\n", DEB_F_PREFIX_ARGS(SIP_CC_PROV, "dump_msg"), name, msg, len, cmd); + CCAPP_DEBUG(DEB_F_PREFIX"%s %p %d cmd=%d", DEB_F_PREFIX_ARGS(SIP_CC_PROV, "dump_msg"), name, msg, len, cmd); for ( j=0;j<10;j++) { for(i=0;i<16;i++) { CCAPP_DEBUG(DEB_F_PREFIX"%08X ", DEB_F_PREFIX_ARGS(SIP_CC_PROV, "dump_msg"), msg[i+j]); @@ -2043,7 +2043,7 @@ void ccp_handler(void* msg, int type) { length = strlen((const char*)rcvdInfo->info.generic_raw.message_body); if (data != NULL) { - CCAPP_DEBUG(DEB_F_PREFIX"rcvdInfo: addr=%x length=%d, xml=%s\n", + CCAPP_DEBUG(DEB_F_PREFIX"rcvdInfo: addr=%p length=%d, xml=%s", DEB_F_PREFIX_ARGS(SIP_CC_PROV, "CCAPI-CONFPARSE"), &data->call_conference, length, rcvdInfo->info.generic_raw.message_body); diff --git a/media/webrtc/signaling/src/sipcc/core/ccapp/conf_roster.c b/media/webrtc/signaling/src/sipcc/core/ccapp/conf_roster.c index 2cb1f268d9f..d9591b49090 100644 --- a/media/webrtc/signaling/src/sipcc/core/ccapp/conf_roster.c +++ b/media/webrtc/signaling/src/sipcc/core/ccapp/conf_roster.c @@ -175,7 +175,7 @@ void CCAPI_CallInfo_getConfParticipants (cc_callinfo_ref_t handle, cc_participan { if (participantIndex >= *count) { - CCAPP_ERROR(DEB_F_PREFIX"Not Enough Room Provided To List All Participants. Listed [%d] of [%d]\n", DEB_F_PREFIX_ARGS(SIP_CC_PROV, "CCAPI-CONF"), count, nodeCount); + CCAPP_ERROR(DEB_F_PREFIX"Not Enough Room Provided To List All Participants. Listed [%d] of [%d]", DEB_F_PREFIX_ARGS(SIP_CC_PROV, "CCAPI-CONF"), *count, nodeCount); return; } diff --git a/media/webrtc/signaling/src/sipcc/core/common/platform_api.c b/media/webrtc/signaling/src/sipcc/core/common/platform_api.c index 233ce10be60..ddb0770c4a7 100755 --- a/media/webrtc/signaling/src/sipcc/core/common/platform_api.c +++ b/media/webrtc/signaling/src/sipcc/core/common/platform_api.c @@ -288,7 +288,7 @@ shutdownCCAck (void) msg.featureID = CCAPP_SHUTDOWN_ACK; if ( ccappTaskPostMsg(CCAPP_SHUTDOWN_ACK, &msg, sizeof(feature_update_t), CCAPP_CCPROVIER) != CPR_SUCCESS ) { - CCAPP_ERROR(PLT_F_PREFIX"failed to send shutdownCCAck(%d) msg \n", fname); + CCAPP_ERROR(PLT_F_PREFIX"failed to send shutdownCCAck msg", fname); } } @@ -389,7 +389,7 @@ platform_logout_reset_req(void){ msg.featureID = CCAPP_LOGOUT_RESET; if ( ccappTaskPostMsg(CCAPP_FALLBACK_IND, &msg, sizeof(feature_update_t), CCAPP_CCPROVIER) != CPR_SUCCESS ) { - CCAPP_ERROR(PLT_F_PREFIX"failed to send Logout_Reset(%d) msg \n", fname); + CCAPP_ERROR(PLT_F_PREFIX"failed to send Logout_Reset msg", fname); } return; } diff --git a/media/webrtc/signaling/src/sipcc/core/common/ui.c b/media/webrtc/signaling/src/sipcc/core/common/ui.c index 38e20481c7c..8f059106e19 100755 --- a/media/webrtc/signaling/src/sipcc/core/common/ui.c +++ b/media/webrtc/signaling/src/sipcc/core/common/ui.c @@ -1608,7 +1608,7 @@ void ui_create_offer(call_events event, line_t nLine, callid_t nCallID, { va_list ap; - TNP_DEBUG(DEB_L_C_F_PREFIX"state=%d attr=%d call_instance=%d\n", + TNP_DEBUG(DEB_L_C_F_PREFIX"state=%d call_instance=%d", DEB_L_C_F_PREFIX_ARGS(UI_API, nLine, nCallID, __FUNCTION__), event, call_instance_id); diff --git a/media/webrtc/signaling/src/sipcc/core/gsm/ccapi.c b/media/webrtc/signaling/src/sipcc/core/gsm/ccapi.c index d800a8e9133..a567f610823 100755 --- a/media/webrtc/signaling/src/sipcc/core/gsm/ccapi.c +++ b/media/webrtc/signaling/src/sipcc/core/gsm/ccapi.c @@ -104,7 +104,7 @@ cc_get_msg_buf (int min_size) /* Clean out the data region of the message */ memset(buf, 0, min_size); - CC_DEBUG(DEB_F_PREFIX "Msg id = 0x%0x\n", DEB_F_PREFIX_ARGS(CC_API, __FUNCTION__), buf); + CC_DEBUG(DEB_F_PREFIX "Msg id = %p", DEB_F_PREFIX_ARGS(CC_API, __FUNCTION__), buf); return buf; } diff --git a/media/webrtc/signaling/src/sipcc/core/gsm/fsmb2bcnf.c b/media/webrtc/signaling/src/sipcc/core/gsm/fsmb2bcnf.c index e3c84f50736..63df8003a30 100755 --- a/media/webrtc/signaling/src/sipcc/core/gsm/fsmb2bcnf.c +++ b/media/webrtc/signaling/src/sipcc/core/gsm/fsmb2bcnf.c @@ -1186,7 +1186,7 @@ fsmb2bcnf_show_cmd (cc_int32_t argc, const char *argv[]) "\n"); FSM_FOR_ALL_CBS(ccb, fsmb2bcnf_ccbs, FSMCNF_MAX_CCBS) { - debugif_printf("%-2d %-6d 0x%08p %-11d %-11d %-6d %-7d\n", + debugif_printf("%-2d %-6d %p %-11d %-11d %-6d %-7d\n", i++, ccb->cnf_id, ccb, ccb->cnf_call_id, ccb->cns_call_id, ccb->active, ccb->bridged); } diff --git a/media/webrtc/signaling/src/sipcc/core/gsm/fsmcnf.c b/media/webrtc/signaling/src/sipcc/core/gsm/fsmcnf.c index 7f92bfc3677..16b61a257b5 100755 --- a/media/webrtc/signaling/src/sipcc/core/gsm/fsmcnf.c +++ b/media/webrtc/signaling/src/sipcc/core/gsm/fsmcnf.c @@ -347,7 +347,7 @@ fsmcnf_cleanup (fsm_fcb_t *fcb, int fname, boolean both) * Do not change softkey set if it is a transfer o */ if (ccb == NULL) { - GSM_DEBUG_ERROR(GSM_F_PREFIX"Failed to get CCB.\n", fname); + GSM_DEBUG_ERROR(GSM_F_PREFIX"Failed to get CCB.", __FUNCTION__); } else { cc_call_attribute(other_call_id, ccb->cnf_line, NORMAL_CALL); } diff --git a/media/webrtc/signaling/src/sipcc/core/gsm/gsm_sdp.c b/media/webrtc/signaling/src/sipcc/core/gsm/gsm_sdp.c index 3f26709d551..beebf3f7bd0 100644 --- a/media/webrtc/signaling/src/sipcc/core/gsm/gsm_sdp.c +++ b/media/webrtc/signaling/src/sipcc/core/gsm/gsm_sdp.c @@ -414,7 +414,7 @@ gsmsdp_alloc_media (void) if (media == NULL) { /* no free element from cache, allocate it from the pool */ media = cpr_malloc(sizeof(fsmdef_media_t)); - GSM_DEBUG(DEB_F_PREFIX"get from dynamic pool, media %x\n", + GSM_DEBUG(DEB_F_PREFIX"get from dynamic pool, media %p", DEB_F_PREFIX_ARGS(GSM, fname), media); } return (media); @@ -463,7 +463,7 @@ gsmsdp_free_media (fsmdef_media_t *media) } else { /* this element is from the dynamic pool, free it back */ cpr_free(media); - GSM_DEBUG(DEB_F_PREFIX"free media 0x%x to dynamic pool\n", + GSM_DEBUG(DEB_F_PREFIX"free media %p to dynamic pool", DEB_F_PREFIX_ARGS(GSM, fname), media); } } diff --git a/media/webrtc/signaling/src/sipcc/core/gsm/lsm.c b/media/webrtc/signaling/src/sipcc/core/gsm/lsm.c index 0f02e19b813..d1a42c1879b 100755 --- a/media/webrtc/signaling/src/sipcc/core/gsm/lsm.c +++ b/media/webrtc/signaling/src/sipcc/core/gsm/lsm.c @@ -380,7 +380,7 @@ void lsm_set_lcb_prevent_ringing (callid_t call_id) return; } - LSM_DEBUG(DEB_L_C_F_PREFIX"gcid=%d.\n", + LSM_DEBUG(DEB_L_C_F_PREFIX"gcid=%s", DEB_L_C_F_PREFIX_ARGS(LSM, lcb->line, call_id, "lsm_set_lcb_prevent_ringing"), gcid); FSM_FOR_ALL_CBS(lcb, lsm_lcbs, LSM_MAX_LCBS) { @@ -410,7 +410,7 @@ void lsm_remove_lcb_prevent_ringing (callid_t call_id) return; } - LSM_DEBUG(DEB_L_C_F_PREFIX"gcid=%d.\n", + LSM_DEBUG(DEB_L_C_F_PREFIX"gcid=%s", DEB_L_C_F_PREFIX_ARGS(LSM, lcb->line, call_id, "lsm_remove_lcb_prevent_ringing"), gcid); FSM_FOR_ALL_CBS(lcb, lsm_lcbs, LSM_MAX_LCBS) { @@ -418,7 +418,7 @@ void lsm_remove_lcb_prevent_ringing (callid_t call_id) if ((lcb->gcid != NULL) && (strncmp(gcid, lcb->gcid, CC_GCID_LEN) == 0)) { //FSM_RESET_FLAGS(lcb->flags, LSM_FLAGS_ANSWER_PENDING); lcb->flags = 0; - LSM_DEBUG(DEB_L_C_F_PREFIX"found ringing call, gcid=%d, lcb->flags=%d.\n", + LSM_DEBUG(DEB_L_C_F_PREFIX"found ringing call, gcid=%s, lcb->flags=%d.", DEB_L_C_F_PREFIX_ARGS(LSM, lcb->line, lcb->call_id, "lsm_remove_lcb_prevent_ringing"), gcid, lcb->flags); } break; @@ -1547,7 +1547,7 @@ void lsm_increment_call_chn_cnt (line_t line) } lsm_call_perline[line-1]++; - LSM_DEBUG(DEB_F_PREFIX"number of calls on line[%d]=%d" + LSM_DEBUG(DEB_F_PREFIX"number of calls on line[%d]=%d", DEB_F_PREFIX_ARGS(LSM, __FUNCTION__), line, lsm_call_perline[line-1]); } @@ -1571,7 +1571,7 @@ void lsm_decrement_call_chn_cnt (line_t line) lsm_call_perline[line-1]--; - LSM_DEBUG(DEB_F_PREFIX"number of calls on line[%d]=%d" + LSM_DEBUG(DEB_F_PREFIX"number of calls on line[%d]=%d", DEB_F_PREFIX_ARGS(LSM, __FUNCTION__), line, lsm_call_perline[line-1]); } @@ -2727,9 +2727,9 @@ lsm_set_beep_only_settings (fsmdef_dcb_t *dcb, vcm_tones_t *toneMode_p) */ if (sip_regmgr_get_cc_mode(dcb->line) == REG_MODE_CCM) { dcb->alerting_tone = VCM_CALL_WAITING_TONE; - LSM_DEBUG(DEB_F_PREFIX"%s - Overriding value in Alert-Info header as line %d is \ - connected to a Call Manager.\n", - DEB_F_PREFIX_ARGS(LSM, "lsm_set_beep_only_settings"), dcb->line); + LSM_DEBUG(DEB_F_PREFIX" - Overriding value in Alert-Info header as line %d is \ + connected to a Call Manager.", + DEB_F_PREFIX_ARGS(LSM, __FUNCTION__), dcb->line); } *toneMode_p = dcb->alerting_tone; switch (dcb->alerting_tone) { @@ -3520,10 +3520,10 @@ lsm_far_end_alerting (lsm_lcb_t *lcb, cc_state_data_far_end_alerting_t *data) continue; } LSM_DEBUG(DEB_L_C_F_PREFIX"direction_set:%d direction:%d" - " dest_addr:0x%x is_multicast:%d\n", + " dest_addr:%p is_multicast:%d", DEB_L_C_F_PREFIX_ARGS(LSM, dcb->line, dcb->call_id, fname), media->direction_set, - media->direction, media->dest_addr, + media->direction, &media->dest_addr, media->is_multicast); if (media->direction_set) { @@ -3758,11 +3758,11 @@ lsm_update_media (lsm_lcb_t *lcb, const char *caller_fname) for (i = 0; i < media->num_payloads; i++) { LSM_DEBUG(DEB_L_C_F_PREFIX"%d rx, tx refresh's are %d %d" - ", dir=%d, payload=%d addr=%s, multicast=%d\n", + ", dir=%d, payload=%p addr=%s, multicast=%d\n", DEB_L_C_F_PREFIX_ARGS(LSM, dcb->line, dcb->call_id, fname), media->refid, rx_refresh, tx_refresh, media->direction, - media->payloads[i], addr_str, media->is_multicast ); + &media->payloads[i], addr_str, media->is_multicast ); } } if (rx_refresh || diff --git a/media/webrtc/signaling/src/sipcc/core/gsm/sm.c b/media/webrtc/signaling/src/sipcc/core/gsm/sm.c index 80ba7a2f58b..399e9ba1347 100755 --- a/media/webrtc/signaling/src/sipcc/core/gsm/sm.c +++ b/media/webrtc/signaling/src/sipcc/core/gsm/sm.c @@ -39,7 +39,7 @@ sm_process_event (sm_table_t *tbl, sm_event_t *event) fsm_type = fcb->fsm_type; call_id = fcb->call_id; if ((hdlr = tbl->table[tbl->max_event * state_id + event_id]) != NULL) { - FSM_DEBUG_SM(DEB_F_PREFIX"%s %-4d: 0x%08lx: sm entry: (%s:%s)\n", + FSM_DEBUG_SM(DEB_F_PREFIX"%s %-4d: %px: sm entry: (%s:%s)", DEB_F_PREFIX_ARGS(FSM, fname), fsm_type_name(fsm_type), call_id, tbl->table[tbl->max_event * state_id + event_id], fsm_state_name(fsm_type, state_id), diff --git a/media/webrtc/signaling/src/sipcc/core/sipstack/ccsip_core.c b/media/webrtc/signaling/src/sipcc/core/sipstack/ccsip_core.c index 6533ea1f849..e8af95ccace 100644 --- a/media/webrtc/signaling/src/sipcc/core/sipstack/ccsip_core.c +++ b/media/webrtc/signaling/src/sipcc/core/sipstack/ccsip_core.c @@ -1268,7 +1268,7 @@ sip_redirect (ccsipCCB_t *ccb, sipMessage_t *response, uint16_t status_code) } else { CCSIP_DEBUG_ERROR(DEB_L_C_F_PREFIX"No memory left;" "Ignoring CC-Diversion header #%d %d\n", - 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, i + 1); } } @@ -2951,7 +2951,8 @@ ccsip_handle_idle_ev_sip_invite (ccsipCCB_t *ccb, sipSMEvent_t *event) } else { CCSIP_DEBUG_ERROR(DEB_L_C_F_PREFIX "No memory left; %d" "Can not create CC-Diversion header for CFWDAll\n", - ccb->dn_line, ccb->gsm_id, fname, ccb->index); + DEB_L_C_F_PREFIX_ARGS(SIP_TIMER, ccb->dn_line, ccb->gsm_id, fname), + ccb->index); } sipSPISendInviteResponse302(ccb); ccb->wait_for_ack = TRUE; @@ -6261,7 +6262,7 @@ sip_sm_process_event (sipSMEvent_t *pEvent) if ((event_handler = get_handler_index(ccb->state, pEvent->type)) != H_INVALID_EVENT) { - CCSIP_DEBUG_STATE(DEB_L_C_F_PREFIX"Processing SM event: %d: --0x%08lx--%21s: %s <- %s\n", + CCSIP_DEBUG_STATE(DEB_L_C_F_PREFIX"Processing SM event: %d: --%p--%21s: %s <- %s\n", DEB_L_C_F_PREFIX_ARGS(SIP_EVT, ccb->dn_line, ccb->gsm_id, fname), ccb->index, EVENT_ACTION_SM(event_handler), "", sip_util_state2string(ccb->state), @@ -6429,10 +6430,10 @@ sip_sm_process_cc_event (cprBuffer_t buf) event_handler = get_handler_index(sip_sm_event.ccb->state, sip_sm_event.type); if (event_handler != H_INVALID_EVENT) { - DEF_DEBUG(DEB_L_C_F_PREFIX"Processing CC event: %-6d: SM: %s <- %s\n", + DEF_DEBUG(DEB_L_C_F_PREFIX"Processing CC event: %p: SM: %s <- %s\n", DEB_L_C_F_PREFIX_ARGS(SIP_EVT, sip_sm_event.ccb->dn_line, sip_sm_event.ccb->gsm_id, fname), - (long)buf, + buf, sip_util_state2string(sip_sm_event.ccb->state), sip_util_event2string(sip_sm_event.type)); @@ -7471,7 +7472,7 @@ sip_sm_get_ccb_by_ccm_id_and_index (int ccmid, line_t idx) * that standby cucm has sent. Should not do much harm. */ DEF_DEBUG(DEB_F_PREFIX"ccb index has moved or cfg_table not initialized for the cucm=%s. " - "index=%d ccb=%d. Throwing away the msg.\n",DEB_F_PREFIX_ARGS(SIP_BRANCH, fname), + "index=%d ccb=%p. Throwing away the msg.\n",DEB_F_PREFIX_ARGS(SIP_BRANCH, fname), CCM_ID_PRINT(ccm_id), idx, ccb); ccb = NULL; } @@ -7672,7 +7673,7 @@ sip_sm_ccb_match_branch_cseq (ccsipCCB_t *ccb, } else { CCSIP_DEBUG_ERROR(SIP_L_C_F_PREFIX"Mismatched CSeq or" " Via's branch parameter in response:" - "ccb=0x%x,%d, cseq(trx,msg)=(%d,%d)," + "ccb=%p,%d, cseq(trx,msg)=(%d,%d)," "branch(trx,msg)=(%s,%s)\n", ccb->dn_line, ccb->gsm_id, fname, ccb, ccb->index, trx->cseq_number, sipCseq->number, @@ -9160,7 +9161,7 @@ sip_sm_request_check_and_store (ccsipCCB_t *ccb, sipMessage_t *request, if ((size_t) content_length != strlen(request->raw_body)) { CCSIP_DEBUG_ERROR(SIP_F_PREFIX"\n Mismatched Content length and " "Actual message body length:content length=%d\n" - "and message as %s\n and strlen of messagebody = %d\n", + "and message as %s\n and strlen of messagebody = %lu\n", fname, content_length, request->raw_body, strlen(request->raw_body)); *request_check_reason_code = SIP_WARN_MISC; @@ -10060,7 +10061,7 @@ void ccsip_handle_sentinvite_midcall_ev_sip_2xx (ccsipCCB_t *ccb, * Other features are not expected. */ CCSIP_DEBUG_ERROR(DEB_L_C_F_PREFIX"%d: unexpected feature %d\n", - 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->featuretype); sip_cc_feature_ack(ccb->gsm_id, ccb->dn_line, ccb->featuretype, NULL, CC_CAUSE_ERROR); diff --git a/media/webrtc/signaling/src/sipcc/core/sipstack/ccsip_info.c b/media/webrtc/signaling/src/sipcc/core/sipstack/ccsip_info.c index d58b022785a..274e9fc9101 100644 --- a/media/webrtc/signaling/src/sipcc/core/sipstack/ccsip_info.c +++ b/media/webrtc/signaling/src/sipcc/core/sipstack/ccsip_info.c @@ -679,7 +679,7 @@ ccsip_handle_info_package(ccsipCCB_t *ccb, sipMessage_t *pSipMessage) } else { /* No Info-Package header, but with body part(s) */ if (pSipMessage->num_body_parts > 1) { - CCSIP_DEBUG_MESSAGE(DEB_F_PREFIX"Multipart Info Package" + CCSIP_DEBUG_MESSAGE(DEB_F_PREFIX"Multipart Info Package", DEB_F_PREFIX_ARGS(SIP_INFO_PACKAGE, fname)); } diff --git a/media/webrtc/signaling/src/sipcc/core/sipstack/ccsip_platform_tcp.c b/media/webrtc/signaling/src/sipcc/core/sipstack/ccsip_platform_tcp.c index bbc09c32066..2209eb445fa 100644 --- a/media/webrtc/signaling/src/sipcc/core/sipstack/ccsip_platform_tcp.c +++ b/media/webrtc/signaling/src/sipcc/core/sipstack/ccsip_platform_tcp.c @@ -365,8 +365,8 @@ sip_tcp_purge_entry (sipSPIConnId_t connid) (void) sip_tcp_detach_socket(entry->fd); (void) sipSocketClose(entry->fd, secure); CCSIP_DEBUG_MESSAGE(DEB_F_PREFIX"Socket fd: %d closed for connid %ld with " - "address: %i, remote port: %u\n", - DEB_F_PREFIX_ARGS(SIP_TCP_MSG, fname), entry->fd, connid, entry->ipaddr, entry->port); + "address: %p, remote port: %u\n", + DEB_F_PREFIX_ARGS(SIP_TCP_MSG, fname), entry->fd, connid, &entry->ipaddr, entry->port); entry->fd = -1; /* Free the connection table entry in the BEGINNING ! */ sipTcpFlushRetrySendQueue(entry); @@ -855,7 +855,7 @@ sip_tcp_read_socket (cpr_socket_t this_fd) */ if ((nbytes + offset) > (MAX_PAYLOAD_SIZE + 1)) { - CCSIP_DEBUG_ERROR(SIP_F_PREFIX"Total SIP message size of %d " + CCSIP_DEBUG_ERROR(SIP_F_PREFIX"Total SIP message size of %lu " "bytes exceeds maximum of %d bytes", fname, (nbytes + offset), (MAX_PAYLOAD_SIZE + 1)); diff --git a/media/webrtc/signaling/src/sipcc/core/sipstack/ccsip_platform_timers.c b/media/webrtc/signaling/src/sipcc/core/sipstack/ccsip_platform_timers.c index 7de215d4481..b4efa41bc26 100644 --- a/media/webrtc/signaling/src/sipcc/core/sipstack/ccsip_platform_timers.c +++ b/media/webrtc/signaling/src/sipcc/core/sipstack/ccsip_platform_timers.c @@ -804,7 +804,7 @@ sip_platform_reg_all_fail_timer_start (uint32_t msec) return SIP_ERROR; } CCSIP_DEBUG_REG_STATE(DEB_F_PREFIX - "Timer started for %lu msecs\n", DEB_F_PREFIX_ARGS(SIP_TIMER, fname), msec); + "Timer started for %u msecs", DEB_F_PREFIX_ARGS(SIP_TIMER, fname), msec); return SIP_OK; } @@ -849,7 +849,7 @@ sip_platform_standby_keepalive_timer_start (uint32_t msec) return SIP_ERROR; } CCSIP_DEBUG_STATE(DEB_F_PREFIX - "Timer started for %lu msecs\n", DEB_F_PREFIX_ARGS(SIP_TIMER, fname), msec); + "Timer started for %u msecs", DEB_F_PREFIX_ARGS(SIP_TIMER, fname), msec); return SIP_OK; } @@ -882,7 +882,7 @@ sip_platform_unregistration_timer_start (uint32_t msec, boolean external) return SIP_ERROR; } CCSIP_DEBUG_STATE(DEB_F_PREFIX - "Timer started for %lu msecs\n", DEB_F_PREFIX_ARGS(SIP_TIMER, fname), msec); + "Timer started for %u msecs", DEB_F_PREFIX_ARGS(SIP_TIMER, fname), msec); return SIP_OK; } @@ -920,7 +920,7 @@ sip_platform_notify_timer_start (uint32_t msec) return SIP_ERROR; } CCSIP_DEBUG_STATE(DEB_F_PREFIX - "Timer started for %lu msecs\n", DEB_F_PREFIX_ARGS(SIP_TIMER, fname), msec); + "Timer started for %u msecs", DEB_F_PREFIX_ARGS(SIP_TIMER, fname), msec); return SIP_OK; } @@ -962,7 +962,7 @@ sip_platform_pass_through_timer_start (uint32_t sec) return SIP_ERROR; } - CCSIP_DEBUG_REG_STATE("%s: Regmgr Pass Through Timer started for %lu secs\n", fname, sec); + CCSIP_DEBUG_REG_STATE("%s: Regmgr Pass Through Timer started for %u secs", fname, sec); return SIP_OK; } diff --git a/media/webrtc/signaling/src/sipcc/core/sipstack/ccsip_pmh.c b/media/webrtc/signaling/src/sipcc/core/sipstack/ccsip_pmh.c index e298993c097..f2597fe7004 100644 --- a/media/webrtc/signaling/src/sipcc/core/sipstack/ccsip_pmh.c +++ b/media/webrtc/signaling/src/sipcc/core/sipstack/ccsip_pmh.c @@ -4701,7 +4701,7 @@ sippmh_parse_supported_require (const char *header, char **punsupported_tokens) size = strlen(header) + 1; temp_header = (char *) cpr_malloc(size); if (temp_header == NULL) { - CCSIP_DEBUG_ERROR("%s: malloc failed for strlen(header)=%d\n", fname, + CCSIP_DEBUG_ERROR("%s: malloc failed for strlen(header)=%lu", fname, strlen(header)); return tags; } diff --git a/media/webrtc/signaling/src/sipcc/core/sipstack/ccsip_register.c b/media/webrtc/signaling/src/sipcc/core/sipstack/ccsip_register.c index 8f79d62e609..c8703252bb8 100644 --- a/media/webrtc/signaling/src/sipcc/core/sipstack/ccsip_register.c +++ b/media/webrtc/signaling/src/sipcc/core/sipstack/ccsip_register.c @@ -2661,7 +2661,7 @@ ccsip_register_all_lines (void) * Assume CSPS since only those two for now. */ if (util_check_if_ip_valid(&(ccb->dest_sip_addr))) { - CCSIP_DEBUG_REG_STATE(DEB_L_C_F_PREFIX"%d, 0x%x\n", + CCSIP_DEBUG_REG_STATE(DEB_L_C_F_PREFIX"%d, %p", DEB_L_C_F_PREFIX_ARGS(SIP_REG, ccb->index, ccb->dn_line, fname), ndx, ccb); @@ -2699,7 +2699,7 @@ ccsip_register_all_lines (void) continue; } - CCSIP_DEBUG_REG_STATE(DEB_L_C_F_PREFIX"%d, 0x%x\n", + CCSIP_DEBUG_REG_STATE(DEB_L_C_F_PREFIX"%d, %p", DEB_L_C_F_PREFIX_ARGS(SIP_REG, ccb->index, ccb->dn_line, fname), ndx, ccb); @@ -2877,7 +2877,7 @@ ccsip_backup_register_commit (void) sip_sm_call_cleanup(ccb); if (util_check_if_ip_valid(&(ccb->dest_sip_addr))) { - CCSIP_DEBUG_REG_STATE(DEB_L_C_F_PREFIX"%d, 0x%x\n", + CCSIP_DEBUG_REG_STATE(DEB_L_C_F_PREFIX"%d, %p", DEB_L_C_F_PREFIX_ARGS(SIP_REG, ccb->index, ccb->dn_line, fname), ndx, ccb); ccb->reg.addr = ccb->dest_sip_addr; diff --git a/media/webrtc/signaling/src/sipcc/core/sipstack/ccsip_subsmanager.c b/media/webrtc/signaling/src/sipcc/core/sipstack/ccsip_subsmanager.c index 5189eb24c7d..1946502997a 100644 --- a/media/webrtc/signaling/src/sipcc/core/sipstack/ccsip_subsmanager.c +++ b/media/webrtc/signaling/src/sipcc/core/sipstack/ccsip_subsmanager.c @@ -371,7 +371,7 @@ handle_pending_requests (sipSCB_t *scbp) static void ccsip_api_subscribe_result (ccsip_sub_not_data_t * msg_data) { - CCSIP_DEBUG_TASK(DEB_F_PREFIX"Received Subscribe Response: request_id=%d, sub_id=%x\n", + CCSIP_DEBUG_TASK(DEB_F_PREFIX"Received Subscribe Response: request_id=%ld, sub_id=%x", DEB_F_PREFIX_ARGS(SIP_SUB_RESP, "ccsip_api_subscribe_result"), msg_data->request_id, msg_data->sub_id); if (msg_data->u.subs_result_data.status_code == REQUEST_TIMEOUT) { @@ -424,7 +424,7 @@ ccsip_api_notify_ind (ccsip_sub_not_data_t *msg) static const char *fname = "ccsip_api_notify_ind"; sipspi_msg_t not_resp; - CCSIP_DEBUG_TASK(DEB_F_PREFIX"Received Notify, request_id=%d, sub_id=%x\n",DEB_F_PREFIX_ARGS(SIP_SUB_RESP, fname), + CCSIP_DEBUG_TASK(DEB_F_PREFIX"Received Notify, request_id=%ld, sub_id=%x",DEB_F_PREFIX_ARGS(SIP_SUB_RESP, fname), msg->request_id, msg->sub_id); // Check out what's there in the notify indication @@ -1165,7 +1165,7 @@ allocate_scb (int *scb_index) */ subsManagerSCBS[i].sub_id = new_sub_id(i); CCSIP_DEBUG_TASK("allocate_scb scb_index: %d, currentScbsAllocated: %d, " - "maxScbsAllocated: %d, sub_id: %x\n", scb_index, + "maxScbsAllocated: %d, sub_id: %x", *scb_index, currentScbsAllocated, maxScbsAllocated, subsManagerSCBS[i].sub_id); /* @@ -2245,8 +2245,8 @@ subsmanager_handle_ev_app_subscription_terminated (cprBuffer_t buf) scbp = find_scb_by_sub_id(subs_term->sub_id, &scb_index); } if (scbp == NULL) { - CCSIP_DEBUG_ERROR(SIP_F_PREFIX"no SCB for sub_id=%x or request id %d" - " and eventPackage %d found\n", fname, + CCSIP_DEBUG_ERROR(SIP_F_PREFIX"no SCB for sub_id=%x or request id %ld" + " and eventPackage %d found", fname, subs_term->sub_id, subs_term->request_id, subs_term->eventPackage); return SIP_ERROR; @@ -2674,9 +2674,9 @@ subsmanager_handle_ev_sip_subscribe (sipMessage_t *pSipMessage, if (pSipMessage->raw_body) { if (content_length != strlen(pSipMessage->raw_body)) { CCSIP_DEBUG_ERROR(SIP_F_PREFIX"\n Mismatched Content length and \ - Actual message body length:content length=%d \ + Actual message body length:content length=%u \ \n and message as %s \ - \n and strlenof messagebody = %d\n", fname, + \n and strlenof messagebody = %lu", fname, content_length, pSipMessage->raw_body, strlen(pSipMessage->raw_body)); if (sipSPISendErrorResponse(pSipMessage, SIP_CLI_ERR_BAD_REQ, @@ -2996,8 +2996,8 @@ subsmanager_handle_ev_sip_subscribe (sipMessage_t *pSipMessage, // if any has been given to us if (scbp->min_expires != 0) { if (expiry_time < scbp->min_expires && expiry_time < 3600) { - CCSIP_DEBUG_ERROR(SIP_F_PREFIX"Too small expiry time: %d; " - "Min acceptable: %d.\n", fname, + CCSIP_DEBUG_ERROR(SIP_F_PREFIX"Too small expiry time: %lu; " + "Min acceptable: %lu.", fname, expiry_time, scbp->min_expires); if (sipSPISendErrorResponse(pSipMessage, @@ -3017,8 +3017,8 @@ subsmanager_handle_ev_sip_subscribe (sipMessage_t *pSipMessage, } if (scbp->max_expires != 0) { if (expiry_time > scbp->max_expires) { - CCSIP_DEBUG_ERROR(SIP_F_PREFIX"Too large expiry time: %d; " - "Max acceptable: %d.\n", fname, + CCSIP_DEBUG_ERROR(SIP_F_PREFIX"Too large expiry time: %lu; " + "Max acceptable: %lu.", fname, expiry_time, scbp->max_expires); // There doesn't seem to be any particular error code for // maximum expiry time so just return the generic error @@ -5259,7 +5259,7 @@ show_scbs_inuse () debugif_printf("SCB# %d, State = %d sub_id=%x\n", i, scbp->smState, scbp->sub_id); debugif_printf("SCB# %d, pendingClean=%d, internal=%d, eventPackage=%d, " - "norefersub=%d, subscriptionState=%d, expires=%d\n", i, + "norefersub=%d, subscriptionState=%d, expires=%ld", i, scbp->pendingClean, scbp->internal, scbp->hb.event_type, scbp->norefersub, scbp->subscription_state, scbp->hb.expires); debugif_printf("-----------------------------\n"); diff --git a/media/webrtc/signaling/src/sipcc/core/sipstack/ccsip_task.c b/media/webrtc/signaling/src/sipcc/core/sipstack/ccsip_task.c index e259eedc610..1f544e454bb 100644 --- a/media/webrtc/signaling/src/sipcc/core/sipstack/ccsip_task.c +++ b/media/webrtc/signaling/src/sipcc/core/sipstack/ccsip_task.c @@ -896,7 +896,7 @@ SIPTaskProcessListEvent (uint32_t cmd, void *msg, void *pUsr, uint16_t len) default: cpr_free(msg); - CCSIP_DEBUG_ERROR(SIP_F_PREFIX"Unknown message\n, fname"); + CCSIP_DEBUG_ERROR(SIP_F_PREFIX"Unknown message", fname); break; } return; diff --git a/media/webrtc/signaling/src/sipcc/core/sipstack/sip_common_regmgr.c b/media/webrtc/signaling/src/sipcc/core/sipstack/sip_common_regmgr.c index 72c14fb1b28..9d543d424c0 100644 --- a/media/webrtc/signaling/src/sipcc/core/sipstack/sip_common_regmgr.c +++ b/media/webrtc/signaling/src/sipcc/core/sipstack/sip_common_regmgr.c @@ -2653,7 +2653,7 @@ sip_regmgr_register_lines (boolean prime_only, boolean skip_prime) if (sip_config_check_line((line_t) (ndx - TEL_CCB_END))) { ccb = sip_sm_get_ccb_by_index(ndx); if (ccb) { - CCSIP_DEBUG_REG_STATE(DEB_L_C_F_PREFIX"%d, 0x%x\n", + CCSIP_DEBUG_REG_STATE(DEB_L_C_F_PREFIX"%d, %p", DEB_L_C_F_PREFIX_ARGS(SIP_REG, ccb->index, ccb->dn_line, fname), ndx, ccb); @@ -3395,7 +3395,7 @@ void regmgr_handle_register_update(line_t last_available_line) line_ccb = sip_sm_get_ccb_by_index(line_index); if (line_ccb) { if (sip_config_check_line(line_ccb->dn_line)) { - CCSIP_DEBUG_REG_STATE(DEB_L_C_F_PREFIX"%d: 0x%x\n", + CCSIP_DEBUG_REG_STATE(DEB_L_C_F_PREFIX"%d: %p", DEB_L_C_F_PREFIX_ARGS(SIP_CONFIG, line_ccb->index, line_ccb->dn_line, fname), line_index, line_ccb); } @@ -3413,7 +3413,7 @@ void regmgr_handle_register_update(line_t last_available_line) line_ccb = sip_sm_get_ccb_by_index(line_index); if (line_ccb) { if (sip_config_check_line(line_ccb->dn_line)) { - CCSIP_DEBUG_REG_STATE(DEB_L_C_F_PREFIX"%d: 0x%x\n", + CCSIP_DEBUG_REG_STATE(DEB_L_C_F_PREFIX"%d: %p", DEB_L_C_F_PREFIX_ARGS(SIP_CONFIG, line_ccb->index, line_ccb->dn_line, fname), line_index, line_ccb); diff --git a/media/webrtc/signaling/src/sipcc/core/sipstack/sip_common_transport.c b/media/webrtc/signaling/src/sipcc/core/sipstack/sip_common_transport.c index 86b5e690da2..b1276c5c160 100644 --- a/media/webrtc/signaling/src/sipcc/core/sipstack/sip_common_transport.c +++ b/media/webrtc/signaling/src/sipcc/core/sipstack/sip_common_transport.c @@ -509,7 +509,7 @@ sip_transport_setup_cc_conn (line_t dn, CCM_ID ccm_id) (CCM_Config_Table[dn - 1][ccm_id]->ti_common.conn_type == CONN_TLS)) { uint32_t port = 0; - CCSIP_DEBUG_TASK(DEB_F_PREFIX"server_ipaddr %d \n", DEB_F_PREFIX_ARGS(SIP_TRANS, fname), server_ipaddr); + CCSIP_DEBUG_TASK(DEB_F_PREFIX"server_ipaddr %p", DEB_F_PREFIX_ARGS(SIP_TRANS, fname), &server_ipaddr); sip_msg.createConnMsg.addr = server_ipaddr; config_get_value(ccm_config_id_port[ccm_id], &port, sizeof(port)); @@ -2132,7 +2132,7 @@ sipTransportClearServerHandle (cpr_ip_addr_t *ipaddr, uint16_t port, int connid) ti_common_t *ti_common; CCM_ID cc_index; - CCSIP_DEBUG_TASK(DEB_F_PREFIX"addr 0x%x port %d connid %d\n", + CCSIP_DEBUG_TASK(DEB_F_PREFIX"addr %p port %d connid %d", DEB_F_PREFIX_ARGS(SIP_TRANS, "sipTransportClearServerHandle"), ipaddr, port, connid); for (cc_index = PRIMARY_CCM; cc_index < MAX_CCM; cc_index++) { ti_common = &CCM_Device_Specific_Config_Table[cc_index].ti_common; diff --git a/media/webrtc/signaling/src/sipcc/core/sipstack/sip_platform_task.c b/media/webrtc/signaling/src/sipcc/core/sipstack/sip_platform_task.c index eb577281967..a90d24b3eed 100644 --- a/media/webrtc/signaling/src/sipcc/core/sipstack/sip_platform_task.c +++ b/media/webrtc/signaling/src/sipcc/core/sipstack/sip_platform_task.c @@ -446,7 +446,7 @@ static void sip_process_int_msg (void) sizeof(response), 0, (cpr_sockaddr_t *)&sip_clnt_sock_addr, cpr_sun_len(sip_clnt_sock_addr)) < 0) { - CCSIP_DEBUG_ERROR(SIP_F_PREFIX"%d sending IPC\n", fname); + CCSIP_DEBUG_ERROR(SIP_F_PREFIX"sending IPC", fname); } } diff --git a/media/webrtc/signaling/src/sipcc/core/src-common/kpmlmap.c b/media/webrtc/signaling/src/sipcc/core/src-common/kpmlmap.c index 3a615edf968..b8713c79de8 100755 --- a/media/webrtc/signaling/src/sipcc/core/src-common/kpmlmap.c +++ b/media/webrtc/signaling/src/sipcc/core/src-common/kpmlmap.c @@ -137,7 +137,7 @@ kpml_create_sm_key (kpml_key_t *key_p, line_t line, callid_t call_id, { static const char fname[] = "kpml_create_sm_key"; - KPML_DEBUG(DEB_L_C_F_PREFIX" timer=0x%0x\n", + KPML_DEBUG(DEB_L_C_F_PREFIX" timer=%p", DEB_L_C_F_PREFIX_ARGS(KPML_INFO, line, call_id, fname), tmr_ptr); key_p->line = line; @@ -626,8 +626,8 @@ kpml_inter_digit_timer_event (void **kpml_key_p) const char fname[] = "kpml_inter_digit_timer_callback"; kpml_data_t *kpml_data; - KPML_DEBUG("%s: kpml_id=%d \n ", - fname, (long)*kpml_key_p); + KPML_DEBUG("%s: kpml_id=%p", + fname, *kpml_key_p); kpml_data = kpml_get_kpml_data_from_kpml_id((long)*kpml_key_p); @@ -660,7 +660,7 @@ kpml_start_subscription_timer (kpml_data_t * kpml_data, unsigned long duration) { static const char fname[] = "kpml_start_subscription_timer"; - KPML_DEBUG(DEB_L_C_F_PREFIX"duration=%u\n", + KPML_DEBUG(DEB_L_C_F_PREFIX"duration=%lu", DEB_L_C_F_PREFIX_ARGS(KPML_INFO, kpml_data->line, kpml_data->call_id, fname), duration); kpml_data->sub_timer = cprCreateTimer("sub timer", @@ -716,8 +716,8 @@ kpml_subscription_timer_event (void **kpml_key_p) static const char fname[] = "kpml_subscription_timer_event"; kpml_data_t *kpml_data; - KPML_DEBUG("%s: kpml_id=%d \n ", - fname, (long)*kpml_key_p); + KPML_DEBUG("%s: kpml_id=%p", + fname, *kpml_key_p); kpml_data = kpml_get_kpml_data_from_kpml_id((long)*kpml_key_p); @@ -1275,7 +1275,7 @@ kpml_treat_regex (kpml_data_t *kpml_data) kpml_data->enable_backspace = FALSE; - KPML_DEBUG(DEB_L_C_F_PREFIX"regex=%u\n", + KPML_DEBUG(DEB_L_C_F_PREFIX"regex=%s", DEB_L_C_F_PREFIX_ARGS(KPML_INFO, kpml_data->line, kpml_data->call_id, fname), kpml_data->regex[indx].regexData); @@ -1374,9 +1374,9 @@ kpml_update_data (kpml_data_t *kpml_data, KPMLRequest *kpml_sub_data) kpml_data->nopartial = kpml_sub_data->pattern.nopartial; - KPML_DEBUG(DEB_L_C_F_PREFIX"regex=%u" - "persistent=%d int-timer=%u critic-timer=%u, extra-timer=%u" - "flush=%d longhold=%d longrepeat=%d nopartial=%d\n", + KPML_DEBUG(DEB_L_C_F_PREFIX"regex=%p" + "persistent=%d int-timer=%lu critic-timer=%lu, extra-timer=%lu" + "flush=%d longhold=%d longrepeat=%d nopartial=%d", DEB_L_C_F_PREFIX_ARGS(KPML_INFO, kpml_data->line, kpml_data->call_id, fname), kpml_data->regex, kpml_data->persistent, kpml_data->inttimeout, kpml_data->crittimeout, kpml_data->extratimeout, @@ -1845,7 +1845,7 @@ kpmlmap_show (void) while (kpml_data != NULL) { - KPML_DEBUG(DEB_L_C_F_PREFIX"Pending sub duration=%-8d", + KPML_DEBUG(DEB_L_C_F_PREFIX"Pending sub duration=%lu", DEB_L_C_F_PREFIX_ARGS(KPML_INFO, kpml_data->line, kpml_data->call_id, fname), kpml_data->sub_duration); diff --git a/media/webrtc/signaling/src/sipcc/core/src-common/pres_sub_not_handler.c b/media/webrtc/signaling/src/sipcc/core/src-common/pres_sub_not_handler.c index 4fb0cd6c6aa..5a71ccbb217 100755 --- a/media/webrtc/signaling/src/sipcc/core/src-common/pres_sub_not_handler.c +++ b/media/webrtc/signaling/src/sipcc/core/src-common/pres_sub_not_handler.c @@ -1151,7 +1151,7 @@ pres_process_msg_from_msgq (uint32_t cmd, void *msg_p) static const char fname[] = "pres_process_msg_from_msgq"; pres_req_msg *pres_req_p; - BLF_DEBUG(DEB_F_PREFIX"Entering (cmd=%d, msg_p=0x%X)\n", + BLF_DEBUG(DEB_F_PREFIX"Entering (cmd=%d, msg_p=%p)", DEB_F_PREFIX_ARGS(BLF, fname), cmd, msg_p); switch (cmd) { diff --git a/media/webrtc/signaling/src/softphonewrapper/CC_SIPCCService.cpp b/media/webrtc/signaling/src/softphonewrapper/CC_SIPCCService.cpp index 7c083c15f89..37998076424 100644 --- a/media/webrtc/signaling/src/softphonewrapper/CC_SIPCCService.cpp +++ b/media/webrtc/signaling/src/softphonewrapper/CC_SIPCCService.cpp @@ -560,7 +560,7 @@ void CC_SIPCCService::endAllActiveCalls() { CC_DeviceInfoPtr deviceInfo = device->getDeviceInfo(); vector calls = deviceInfo->getCalls(); - CSFLogInfo( logTag, "endAllActiveCalls(): %d calls to be ended.", calls.size()); + CSFLogInfo( logTag, "endAllActiveCalls(): %lu calls to be ended.", calls.size()); for(vector::iterator it = calls.begin(); it != calls.end(); it++) { // For each active call, if it can be ended, do so. @@ -651,7 +651,7 @@ void CC_SIPCCService::onFeatureEvent(ccapi_device_event_e type, cc_deviceinfo_re CC_FeatureInfoPtr infoPtr = CC_SIPCCFeatureInfo::wrap(feature_info).get(); if (infoPtr == NULL) { - CSFLogError( logTag, "Unable to notify call observers for feature info handle (%u), as failed to create CC_FeatureInfoPtr", feature_info); + CSFLogError( logTag, "Unable to notify call observers for feature info handle (%p), as failed to create CC_FeatureInfoPtr", feature_info); return; } @@ -686,7 +686,7 @@ void CC_SIPCCService::onLineEvent(ccapi_line_event_e eventType, cc_lineid_t line return; } - CSFLogInfo( logTag, "onLineEvent(%s, %s, [%d|%s]", + CSFLogInfo( logTag, "onLineEvent(%s, %s, [%s|%s]", line_event_getname(eventType), linePtr->toString().c_str(), infoPtr->getNumber().c_str(), (infoPtr->getRegState() ? "INS" : "OOS")); _self->notifyLineEventObservers(eventType, linePtr, infoPtr); @@ -792,7 +792,7 @@ void CC_SIPCCService::notifyCallEventObservers (ccapi_call_event_e eventType, CC // method are not safe except from ccapp_thread. void CC_SIPCCService::registerStream(cc_call_handle_t call, int streamId, bool isVideo) { - CSFLogDebug( logTag, "registerStream for call: %d strId=%s video=%s", + CSFLogDebug( logTag, "registerStream for call: %d strId=%d video=%s", call, streamId, isVideo ? "TRUE" : "FALSE"); // get the object corresponding to the handle CC_SIPCCCallPtr callPtr = CC_SIPCCCall::wrap(call);