From 32669005e5809e7f0825bf3b0d0e79a7e30e0abf Mon Sep 17 00:00:00 2001 From: Nanang Izzuddin Date: Fri, 27 Mar 2015 06:17:27 +0000 Subject: Re #1828: Fixed misc compile warnings (on iOS). git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@5035 74dad513-b988-da41-8d7b-12977e46ad98 --- pjmedia/src/pjmedia-audiodev/wmme_dev.c | 3 +++ pjmedia/src/pjmedia-codec/speex_codec.c | 2 +- pjmedia/src/pjmedia/sdp_neg.c | 2 +- pjnath/src/pjnath/ice_strans.c | 5 ++--- pjsip-apps/src/pjsystest/main_console.c | 2 +- pjsip-apps/src/samples/pcaputil.c | 2 +- pjsip-apps/src/samples/pjsip-perf.c | 6 +----- pjsip-apps/src/samples/siprtp.c | 5 +++-- pjsip/src/pjsip-ua/sip_inv.c | 5 +++-- pjsip/src/pjsip/sip_transport_udp.c | 2 +- pjsip/src/pjsua2/media.cpp | 4 ++++ 11 files changed, 21 insertions(+), 17 deletions(-) diff --git a/pjmedia/src/pjmedia-audiodev/wmme_dev.c b/pjmedia/src/pjmedia-audiodev/wmme_dev.c index 938c72d7..58689b09 100644 --- a/pjmedia/src/pjmedia-audiodev/wmme_dev.c +++ b/pjmedia/src/pjmedia-audiodev/wmme_dev.c @@ -894,6 +894,9 @@ static int PJ_THREAD_FUNC wmme_dev_thread(void *arg) static unsigned rec_cnt, play_cnt; enum { MAX_BURST = 1000 }; + /* Suppress compile warning for unused debugging vars */ + PJ_UNUSED_ARG(rec_cnt); + PJ_UNUSED_ARG(play_cnt); rec_cnt = play_cnt = 0; eventCount = 0; diff --git a/pjmedia/src/pjmedia-codec/speex_codec.c b/pjmedia/src/pjmedia-codec/speex_codec.c index f4540061..210c7dee 100644 --- a/pjmedia/src/pjmedia-codec/speex_codec.c +++ b/pjmedia/src/pjmedia-codec/speex_codec.c @@ -804,7 +804,7 @@ static int speex_get_next_frame(SpeexBits *bits) return -1; } else { /* NB frame */ - unsigned int advance = submode; + int advance = submode; speex_mode_query(&speex_nb_mode, SPEEX_SUBMODE_BITS_PER_FRAME, &advance); if (advance < 0) { TRACE__((THIS_FUNC, "Invalid mode encountered. " diff --git a/pjmedia/src/pjmedia/sdp_neg.c b/pjmedia/src/pjmedia/sdp_neg.c index 596362fe..b58a31f3 100644 --- a/pjmedia/src/pjmedia/sdp_neg.c +++ b/pjmedia/src/pjmedia/sdp_neg.c @@ -84,7 +84,7 @@ static pj_status_t custom_fmt_match( pj_pool_t *pool, */ PJ_DEF(const char*) pjmedia_sdp_neg_state_str(pjmedia_sdp_neg_state state) { - if (state >=0 && state < (pjmedia_sdp_neg_state)PJ_ARRAY_SIZE(state_str)) + if ((int)state >=0 && state < (pjmedia_sdp_neg_state)PJ_ARRAY_SIZE(state_str)) return state_str[state]; return ""; diff --git a/pjnath/src/pjnath/ice_strans.c b/pjnath/src/pjnath/ice_strans.c index b016e8f1..c750e309 100644 --- a/pjnath/src/pjnath/ice_strans.c +++ b/pjnath/src/pjnath/ice_strans.c @@ -851,8 +851,7 @@ PJ_DEF(pj_status_t) pj_ice_strans_init_ice(pj_ice_strans *ice_st, * type priority to ICE session so that SRFLX candidates will get * checked first. */ - if (ice_st->comp[0]->default_cand >= 0 && - ice_st->comp[0]->cand_list[ice_st->comp[0]->default_cand].type + if (ice_st->comp[0]->cand_list[ice_st->comp[0]->default_cand].type == PJ_ICE_CAND_TYPE_SRFLX) { pj_ice_sess_set_prefs(ice_st->ice, srflx_pref_table); @@ -1040,7 +1039,7 @@ PJ_DEF(pj_status_t) pj_ice_strans_get_def_cand( pj_ice_strans *ice_st, pj_memcpy(cand, valid_pair->lcand, sizeof(pj_ice_sess_cand)); } else { pj_ice_strans_comp *comp = ice_st->comp[comp_id - 1]; - pj_assert(comp->default_cand>=0 && comp->default_candcand_cnt); + pj_assert(comp->default_candcand_cnt); pj_memcpy(cand, &comp->cand_list[comp->default_cand], sizeof(pj_ice_sess_cand)); } diff --git a/pjsip-apps/src/pjsystest/main_console.c b/pjsip-apps/src/pjsystest/main_console.c index 6c1aa6e8..122cdc72 100644 --- a/pjsip-apps/src/pjsystest/main_console.c +++ b/pjsip-apps/src/pjsystest/main_console.c @@ -99,7 +99,7 @@ pj_status_t gui_start(gui_menu *menu) choice = menu; while (*p && *p!='\r' && *p!='\n') { unsigned d = (*p - '0'); - if (d < 0 || d >= choice->submenu_cnt) { + if (d >= choice->submenu_cnt) { puts("Invalid selection"); choice = NULL; break; diff --git a/pjsip-apps/src/samples/pcaputil.c b/pjsip-apps/src/samples/pcaputil.c index bb231127..86a58010 100644 --- a/pjsip-apps/src/samples/pcaputil.c +++ b/pjsip-apps/src/samples/pcaputil.c @@ -307,7 +307,7 @@ static void pcap2wav(const pj_str_t *codec, /* Get codec info and param for the specified payload type */ app.pt = pkt0.rtp->pt; - if (app.pt >=0 && app.pt < 96) { + if (app.pt < 96) { T( pjmedia_codec_mgr_get_codec_info(cmgr, pkt0.rtp->pt, &ci) ); } else { unsigned cnt = 2; diff --git a/pjsip-apps/src/samples/pjsip-perf.c b/pjsip-apps/src/samples/pjsip-perf.c index 2a435cfe..974e9337 100644 --- a/pjsip-apps/src/samples/pjsip-perf.c +++ b/pjsip-apps/src/samples/pjsip-perf.c @@ -1215,10 +1215,6 @@ static pj_status_t init_options(int argc, char *argv[]) case 'c': app.client.job_count = my_atoi(pj_optarg); - if (app.client.job_count < 0) { - PJ_LOG(3,(THIS_FILE, "Invalid --local-port %s", pj_optarg)); - return -1; - } if (app.client.job_count > pjsip_cfg()->tsx.max_count) PJ_LOG(3,(THIS_FILE, "Warning: --count value (%d) exceeds maximum " @@ -1259,7 +1255,7 @@ static pj_status_t init_options(int argc, char *argv[]) case 't': app.client.timeout = my_atoi(pj_optarg); - if (app.client.timeout < 0 || app.client.timeout > 600) { + if (app.client.timeout > 600) { PJ_LOG(3,(THIS_FILE, "Invalid --timeout %s", pj_optarg)); return -1; } diff --git a/pjsip-apps/src/samples/siprtp.c b/pjsip-apps/src/samples/siprtp.c index f783b6aa..1bee1f5c 100644 --- a/pjsip-apps/src/samples/siprtp.c +++ b/pjsip-apps/src/samples/siprtp.c @@ -914,8 +914,9 @@ static pj_status_t init_options(int argc, char *argv[]) switch (c) { case 'c': app.max_calls = atoi(pj_optarg); - if (app.max_calls < 0 || app.max_calls > MAX_CALLS) { - PJ_LOG(3,(THIS_FILE, "Invalid max calls value %s", pj_optarg)); + if (app.max_calls > MAX_CALLS) { + PJ_LOG(3,(THIS_FILE,"Invalid max calls value %s " + "(must be <= %d)", pj_optarg, MAX_CALLS)); return 1; } break; diff --git a/pjsip/src/pjsip-ua/sip_inv.c b/pjsip/src/pjsip-ua/sip_inv.c index 357079af..ca17f7af 100644 --- a/pjsip/src/pjsip-ua/sip_inv.c +++ b/pjsip/src/pjsip-ua/sip_inv.c @@ -3636,8 +3636,9 @@ static pj_bool_t inv_check_secure_dlg(pjsip_inv_session *inv, if (pjsip_cfg()->endpt.disable_secure_dlg_check == PJ_FALSE && dlg->secure && e->body.tsx_state.type==PJSIP_EVENT_RX_MSG && - (tsx->role==PJSIP_ROLE_UAC && tsx->status_code/100 == 2 || - tsx->role==PJSIP_ROLE_UAS && tsx->state == PJSIP_TSX_STATE_TRYING) && + ((tsx->role==PJSIP_ROLE_UAC && tsx->status_code/100 == 2) || + (tsx->role==PJSIP_ROLE_UAS && tsx->state == PJSIP_TSX_STATE_TRYING)) + && (tsx->method.id==PJSIP_INVITE_METHOD || pjsip_method_cmp(&tsx->method, &pjsip_update_method)==0)) { diff --git a/pjsip/src/pjsip/sip_transport_udp.c b/pjsip/src/pjsip/sip_transport_udp.c index 38355b85..f11cafaf 100644 --- a/pjsip/src/pjsip/sip_transport_udp.c +++ b/pjsip/src/pjsip/sip_transport_udp.c @@ -153,7 +153,7 @@ static void udp_on_read_complete( pj_ioqueue_key_t *key, * is relatively big enough for a SIP packet. */ if (bytes_read > MIN_SIZE) { - pj_size_t size_eaten; + pj_ssize_t size_eaten; const pj_sockaddr *src_addr = &rdata->pkt_info.src_addr; /* Init pkt_info part. */ diff --git a/pjsip/src/pjsua2/media.cpp b/pjsip/src/pjsua2/media.cpp index ed963714..779bd945 100644 --- a/pjsip/src/pjsua2/media.cpp +++ b/pjsip/src/pjsua2/media.cpp @@ -1010,6 +1010,10 @@ int AudDevManager::getActiveDev(bool is_capture) const throw(Error) VideoWindow::VideoWindow(pjsua_vid_win_id win_id) : winId(win_id) { +#if !PJSUA_HAS_VIDEO + /* Suppress warning of unused field when video is disabled */ + PJ_UNUSED_ARG(winId); +#endif } VideoWindowInfo VideoWindow::getInfo() const throw(Error) -- cgit v1.2.3