From cd32d40cb26a2823cfc9805f5c76bc3711864196 Mon Sep 17 00:00:00 2001 From: Riza Sulistyo Date: Tue, 5 Mar 2013 03:12:32 +0000 Subject: Misc (re #1559): fixed compile errors/warnings on MSVC git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4412 74dad513-b988-da41-8d7b-12977e46ad98 --- pjlib/src/pj/lock.c | 2 ++ pjmedia/src/pjmedia/converter.c | 2 ++ pjnath/src/pjnath-test/concur_test.c | 9 ++++++++- pjnath/src/pjnath-test/ice_test.c | 8 ++++++-- pjnath/src/pjnath/ice_strans.c | 6 +++++- pjsip/src/pjsua-lib/pjsua_media.c | 14 ++++++++------ 6 files changed, 31 insertions(+), 10 deletions(-) diff --git a/pjlib/src/pj/lock.c b/pjlib/src/pj/lock.c index a9e60594..a521fd49 100644 --- a/pjlib/src/pj/lock.c +++ b/pjlib/src/pj/lock.c @@ -709,5 +709,7 @@ PJ_DEF(void) pj_grp_lock_dump(pj_grp_lock_t *grp_lock) PJ_LOG(4,(THIS_FILE, "Group lock %p, ref_cnt=%d. Reference holders: %s", grp_lock, pj_grp_lock_get_ref(grp_lock), info.ptr)); +#else + PJ_UNUSED_ARG(grp_lock); #endif } diff --git a/pjmedia/src/pjmedia/converter.c b/pjmedia/src/pjmedia/converter.c index 436f0bd3..7041b959 100644 --- a/pjmedia/src/pjmedia/converter.c +++ b/pjmedia/src/pjmedia/converter.c @@ -39,7 +39,9 @@ PJ_DEF(pj_status_t) pjmedia_converter_mgr_create(pj_pool_t *pool, pjmedia_converter_mgr **p_mgr) { pjmedia_converter_mgr *mgr; +#if PJMEDIA_HAS_LIBSWSCALE && PJMEDIA_HAS_LIBAVUTIL pj_status_t status = PJ_SUCCESS; +#endif mgr = PJ_POOL_ALLOC_T(pool, pjmedia_converter_mgr); pj_list_init(&mgr->factory_list); diff --git a/pjnath/src/pjnath-test/concur_test.c b/pjnath/src/pjnath-test/concur_test.c index 92c2d394..fbb0bc49 100644 --- a/pjnath/src/pjnath-test/concur_test.c +++ b/pjnath/src/pjnath-test/concur_test.c @@ -158,6 +158,10 @@ static pj_bool_t stun_sock_on_status(pj_stun_sock *stun_sock, pj_status_t status) { struct stun_test_session *test_sess = (struct stun_test_session*)pj_stun_sock_get_user_data(stun_sock); + + PJ_UNUSED_ARG(op); + PJ_UNUSED_ARG(status); + test_sess->param.client_got_response++; return PJ_TRUE; } @@ -192,7 +196,7 @@ static int stun_destroy_test_session(struct stun_test_session *test_sess) for (i=0; iserver_port, NULL); + (pj_uint16_t)test_sess->server_port, NULL); if (status != PJ_SUCCESS) { PJ_PERROR(1,(THIS_FILE, status, "Error starting stun socket")); return -20; @@ -323,6 +327,9 @@ static int stun_destroy_test(void) pj_thread_sleep(10); } + /* Avoid compiler warning */ + goto on_return; + on_return: test_sess.thread_quit_flag = PJ_TRUE; diff --git a/pjnath/src/pjnath-test/ice_test.c b/pjnath/src/pjnath-test/ice_test.c index 0a4c8a3e..66d48314 100644 --- a/pjnath/src/pjnath-test/ice_test.c +++ b/pjnath/src/pjnath-test/ice_test.c @@ -467,7 +467,8 @@ static int check_pair(const struct ice_ept *ept1, const struct ice_ept *ept2, break; \ } \ PJ_TIME_VAL_SUB(t, t0); \ - if (PJ_TIME_VAL_MSEC(t) >= (timeout)) break; \ + if ((unsigned)PJ_TIME_VAL_MSEC(t) >= (timeout)) \ + break; \ } \ } @@ -1015,7 +1016,7 @@ int ice_one_conc_test(pj_stun_config *stun_cfg, int err_quit) int ice_conc_test(void) { - const int LOOP = 100; + const unsigned LOOP = 100; pj_pool_t *pool; pj_stun_config stun_cfg; unsigned i; @@ -1034,6 +1035,9 @@ int ice_conc_test(void) if (rc) break; } + + /* Avoid compiler warning */ + goto on_return; on_return: destroy_stun_config(&stun_cfg); diff --git a/pjnath/src/pjnath/ice_strans.c b/pjnath/src/pjnath/ice_strans.c index e9b1dfba..95c6cf78 100644 --- a/pjnath/src/pjnath/ice_strans.c +++ b/pjnath/src/pjnath/ice_strans.c @@ -31,8 +31,9 @@ #include #include +#define ENABLE_TRACE 0 -#if 0 +#if defined(ENABLE_TRACE) && (ENABLE_TRACE != 0) # define TRACE_PKT(expr) PJ_LOG(5,expr) #else # define TRACE_PKT(expr) @@ -1320,6 +1321,9 @@ static pj_status_t ice_tx_pkt(pj_ice_sess *ice, pj_ice_strans *ice_st = (pj_ice_strans*)ice->user_data; pj_ice_strans_comp *comp; pj_status_t status; +#if defined(ENABLE_TRACE) && (ENABLE_TRACE != 0) + char daddr[PJ_INET6_ADDRSTRLEN]; +#endif PJ_ASSERT_RETURN(comp_id && comp_id <= ice_st->comp_cnt, PJ_EINVAL); diff --git a/pjsip/src/pjsua-lib/pjsua_media.c b/pjsip/src/pjsua-lib/pjsua_media.c index 3b9210b2..e2cbd4cb 100644 --- a/pjsip/src/pjsua-lib/pjsua_media.c +++ b/pjsip/src/pjsua-lib/pjsua_media.c @@ -743,10 +743,11 @@ static pj_status_t create_ice_media_transport( /* Copy binding port setting to STUN setting */ pj_sockaddr_init(ice_cfg.af, &ice_cfg.stun.cfg.bound_addr, - &cfg->bound_addr, cfg->port); - ice_cfg.stun.cfg.port_range = cfg->port_range; + &cfg->bound_addr, (pj_uint16_t)cfg->port); + ice_cfg.stun.cfg.port_range = (pj_uint16_t)cfg->port_range; if (cfg->port != 0 && ice_cfg.stun.cfg.port_range == 0) - ice_cfg.stun.cfg.port_range = pjsua_var.ua_cfg.max_calls * 10; + ice_cfg.stun.cfg.port_range = + (pj_uint16_t)(pjsua_var.ua_cfg.max_calls * 10); /* Copy QoS setting to STUN setting */ ice_cfg.stun.cfg.qos_type = cfg->qos_type; @@ -776,10 +777,11 @@ static pj_status_t create_ice_media_transport( /* Copy binding port setting to TURN setting */ pj_sockaddr_init(ice_cfg.af, &ice_cfg.turn.cfg.bound_addr, - &cfg->bound_addr, cfg->port); - ice_cfg.turn.cfg.port_range = cfg->port_range; + &cfg->bound_addr, (pj_uint16_t)cfg->port); + ice_cfg.turn.cfg.port_range = (pj_uint16_t)cfg->port_range; if (cfg->port != 0 && ice_cfg.turn.cfg.port_range == 0) - ice_cfg.turn.cfg.port_range = pjsua_var.ua_cfg.max_calls * 10; + ice_cfg.turn.cfg.port_range = + (pj_uint16_t)(pjsua_var.ua_cfg.max_calls * 10); } /* Configure packet size for STUN and TURN sockets */ -- cgit v1.2.3