From 19876d4d3296c6cb7b3e573bdfcc8fedf0072ac3 Mon Sep 17 00:00:00 2001 From: Nanang Izzuddin Date: Thu, 23 Jan 2014 08:09:29 +0000 Subject: Misc (re #1630): Fixed GCC build warnings (thanks Tzafrir Cohen for the patch). git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4712 74dad513-b988-da41-8d7b-12977e46ad98 --- pjlib-util/src/pjlib-util/dns.c | 4 ++-- pjlib/src/pjlib-test/test.c | 3 +-- pjmedia/src/pjmedia/rtcp.c | 5 ----- pjmedia/src/pjmedia/sdp_neg.c | 2 -- pjmedia/src/test/codec_vectors.c | 4 +--- pjnath/src/pjnath/stun_msg.c | 2 -- pjnath/src/pjnath/stun_sock.c | 6 ++---- pjsip/src/pjsip/sip_transport_udp.c | 3 --- pjsip/src/pjsua-lib/pjsua_call.c | 5 +---- pjsip/src/pjsua-lib/pjsua_im.c | 5 ++--- pjsip/src/test/msg_err_test.c | 5 ++--- pjsip/src/test/regc_test.c | 3 +-- 12 files changed, 12 insertions(+), 35 deletions(-) diff --git a/pjlib-util/src/pjlib-util/dns.c b/pjlib-util/src/pjlib-util/dns.c index 3d78159a..09d518ed 100644 --- a/pjlib-util/src/pjlib-util/dns.c +++ b/pjlib-util/src/pjlib-util/dns.c @@ -59,7 +59,7 @@ PJ_DEF(pj_status_t) pj_dns_make_query( void *packet, int qtype, const pj_str_t *name) { - pj_uint8_t *query, *p = (pj_uint8_t*)packet; + pj_uint8_t *p = (pj_uint8_t*)packet; const char *startlabel, *endlabel, *endname; pj_size_t d; @@ -80,7 +80,7 @@ PJ_DEF(pj_status_t) pj_dns_make_query( void *packet, write16(p+4, (pj_uint16_t)1); /* Initialize query */ - query = p = ((pj_uint8_t*)packet)+sizeof(pj_dns_hdr); + p = ((pj_uint8_t*)packet)+sizeof(pj_dns_hdr); /* Tokenize name */ startlabel = endlabel = name->ptr; diff --git a/pjlib/src/pjlib-test/test.c b/pjlib/src/pjlib-test/test.c index c6a02990..94d77bfb 100644 --- a/pjlib/src/pjlib-test/test.c +++ b/pjlib/src/pjlib-test/test.c @@ -215,10 +215,9 @@ on_return: int test_main(void) { - int i; PJ_USE_EXCEPTION; - i = pj_AF_INET(); + pj_AF_INET(); PJ_TRY { return test_inner(); diff --git a/pjmedia/src/pjmedia/rtcp.c b/pjmedia/src/pjmedia/rtcp.c index ddd70781..56723554 100644 --- a/pjmedia/src/pjmedia/rtcp.c +++ b/pjmedia/src/pjmedia/rtcp.c @@ -287,7 +287,6 @@ PJ_DEF(void) pjmedia_rtcp_rx_rtp2(pjmedia_rtcp_session *sess, pj_uint32_t arrival; pj_int32_t transit; pjmedia_rtp_status seq_st; - unsigned last_seq; #if !defined(PJMEDIA_HAS_RTCP_XR) || (PJMEDIA_HAS_RTCP_XR == 0) PJ_UNUSED_ARG(discarded); @@ -302,7 +301,6 @@ PJ_DEF(void) pjmedia_rtcp_rx_rtp2(pjmedia_rtcp_session *sess, sess->stat.rx.bytes += payload; /* Process the RTP packet. */ - last_seq = sess->seq_ctrl.max_seq; pjmedia_rtp_seq_update(&sess->seq_ctrl, (pj_uint16_t)seq, &seq_st); if (seq_st.status.flag.restart) { @@ -807,7 +805,6 @@ PJ_DEF(void) pjmedia_rtcp_build_rtcp(pjmedia_rtcp_session *sess, void **ret_p_pkt, int *len) { pj_uint32_t expected, expected_interval, received_interval, lost_interval; - pjmedia_rtcp_common *common; pjmedia_rtcp_sr *sr; pjmedia_rtcp_rr *rr; pj_timestamp ts_now; @@ -828,7 +825,6 @@ PJ_DEF(void) pjmedia_rtcp_build_rtcp(pjmedia_rtcp_session *sess, /* So we should send RTCP SR */ *ret_p_pkt = (void*) &sess->rtcp_sr_pkt; *len = sizeof(pjmedia_rtcp_sr_pkt); - common = &sess->rtcp_sr_pkt.common; rr = &sess->rtcp_sr_pkt.rr; sr = &sess->rtcp_sr_pkt.sr; @@ -859,7 +855,6 @@ PJ_DEF(void) pjmedia_rtcp_build_rtcp(pjmedia_rtcp_session *sess, /* We should send RTCP RR then */ *ret_p_pkt = (void*) &sess->rtcp_rr_pkt; *len = sizeof(pjmedia_rtcp_rr_pkt); - common = &sess->rtcp_rr_pkt.common; rr = &sess->rtcp_rr_pkt.rr; sr = NULL; } diff --git a/pjmedia/src/pjmedia/sdp_neg.c b/pjmedia/src/pjmedia/sdp_neg.c index ebed3a36..8e50aa83 100644 --- a/pjmedia/src/pjmedia/sdp_neg.c +++ b/pjmedia/src/pjmedia/sdp_neg.c @@ -1033,7 +1033,6 @@ static pj_status_t match_offer(pj_pool_t *pool, { unsigned i; pj_bool_t master_has_codec = 0, - master_has_telephone_event = 0, master_has_other = 0, found_matching_codec = 0, found_matching_telephone_event = 0, @@ -1129,7 +1128,6 @@ static pj_status_t match_offer(pj_pool_t *pool, pjmedia_sdp_attr_get_rtpmap(a, &or_); if (!pj_stricmp2(&or_.enc_name, "telephone-event")) { - master_has_telephone_event = 1; if (found_matching_telephone_event) continue; is_codec = 0; diff --git a/pjmedia/src/test/codec_vectors.c b/pjmedia/src/test/codec_vectors.c index 823d4cff..4aa21301 100644 --- a/pjmedia/src/test/codec_vectors.c +++ b/pjmedia/src/test/codec_vectors.c @@ -126,9 +126,7 @@ static int codec_test_encode(pjmedia_codec_mgr *mgr, } if (out_frame.size) { - pj_size_t cnt; - - cnt = fwrite(out_frame.buf, out_frame.size, 1, output); + fwrite(out_frame.buf, out_frame.size, 1, output); if (encoded_frame_len == 0) encoded_frame_len = out_frame.size; diff --git a/pjnath/src/pjnath/stun_msg.c b/pjnath/src/pjnath/stun_msg.c index 445a26ed..5b16a258 100644 --- a/pjnath/src/pjnath/stun_msg.c +++ b/pjnath/src/pjnath/stun_msg.c @@ -2300,7 +2300,6 @@ PJ_DEF(pj_status_t) pj_stun_msg_decode(pj_pool_t *pool, { pj_stun_msg *msg; - unsigned uattr_cnt; const pj_uint8_t *start_pdu = pdu; pj_bool_t has_msg_int = PJ_FALSE; pj_bool_t has_fingerprint = PJ_FALSE; @@ -2339,7 +2338,6 @@ PJ_DEF(pj_status_t) pj_stun_msg_decode(pj_pool_t *pool, p_response = NULL; /* Parse attributes */ - uattr_cnt = 0; while (pdu_len >= 4) { unsigned attr_type, attr_val_len; const struct attr_desc *adesc; diff --git a/pjnath/src/pjnath/stun_sock.c b/pjnath/src/pjnath/stun_sock.c index c51527db..3a2c5c68 100644 --- a/pjnath/src/pjnath/stun_sock.c +++ b/pjnath/src/pjnath/stun_sock.c @@ -954,10 +954,8 @@ static pj_bool_t on_data_recvfrom(pj_activesock_t *asock, process_app_data: if (stun_sock->cb.on_rx_data) { - pj_bool_t ret; - - ret = (*stun_sock->cb.on_rx_data)(stun_sock, data, (unsigned)size, - src_addr, addr_len); + (*stun_sock->cb.on_rx_data)(stun_sock, data, (unsigned)size, + src_addr, addr_len); status = pj_grp_lock_release(stun_sock->grp_lock); return status!=PJ_EGONE ? PJ_TRUE : PJ_FALSE; } diff --git a/pjsip/src/pjsip/sip_transport_udp.c b/pjsip/src/pjsip/sip_transport_udp.c index bdd04161..36995b08 100644 --- a/pjsip/src/pjsip/sip_transport_udp.c +++ b/pjsip/src/pjsip/sip_transport_udp.c @@ -620,12 +620,9 @@ static pj_status_t register_to_ioqueue(struct udp_transport *tp) /* Start ioqueue asynchronous reading to all rdata */ static pj_status_t start_async_read(struct udp_transport *tp) { - pj_ioqueue_t *ioqueue; int i; pj_status_t status; - ioqueue = pjsip_endpt_get_ioqueue(tp->base.endpt); - /* Start reading the ioqueue. */ for (i=0; irdata_cnt; ++i) { pj_ssize_t size; diff --git a/pjsip/src/pjsua-lib/pjsua_call.c b/pjsip/src/pjsua-lib/pjsua_call.c index 1cd91fcd..4e840df1 100644 --- a/pjsip/src/pjsua-lib/pjsua_call.c +++ b/pjsip/src/pjsua-lib/pjsua_call.c @@ -4497,12 +4497,9 @@ static void pjsua_call_on_tsx_state_changed(pjsip_inv_session *inv, * Incoming MESSAGE request! */ pjsip_rx_data *rdata; - pjsip_msg *msg; pjsip_accept_hdr *accept_hdr; - pj_status_t status; rdata = e->body.tsx_state.src.rdata; - msg = rdata->msg_info.msg; /* Request MUST have message body, with Content-Type equal to * "text/plain". @@ -4522,7 +4519,7 @@ static void pjsua_call_on_tsx_state_changed(pjsip_inv_session *inv, /* Respond with 200 first, so that remote doesn't retransmit in case * the UI takes too long to process the message. */ - status = pjsip_dlg_respond( inv->dlg, rdata, 200, NULL, NULL, NULL); + pjsip_dlg_respond( inv->dlg, rdata, 200, NULL, NULL, NULL); /* Process MESSAGE request */ pjsua_im_process_pager(call->index, &inv->dlg->remote.info_str, diff --git a/pjsip/src/pjsua-lib/pjsua_im.c b/pjsip/src/pjsua-lib/pjsua_im.c index 7ae31889..a8175583 100644 --- a/pjsip/src/pjsua-lib/pjsua_im.c +++ b/pjsip/src/pjsua-lib/pjsua_im.c @@ -274,7 +274,6 @@ static pj_bool_t im_on_rx_request(pjsip_rx_data *rdata) pj_str_t from, to; pjsip_accept_hdr *accept_hdr; pjsip_msg *msg; - pj_status_t status; msg = rdata->msg_info.msg; @@ -306,8 +305,8 @@ static pj_bool_t im_on_rx_request(pjsip_rx_data *rdata) /* Respond with 200 first, so that remote doesn't retransmit in case * the UI takes too long to process the message. */ - status = pjsip_endpt_respond( pjsua_var.endpt, NULL, rdata, 200, NULL, - NULL, NULL, NULL); + pjsip_endpt_respond( pjsua_var.endpt, NULL, rdata, 200, NULL, + NULL, NULL, NULL); /* For the source URI, we use Contact header if present, since * Contact header contains the port number information. If this is diff --git a/pjsip/src/test/msg_err_test.c b/pjsip/src/test/msg_err_test.c index 3150c90e..8ad7f9f6 100644 --- a/pjsip/src/test/msg_err_test.c +++ b/pjsip/src/test/msg_err_test.c @@ -81,12 +81,11 @@ int msg_err_test(void) for (i=0; iuri); - u2 = (pjsip_sip_uri*) pjsip_uri_get_uri(h2->uri); if (*u1->host.ptr == 'a') { if (h1->expires != 0) { -- cgit v1.2.3