From 7ffa781dc39a7274692d8db11043b3a9e92e36ce Mon Sep 17 00:00:00 2001 From: Nanang Izzuddin Date: Tue, 25 Aug 2015 08:45:46 +0000 Subject: Re #1881: Fixed compile warnings on VS2015 about declaration hides previous declaration. git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@5170 74dad513-b988-da41-8d7b-12977e46ad98 --- pjsip/src/pjsip-simple/publishc.c | 10 +++++----- pjsip/src/pjsip/sip_dialog.c | 20 ++++++++++---------- pjsip/src/pjsip/sip_multipart.c | 6 +++--- pjsip/src/pjsip/sip_parser.c | 30 +++++++++++++++--------------- pjsip/src/pjsip/sip_tel_uri.c | 1 - pjsip/src/pjsip/sip_transport_tcp.c | 6 ++++-- pjsip/src/pjsua-lib/pjsua_acc.c | 1 - pjsip/src/pjsua-lib/pjsua_call.c | 10 +++++----- pjsip/src/pjsua-lib/pjsua_core.c | 14 +++++++------- pjsip/src/pjsua-lib/pjsua_dump.c | 4 ---- pjsip/src/pjsua-lib/pjsua_media.c | 8 ++++---- pjsip/src/pjsua2/call.cpp | 4 ++-- pjsip/src/pjsua2/media.cpp | 2 +- pjsip/src/pjsua2/siptypes.cpp | 22 +++++++++++----------- pjsip/src/test/dns_test.c | 18 +++++++++--------- pjsip/src/test/tsx_uas_test.c | 4 ++-- 16 files changed, 78 insertions(+), 82 deletions(-) (limited to 'pjsip/src') diff --git a/pjsip/src/pjsip-simple/publishc.c b/pjsip/src/pjsip-simple/publishc.c index fcb412dd..dd4e8cdb 100644 --- a/pjsip/src/pjsip-simple/publishc.c +++ b/pjsip/src/pjsip-simple/publishc.c @@ -434,14 +434,14 @@ static pj_status_t create_request(pjsip_publishc *pubc, /* Add user headers */ if (!pj_list_empty(&pubc->usr_hdr)) { - const pjsip_hdr *hdr; + const pjsip_hdr *uhdr; - hdr = pubc->usr_hdr.next; - while (hdr != &pubc->usr_hdr) { + uhdr = pubc->usr_hdr.next; + while (uhdr != &pubc->usr_hdr) { pjsip_hdr *new_hdr = (pjsip_hdr*) - pjsip_hdr_shallow_clone(tdata->pool, hdr); + pjsip_hdr_shallow_clone(tdata->pool, uhdr); pjsip_msg_add_hdr(tdata->msg, new_hdr); - hdr = hdr->next; + uhdr = uhdr->next; } } diff --git a/pjsip/src/pjsip/sip_dialog.c b/pjsip/src/pjsip/sip_dialog.c index 3ca4a1b6..4066d738 100644 --- a/pjsip/src/pjsip/sip_dialog.c +++ b/pjsip/src/pjsip/sip_dialog.c @@ -242,25 +242,25 @@ PJ_DEF(pj_status_t) pjsip_dlg_create_uac( pjsip_user_agent *ua, pjsip_sip_uri *sip_uri = (pjsip_sip_uri *) pjsip_uri_get_uri(dlg->remote.info->uri); if (!pj_list_empty(&sip_uri->header_param)) { - pj_str_t tmp; + pj_str_t tmp2; /* Remove all header param */ pj_list_init(&sip_uri->header_param); /* Print URI */ - tmp.ptr = (char*) pj_pool_alloc(dlg->pool, + tmp2.ptr = (char*) pj_pool_alloc(dlg->pool, dlg->remote.info_str.slen); - tmp.slen = pjsip_uri_print(PJSIP_URI_IN_FROMTO_HDR, - sip_uri, tmp.ptr, + tmp2.slen = pjsip_uri_print(PJSIP_URI_IN_FROMTO_HDR, + sip_uri, tmp2.ptr, dlg->remote.info_str.slen); - if (tmp.slen < 1) { + if (tmp2.slen < 1) { status = PJSIP_EURITOOLONG; goto on_error; } /* Assign remote.info_str */ - dlg->remote.info_str = tmp; + dlg->remote.info_str = tmp2; } } @@ -391,12 +391,12 @@ PJ_DEF(pj_status_t) pjsip_dlg_create_uas( pjsip_user_agent *ua, * MUST be a SIPS URI. */ if (contact) { - pj_str_t tmp; + pj_str_t tmp2; - pj_strdup_with_null(dlg->pool, &tmp, contact); + pj_strdup_with_null(dlg->pool, &tmp2, contact); dlg->local.contact = (pjsip_contact_hdr*) - pjsip_parse_hdr(dlg->pool, &HCONTACT, tmp.ptr, - tmp.slen, NULL); + pjsip_parse_hdr(dlg->pool, &HCONTACT, tmp2.ptr, + tmp2.slen, NULL); if (!dlg->local.contact) { status = PJSIP_EINVALIDURI; goto on_error; diff --git a/pjsip/src/pjsip/sip_multipart.c b/pjsip/src/pjsip/sip_multipart.c index 9bd64966..9c7aea64 100644 --- a/pjsip/src/pjsip/sip_multipart.c +++ b/pjsip/src/pjsip/sip_multipart.c @@ -592,10 +592,10 @@ PJ_DEF(pjsip_msg_body*) pjsip_multipart_parse(pj_pool_t *pool, curptr = buf; endptr = buf + len; { - pj_str_t body; + pj_str_t strbody; - body.ptr = buf; body.slen = len; - curptr = pj_strstr(&body, &delim); + strbody.ptr = buf; strbody.slen = len; + curptr = pj_strstr(&strbody, &delim); if (!curptr) return NULL; } diff --git a/pjsip/src/pjsip/sip_parser.c b/pjsip/src/pjsip/sip_parser.c index 33db355a..c808c0de 100644 --- a/pjsip/src/pjsip/sip_parser.c +++ b/pjsip/src/pjsip/sip_parser.c @@ -674,7 +674,7 @@ static pjsip_parse_hdr_func* find_handler(const pj_str_t *hname) pj_uint32_t hash; char hname_copy[PJSIP_MAX_HNAME_LEN]; pj_str_t tmp; - pjsip_parse_hdr_func *handler; + pjsip_parse_hdr_func *func; if (hname->slen >= PJSIP_MAX_HNAME_LEN) { /* Guaranteed not to be able to find handler. */ @@ -683,9 +683,9 @@ static pjsip_parse_hdr_func* find_handler(const pj_str_t *hname) /* First, common case, try to find handler with exact name */ hash = pj_hash_calc(0, hname->ptr, (unsigned)hname->slen); - handler = find_handler_imp(hash, hname); - if (handler) - return handler; + func = find_handler_imp(hash, hname); + if (func) + return func; /* If not found, try converting the header name to lowercase and @@ -980,7 +980,7 @@ retry_parse: parse_headers: /* Parse headers. */ do { - pjsip_parse_hdr_func * handler; + pjsip_parse_hdr_func * func; pjsip_hdr *hdr = NULL; /* Init hname just in case parsing fails. @@ -995,14 +995,14 @@ parse_headers: } /* Find handler. */ - handler = find_handler(&hname); + func = find_handler(&hname); /* Call the handler if found. * If no handler is found, then treat the header as generic * hname/hvalue pair. */ - if (handler) { - hdr = (*handler)(ctx); + if (func) { + hdr = (*func)(ctx); /* Note: * hdr MAY BE NULL, if parsing does not yield a new header @@ -2262,9 +2262,9 @@ PJ_DEF(void*) pjsip_parse_hdr( pj_pool_t *pool, const pj_str_t *hname, context.rdata = NULL; PJ_TRY { - pjsip_parse_hdr_func *handler = find_handler(hname); - if (handler) { - hdr = (*handler)(&context); + pjsip_parse_hdr_func *func = find_handler(hname); + if (func) { + hdr = (*func)(&context); } else { hdr = parse_hdr_generic_string(&context); hdr->type = PJSIP_H_OTHER; @@ -2310,7 +2310,7 @@ retry_parse: { /* Parse headers. */ do { - pjsip_parse_hdr_func * handler; + pjsip_parse_hdr_func * func; pjsip_hdr *hdr = NULL; /* Init hname just in case parsing fails. @@ -2325,14 +2325,14 @@ retry_parse: } /* Find handler. */ - handler = find_handler(&hname); + func = find_handler(&hname); /* Call the handler if found. * If no handler is found, then treat the header as generic * hname/hvalue pair. */ - if (handler) { - hdr = (*handler)(&ctx); + if (func) { + hdr = (*func)(&ctx); } else { hdr = parse_hdr_generic_string(&ctx); hdr->name = hdr->sname = hname; diff --git a/pjsip/src/pjsip/sip_tel_uri.c b/pjsip/src/pjsip/sip_tel_uri.c index 466a6995..299bc0f3 100644 --- a/pjsip/src/pjsip/sip_tel_uri.c +++ b/pjsip/src/pjsip/sip_tel_uri.c @@ -399,7 +399,6 @@ static void* tel_uri_parse( pj_scanner *scanner, pj_pool_t *pool, /* Get all parameters. */ if (parse_params && *scanner->curptr==';') { pj_str_t pname, pvalue; - const pjsip_parser_const_t *pc = pjsip_parser_const(); do { /* Eat the ';' separator. */ diff --git a/pjsip/src/pjsip/sip_transport_tcp.c b/pjsip/src/pjsip/sip_transport_tcp.c index 839d3294..d2e0a28b 100644 --- a/pjsip/src/pjsip/sip_transport_tcp.c +++ b/pjsip/src/pjsip/sip_transport_tcp.c @@ -1183,7 +1183,8 @@ static pj_bool_t on_accept_complete(pj_activesock_t *asock, } /* Start keep-alive timer */ if (pjsip_cfg()->tcp.keep_alive_interval) { - pj_time_val delay = {pjsip_cfg()->tcp.keep_alive_interval, 0}; + pj_time_val delay = { 0 }; + delay.sec = pjsip_cfg()->tcp.keep_alive_interval; pjsip_endpt_schedule_timer(listener->endpt, &tcp->ka_timer, &delay); @@ -1542,7 +1543,8 @@ static pj_bool_t on_connect_complete(pj_activesock_t *asock, /* Start keep-alive timer */ if (pjsip_cfg()->tcp.keep_alive_interval) { - pj_time_val delay = { pjsip_cfg()->tcp.keep_alive_interval, 0 }; + pj_time_val delay = { 0 }; + delay.sec = pjsip_cfg()->tcp.keep_alive_interval; pjsip_endpt_schedule_timer(tcp->base.endpt, &tcp->ka_timer, &delay); tcp->ka_timer.id = PJ_TRUE; 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; inameserver_count; ++i) { + for (ii=0; iinameserver_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; itp) { - 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)); diff --git a/pjsip/src/pjsua2/call.cpp b/pjsip/src/pjsua2/call.cpp index f0bba738..ab6fdda7 100644 --- a/pjsip/src/pjsua2/call.cpp +++ b/pjsip/src/pjsua2/call.cpp @@ -152,9 +152,9 @@ public: }; -void CallAudioMedia::setPortId(int id) +void CallAudioMedia::setPortId(int pid) { - this->id = id; + this->id = pid; } CallOpParam::CallOpParam(bool useDefaultCallSetting) diff --git a/pjsip/src/pjsua2/media.cpp b/pjsip/src/pjsua2/media.cpp index b6b73ea3..5a4e6ad0 100644 --- a/pjsip/src/pjsua2/media.cpp +++ b/pjsip/src/pjsua2/media.cpp @@ -1511,7 +1511,7 @@ void VidCodecParam::fromPj(const pjmedia_vid_codec_param ¶m) { dir = param.dir; packing = param.packing; - ignoreFmtp = param.ignore_fmtp; + ignoreFmtp = param.ignore_fmtp != PJ_FALSE; encMtu = param.enc_mtu; encFmt.fromPj(param.enc_fmt); decFmt.fromPj(param.dec_fmt); diff --git a/pjsip/src/pjsua2/siptypes.cpp b/pjsip/src/pjsua2/siptypes.cpp index a3391bbc..e2498cab 100644 --- a/pjsip/src/pjsua2/siptypes.cpp +++ b/pjsip/src/pjsua2/siptypes.cpp @@ -304,24 +304,24 @@ void TransportConfig::writeObject(ContainerNode &node) const throw(Error) /////////////////////////////////////////////////////////////////////////////// -void TransportInfo::fromPj(const pjsua_transport_info &info) +void TransportInfo::fromPj(const pjsua_transport_info &tinfo) { - this->id = info.id; - this->type = info.type; - this->typeName = pj2Str(info.type_name); - this->info = pj2Str(info.info); - this->flags = info.flag; + this->id = tinfo.id; + this->type = tinfo.type; + this->typeName = pj2Str(tinfo.type_name); + this->info = pj2Str(tinfo.info); + this->flags = tinfo.flag; char straddr[PJ_INET6_ADDRSTRLEN+10]; - pj_sockaddr_print(&info.local_addr, straddr, sizeof(straddr), 3); + pj_sockaddr_print(&tinfo.local_addr, straddr, sizeof(straddr), 3); this->localAddress = straddr; pj_ansi_snprintf(straddr, sizeof(straddr), "%.*s:%d", - (int)info.local_name.host.slen, - info.local_name.host.ptr, - info.local_name.port); + (int)tinfo.local_name.host.slen, + tinfo.local_name.host.ptr, + tinfo.local_name.port); this->localName = straddr; - this->usageCount = info.usage_count; + this->usageCount = tinfo.usage_count; } /////////////////////////////////////////////////////////////////////////////// diff --git a/pjsip/src/test/dns_test.c b/pjsip/src/test/dns_test.c index 986b3124..228255a3 100644 --- a/pjsip/src/test/dns_test.c +++ b/pjsip/src/test/dns_test.c @@ -173,25 +173,25 @@ static void add_dns_entries(pj_dns_resolver *resv) * Sample of invalid SRV records: _sip._udp.sip01.example.com. */ for (i=0; ipool, struct response); - pj_strdup(tdata->pool, &r->tsx_key, tsx_key); + pj_strdup(tdata->pool, &r->tsx_key, tsx_key_); r->tdata = tdata; delay.sec = 0; -- cgit v1.2.3