diff options
Diffstat (limited to 'pjsip/src/pjsua-lib')
| -rw-r--r-- | pjsip/src/pjsua-lib/pjsua_acc.c | 1 | ||||
| -rw-r--r-- | pjsip/src/pjsua-lib/pjsua_call.c | 10 | ||||
| -rw-r--r-- | pjsip/src/pjsua-lib/pjsua_core.c | 14 | ||||
| -rw-r--r-- | pjsip/src/pjsua-lib/pjsua_dump.c | 4 | ||||
| -rw-r--r-- | pjsip/src/pjsua-lib/pjsua_media.c | 8 |
5 files changed, 16 insertions, 21 deletions
diff --git a/pjsip/src/pjsua-lib/pjsua_acc.c b/pjsip/src/pjsua-lib/pjsua_acc.c index 8e327ee5..9f83431f 100644 --- a/pjsip/src/pjsua-lib/pjsua_acc.c +++ b/pjsip/src/pjsua-lib/pjsua_acc.c @@ -2536,7 +2536,6 @@ PJ_DEF(pj_status_t) pjsua_acc_set_registration( pjsua_acc_id acc_id, &tdata); if (0 && status == PJ_SUCCESS && pjsua_var.acc[acc_id].cred_cnt) { - pjsua_acc *acc = &pjsua_var.acc[acc_id]; pjsip_authorization_hdr *h; char *uri; int d; diff --git a/pjsip/src/pjsua-lib/pjsua_call.c b/pjsip/src/pjsua-lib/pjsua_call.c index 03d90547..0c8e872a 100644 --- a/pjsip/src/pjsua-lib/pjsua_call.c +++ b/pjsip/src/pjsua-lib/pjsua_call.c @@ -4510,12 +4510,12 @@ static void on_call_transferred( pjsip_inv_session *inv, /* * Always answer with 2xx. */ - pjsip_tx_data *tdata; + pjsip_tx_data *tdata2; const pj_str_t str_false = { "false", 5}; pjsip_hdr *hdr; status = pjsip_dlg_create_response(inv->dlg, rdata, code, NULL, - &tdata); + &tdata2); if (status != PJ_SUCCESS) { pjsua_perror(THIS_FILE, "Unable to create 2xx response to REFER", status); @@ -4524,14 +4524,14 @@ static void on_call_transferred( pjsip_inv_session *inv, /* Add Refer-Sub header */ hdr = (pjsip_hdr*) - pjsip_generic_string_hdr_create(tdata->pool, &str_refer_sub, + pjsip_generic_string_hdr_create(tdata2->pool, &str_refer_sub, &str_false); - pjsip_msg_add_hdr(tdata->msg, hdr); + pjsip_msg_add_hdr(tdata2->msg, hdr); /* Send answer */ status = pjsip_dlg_send_response(inv->dlg, pjsip_rdata_get_tsx(rdata), - tdata); + tdata2); if (status != PJ_SUCCESS) { pjsua_perror(THIS_FILE, "Unable to create 2xx response to REFER", status); diff --git a/pjsip/src/pjsua-lib/pjsua_core.c b/pjsip/src/pjsua-lib/pjsua_core.c index a599bd45..c3e919df 100644 --- a/pjsip/src/pjsua-lib/pjsua_core.c +++ b/pjsip/src/pjsua-lib/pjsua_core.c @@ -906,7 +906,7 @@ PJ_DEF(pj_status_t) pjsua_init( const pjsua_config *ua_cfg, */ if (ua_cfg->nameserver_count) { #if PJSIP_HAS_RESOLVER - unsigned i; + unsigned ii; /* Create DNS resolver */ status = pjsip_endpt_create_resolver(pjsua_var.endpt, @@ -933,10 +933,10 @@ PJ_DEF(pj_status_t) pjsua_init( const pjsua_config *ua_cfg, } /* Print nameservers */ - for (i=0; i<ua_cfg->nameserver_count; ++i) { + for (ii=0; ii<ua_cfg->nameserver_count; ++ii) { PJ_LOG(4,(THIS_FILE, "Nameserver %.*s added", - (int)ua_cfg->nameserver[i].slen, - ua_cfg->nameserver[i].ptr)); + (int)ua_cfg->nameserver[ii].slen, + ua_cfg->nameserver[ii].ptr)); } #else PJ_LOG(2,(THIS_FILE, @@ -1099,14 +1099,14 @@ PJ_DEF(pj_status_t) pjsua_init( const pjsua_config *ua_cfg, /* Start worker thread if needed. */ if (pjsua_var.ua_cfg.thread_cnt) { - unsigned i; + unsigned ii; if (pjsua_var.ua_cfg.thread_cnt > PJ_ARRAY_SIZE(pjsua_var.thread)) pjsua_var.ua_cfg.thread_cnt = PJ_ARRAY_SIZE(pjsua_var.thread); - for (i=0; i<pjsua_var.ua_cfg.thread_cnt; ++i) { + for (ii=0; ii<pjsua_var.ua_cfg.thread_cnt; ++ii) { status = pj_thread_create(pjsua_var.pool, "pjsua", &worker_thread, - NULL, 0, 0, &pjsua_var.thread[i]); + NULL, 0, 0, &pjsua_var.thread[ii]); if (status != PJ_SUCCESS) goto on_error; } diff --git a/pjsip/src/pjsua-lib/pjsua_dump.c b/pjsip/src/pjsua-lib/pjsua_dump.c index d9abbb7d..b631bae2 100644 --- a/pjsip/src/pjsua-lib/pjsua_dump.c +++ b/pjsip/src/pjsua-lib/pjsua_dump.c @@ -371,10 +371,6 @@ static void dump_media_session(const char *indent, /* Get and ICE SRTP status */ if (call_med->tp) { - pjmedia_transport_info tp_info; - - pjmedia_transport_info_init(&tp_info); - pjmedia_transport_get_info(call_med->tp, &tp_info); if (tp_info.specific_info_cnt > 0) { unsigned j; for (j = 0; j < tp_info.specific_info_cnt; ++j) { diff --git a/pjsip/src/pjsua-lib/pjsua_media.c b/pjsip/src/pjsua-lib/pjsua_media.c index 2bd856a4..53938cbd 100644 --- a/pjsip/src/pjsua-lib/pjsua_media.c +++ b/pjsip/src/pjsua-lib/pjsua_media.c @@ -439,12 +439,12 @@ static pj_status_t create_rtp_rtcp_sock(pjsua_call_media *call_med, } else { if (acc->cfg.allow_sdp_nat_rewrite && acc->reg_mapped_addr.slen) { - pj_status_t status; + pj_status_t status2; /* Take the address from mapped addr as seen by registrar */ - status = pj_sockaddr_set_str_addr(af, &bound_addr, - &acc->reg_mapped_addr); - if (status != PJ_SUCCESS) { + status2 = pj_sockaddr_set_str_addr(af, &bound_addr, + &acc->reg_mapped_addr); + if (status2 != PJ_SUCCESS) { /* just leave bound_addr with whatever it was pj_bzero(pj_sockaddr_get_addr(&bound_addr), pj_sockaddr_get_addr_len(&bound_addr)); |