From f0bd6df8b27496f713d570de7e09bf6c503d2cad Mon Sep 17 00:00:00 2001 From: Benny Prijono Date: Tue, 19 Aug 2014 00:54:34 +0000 Subject: Re #1751: fixed miscellaneous gcc warnings git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4890 74dad513-b988-da41-8d7b-12977e46ad98 --- pjlib/src/pj/ioqueue_common_abs.c | 4 ++-- pjlib/src/pj/os_timestamp_posix.c | 4 +++- pjlib/src/pj/pool.c | 2 +- pjlib/src/pjlib-test/exception.c | 2 +- pjmedia/src/pjmedia/endpoint.c | 2 -- pjmedia/src/pjmedia/session.c | 18 ------------------ pjmedia/src/pjmedia/stream_info.c | 10 ++++------ pjmedia/src/pjmedia/vid_stream_info.c | 10 ++++------ pjnath/src/pjnath/stun_auth.c | 4 ++-- pjnath/src/pjnath/stun_msg.c | 8 ++++---- pjsip/src/pjsip-ua/sip_xfer.c | 1 - pjsip/src/pjsua-lib/pjsua_im.c | 4 ++-- 12 files changed, 23 insertions(+), 46 deletions(-) diff --git a/pjlib/src/pj/ioqueue_common_abs.c b/pjlib/src/pj/ioqueue_common_abs.c index db403e57..cd13b70b 100644 --- a/pjlib/src/pj/ioqueue_common_abs.c +++ b/pjlib/src/pj/ioqueue_common_abs.c @@ -497,13 +497,13 @@ void ioqueue_dispatch_read_event( pj_ioqueue_t *ioqueue, pj_ioqueue_key_t *h ) bytes_read = read_op->size; - if ((read_op->op == PJ_IOQUEUE_OP_RECV_FROM)) { + if (read_op->op == PJ_IOQUEUE_OP_RECV_FROM) { read_op->op = PJ_IOQUEUE_OP_NONE; rc = pj_sock_recvfrom(h->fd, read_op->buf, &bytes_read, read_op->flags, read_op->rmt_addr, read_op->rmt_addrlen); - } else if ((read_op->op == PJ_IOQUEUE_OP_RECV)) { + } else if (read_op->op == PJ_IOQUEUE_OP_RECV) { read_op->op = PJ_IOQUEUE_OP_NONE; rc = pj_sock_recv(h->fd, read_op->buf, &bytes_read, read_op->flags); diff --git a/pjlib/src/pj/os_timestamp_posix.c b/pjlib/src/pj/os_timestamp_posix.c index eec6ed1f..28805150 100644 --- a/pjlib/src/pj/os_timestamp_posix.c +++ b/pjlib/src/pj/os_timestamp_posix.c @@ -125,7 +125,9 @@ PJ_DEF(pj_status_t) pj_get_timestamp_freq(pj_timestamp *freq) #include #include -#define NSEC_PER_SEC 1000000000 +#ifndef NSEC_PER_SEC +# define NSEC_PER_SEC 1000000000 +#endif PJ_DEF(pj_status_t) pj_get_timestamp(pj_timestamp *ts) { diff --git a/pjlib/src/pj/pool.c b/pjlib/src/pj/pool.c index 3e2e2686..7c4d34a5 100644 --- a/pjlib/src/pj/pool.c +++ b/pjlib/src/pj/pool.c @@ -143,7 +143,7 @@ PJ_DEF(void*) pj_pool_allocate_find(pj_pool_t *pool, pj_size_t size) pj_assert(p != NULL); #if PJ_DEBUG if (p == NULL) { - p = p; + PJ_UNUSED_ARG(p); } #endif return p; diff --git a/pjlib/src/pjlib-test/exception.c b/pjlib/src/pjlib-test/exception.c index ea9155ac..26546ef2 100644 --- a/pjlib/src/pjlib-test/exception.c +++ b/pjlib/src/pjlib-test/exception.c @@ -120,7 +120,7 @@ static int test(void) * No exception situation. */ PJ_TRY { - rc = rc; + PJ_UNUSED_ARG(rc); } PJ_CATCH_ANY { rc = -3; diff --git a/pjmedia/src/pjmedia/endpoint.c b/pjmedia/src/pjmedia/endpoint.c index 8a68072a..de7c3201 100644 --- a/pjmedia/src/pjmedia/endpoint.c +++ b/pjmedia/src/pjmedia/endpoint.c @@ -34,8 +34,6 @@ #define THIS_FILE "endpoint.c" -static const pj_str_t STR_AUDIO = { "audio", 5}; -static const pj_str_t STR_VIDEO = { "video", 5}; static const pj_str_t STR_IN = { "IN", 2 }; static const pj_str_t STR_IP4 = { "IP4", 3}; static const pj_str_t STR_IP6 = { "IP6", 3}; diff --git a/pjmedia/src/pjmedia/session.c b/pjmedia/src/pjmedia/session.c index 43767790..0c5b541b 100644 --- a/pjmedia/src/pjmedia/session.c +++ b/pjmedia/src/pjmedia/session.c @@ -48,24 +48,6 @@ struct pjmedia_session # define PJMEDIA_SESSION_INC 1024 #endif - -static const pj_str_t ID_AUDIO = { "audio", 5}; -static const pj_str_t ID_VIDEO = { "video", 5}; -static const pj_str_t ID_APPLICATION = { "application", 11}; -static const pj_str_t ID_IN = { "IN", 2 }; -static const pj_str_t ID_IP4 = { "IP4", 3}; -static const pj_str_t ID_IP6 = { "IP6", 3}; -static const pj_str_t ID_RTP_AVP = { "RTP/AVP", 7 }; -static const pj_str_t ID_RTP_SAVP = { "RTP/SAVP", 8 }; -//static const pj_str_t ID_SDP_NAME = { "pjmedia", 7 }; -static const pj_str_t ID_RTPMAP = { "rtpmap", 6 }; -static const pj_str_t ID_TELEPHONE_EVENT = { "telephone-event", 15 }; - -static const pj_str_t STR_INACTIVE = { "inactive", 8 }; -static const pj_str_t STR_SENDRECV = { "sendrecv", 8 }; -static const pj_str_t STR_SENDONLY = { "sendonly", 8 }; -static const pj_str_t STR_RECVONLY = { "recvonly", 8 }; - /* * Initialize session info from SDP session descriptors. */ diff --git a/pjmedia/src/pjmedia/stream_info.c b/pjmedia/src/pjmedia/stream_info.c index ada8b79a..5baa5462 100644 --- a/pjmedia/src/pjmedia/stream_info.c +++ b/pjmedia/src/pjmedia/stream_info.c @@ -32,12 +32,6 @@ static const pj_str_t ID_RTP_SAVP = { "RTP/SAVP", 8 }; static const pj_str_t ID_RTPMAP = { "rtpmap", 6 }; static const pj_str_t ID_TELEPHONE_EVENT = { "telephone-event", 15 }; -static const pj_str_t STR_INACTIVE = { "inactive", 8 }; -static const pj_str_t STR_SENDRECV = { "sendrecv", 8 }; -static const pj_str_t STR_SENDONLY = { "sendonly", 8 }; -static const pj_str_t STR_RECVONLY = { "recvonly", 8 }; - - /* * Internal function for collecting codec info and param from the SDP media. */ @@ -325,6 +319,10 @@ PJ_DEF(pj_status_t) pjmedia_stream_info_from_sdp( const pjmedia_sdp_session *remote, unsigned stream_idx) { + const pj_str_t STR_INACTIVE = { "inactive", 8 }; + const pj_str_t STR_SENDONLY = { "sendonly", 8 }; + const pj_str_t STR_RECVONLY = { "recvonly", 8 }; + pjmedia_codec_mgr *mgr; const pjmedia_sdp_attr *attr; const pjmedia_sdp_media *local_m; diff --git a/pjmedia/src/pjmedia/vid_stream_info.c b/pjmedia/src/pjmedia/vid_stream_info.c index 11e1dd22..0d38e1a2 100644 --- a/pjmedia/src/pjmedia/vid_stream_info.c +++ b/pjmedia/src/pjmedia/vid_stream_info.c @@ -33,12 +33,6 @@ static const pj_str_t ID_RTP_SAVP = { "RTP/SAVP", 8 }; //static const pj_str_t ID_SDP_NAME = { "pjmedia", 7 }; static const pj_str_t ID_RTPMAP = { "rtpmap", 6 }; -static const pj_str_t STR_INACTIVE = { "inactive", 8 }; -static const pj_str_t STR_SENDRECV = { "sendrecv", 8 }; -static const pj_str_t STR_SENDONLY = { "sendonly", 8 }; -static const pj_str_t STR_RECVONLY = { "recvonly", 8 }; - - /* * Internal function for collecting codec info and param from the SDP media. */ @@ -190,6 +184,10 @@ PJ_DEF(pj_status_t) pjmedia_vid_stream_info_from_sdp( const pjmedia_sdp_session *remote, unsigned stream_idx) { + const pj_str_t STR_INACTIVE = { "inactive", 8 }; + const pj_str_t STR_SENDONLY = { "sendonly", 8 }; + const pj_str_t STR_RECVONLY = { "recvonly", 8 }; + const pjmedia_sdp_attr *attr; const pjmedia_sdp_media *local_m; const pjmedia_sdp_media *rem_m; diff --git a/pjnath/src/pjnath/stun_auth.c b/pjnath/src/pjnath/stun_auth.c index 06cb4992..7b34b746 100644 --- a/pjnath/src/pjnath/stun_auth.c +++ b/pjnath/src/pjnath/stun_auth.c @@ -149,10 +149,10 @@ PJ_DEF(void) pj_stun_create_key(pj_pool_t *pool, } -PJ_INLINE(pj_uint16_t) GET_VAL16(const pj_uint8_t *pdu, unsigned pos) +/*unused PJ_INLINE(pj_uint16_t) GET_VAL16(const pj_uint8_t *pdu, unsigned pos) { return (pj_uint16_t) ((pdu[pos] << 8) + pdu[pos+1]); -} +}*/ PJ_INLINE(void) PUT_VAL16(pj_uint8_t *buf, unsigned pos, pj_uint16_t hval) diff --git a/pjnath/src/pjnath/stun_msg.c b/pjnath/src/pjnath/stun_msg.c index 5b16a258..da8618b4 100644 --- a/pjnath/src/pjnath/stun_msg.c +++ b/pjnath/src/pjnath/stun_msg.c @@ -752,10 +752,10 @@ static pj_uint16_t GETVAL16H(const pj_uint8_t *buf, unsigned pos) (buf[pos + 1] << 0)); } -PJ_INLINE(pj_uint16_t) GETVAL16N(const pj_uint8_t *buf, unsigned pos) +/*unused PJ_INLINE(pj_uint16_t) GETVAL16N(const pj_uint8_t *buf, unsigned pos) { return pj_htons(GETVAL16H(buf,pos)); -} +}*/ static void PUTVAL16H(pj_uint8_t *buf, unsigned pos, pj_uint16_t hval) { @@ -771,10 +771,10 @@ PJ_INLINE(pj_uint32_t) GETVAL32H(const pj_uint8_t *buf, unsigned pos) (buf[pos + 3] << 0UL)); } -PJ_INLINE(pj_uint32_t) GETVAL32N(const pj_uint8_t *buf, unsigned pos) +/*unused PJ_INLINE(pj_uint32_t) GETVAL32N(const pj_uint8_t *buf, unsigned pos) { return pj_htonl(GETVAL32H(buf,pos)); -} +}*/ static void PUTVAL32H(pj_uint8_t *buf, unsigned pos, pj_uint32_t hval) { diff --git a/pjsip/src/pjsip-ua/sip_xfer.c b/pjsip/src/pjsip-ua/sip_xfer.c index d9b4a5b5..764ea6de 100644 --- a/pjsip/src/pjsip-ua/sip_xfer.c +++ b/pjsip/src/pjsip-ua/sip_xfer.c @@ -79,7 +79,6 @@ PJ_DEF(const pjsip_method*) pjsip_get_refer_method() static const pj_str_t STR_REFER = { "refer", 5 }; static const pj_str_t STR_MESSAGE = { "message", 7 }; static const pj_str_t STR_SIPFRAG = { "sipfrag", 7 }; -static const pj_str_t STR_SIPFRAG_VERSION = {";version=2.0", 12 }; /* diff --git a/pjsip/src/pjsua-lib/pjsua_im.c b/pjsip/src/pjsua-lib/pjsua_im.c index a8175583..6ad8d677 100644 --- a/pjsip/src/pjsua-lib/pjsua_im.c +++ b/pjsip/src/pjsua-lib/pjsua_im.c @@ -68,14 +68,14 @@ static pjsip_module mod_pjsua_im = /* MIME constants. */ static const pj_str_t STR_MIME_APP = { "application", 11 }; static const pj_str_t STR_MIME_ISCOMPOSING = { "im-iscomposing+xml", 18 }; -static const pj_str_t STR_MIME_TEXT = { "text", 4 }; -static const pj_str_t STR_MIME_PLAIN = { "plain", 5 }; /* Check if content type is acceptable */ #if 0 static pj_bool_t acceptable_message(const pjsip_media_type *mime) { + const pj_str_t STR_MIME_TEXT = { "text", 4 }; + const pj_str_t STR_MIME_PLAIN = { "plain", 5 }; return (pj_stricmp(&mime->type, &STR_MIME_TEXT)==0 && pj_stricmp(&mime->subtype, &STR_MIME_PLAIN)==0) || -- cgit v1.2.3