diff options
author | Benny Prijono <bennylp@teluu.com> | 2008-06-13 12:52:56 +0000 |
---|---|---|
committer | Benny Prijono <bennylp@teluu.com> | 2008-06-13 12:52:56 +0000 |
commit | 1092aec93eb88a3676c114ecf6158e1f612b86ce (patch) | |
tree | 9c2e90826d3542ce35581b13e738469a83d349b2 | |
parent | a7ca90fdbe7339740c6d994bfa214d73b6619172 (diff) |
Fixed various compilation warnings with gcc strict compilation
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@2015 74dad513-b988-da41-8d7b-12977e46ad98
-rw-r--r-- | pjmedia/src/pjmedia-codec/gsm.c | 6 | ||||
-rw-r--r-- | pjmedia/src/pjmedia/resample_port.c | 7 | ||||
-rw-r--r-- | pjmedia/src/pjmedia/transport_srtp.c | 2 | ||||
-rw-r--r-- | pjnath/src/pjnath-test/server.c | 2 | ||||
-rw-r--r-- | pjnath/src/pjnath-test/stun_sock_test.c | 6 | ||||
-rw-r--r-- | pjsip/src/pjsip-ua/sip_reg.c | 2 |
6 files changed, 14 insertions, 11 deletions
diff --git a/pjmedia/src/pjmedia-codec/gsm.c b/pjmedia/src/pjmedia-codec/gsm.c index 5dc2034e..7bb4d729 100644 --- a/pjmedia/src/pjmedia-codec/gsm.c +++ b/pjmedia/src/pjmedia-codec/gsm.c @@ -597,7 +597,7 @@ static pj_status_t gsm_codec_decode( pjmedia_codec *codec, #if !PLC_DISABLED if (gsm_data->plc_enabled) - pjmedia_plc_save( gsm_data->plc, output->buf); + pjmedia_plc_save( gsm_data->plc, (pj_int16_t*)output->buf); #endif return PJ_SUCCESS; @@ -612,13 +612,13 @@ static pj_status_t gsm_codec_recover(pjmedia_codec *codec, unsigned output_buf_len, struct pjmedia_frame *output) { - struct gsm_data *gsm_data = codec->codec_data; + struct gsm_data *gsm_data = (struct gsm_data*) codec->codec_data; PJ_ASSERT_RETURN(gsm_data->plc_enabled, PJ_EINVALIDOP); PJ_ASSERT_RETURN(output_buf_len >= 320, PJMEDIA_CODEC_EPCMTOOSHORT); - pjmedia_plc_generate(gsm_data->plc, output->buf); + pjmedia_plc_generate(gsm_data->plc, (pj_int16_t*)output->buf); output->size = 320; return PJ_SUCCESS; diff --git a/pjmedia/src/pjmedia/resample_port.c b/pjmedia/src/pjmedia/resample_port.c index 44f7e39b..e28d3c87 100644 --- a/pjmedia/src/pjmedia/resample_port.c +++ b/pjmedia/src/pjmedia/resample_port.c @@ -188,8 +188,11 @@ static pj_status_t resample_get_frame(pjmedia_port *this_port, /* Copy whatever returned as long as the buffer size is enough */ frame->size = tmp_frame.size < rport->base.info.bytes_per_frame ? tmp_frame.size : rport->base.info.bytes_per_frame; - if (tmp_frame.size) - pjmedia_copy_samples(frame->buf, tmp_frame.buf, frame->size >> 1); + if (tmp_frame.size) { + pjmedia_copy_samples((pj_int16_t*)frame->buf, + (const pj_int16_t*)tmp_frame.buf, + frame->size >> 1); + } return PJ_SUCCESS; } diff --git a/pjmedia/src/pjmedia/transport_srtp.c b/pjmedia/src/pjmedia/transport_srtp.c index 0ebe0758..6f3c06fc 100644 --- a/pjmedia/src/pjmedia/transport_srtp.c +++ b/pjmedia/src/pjmedia/transport_srtp.c @@ -1186,7 +1186,7 @@ static pj_status_t transport_media_start(pjmedia_transport *tp, struct transport_srtp *srtp = (struct transport_srtp*) tp; pjmedia_sdp_media *m_rem, *m_loc; pj_status_t status; - int i; + unsigned i; PJ_ASSERT_RETURN(tp && pool && sdp_local && sdp_remote, PJ_EINVAL); diff --git a/pjnath/src/pjnath-test/server.c b/pjnath/src/pjnath-test/server.c index 6d4f2e8b..466b3a3d 100644 --- a/pjnath/src/pjnath-test/server.c +++ b/pjnath/src/pjnath-test/server.c @@ -629,7 +629,7 @@ static pj_bool_t alloc_on_data_recvfrom(pj_activesock_t *asock, pj_assert(pa && da); pj_sockaddr_cp(&pa->sockaddr, src_addr); - da->data = data; + da->data = (pj_uint8_t*)data; da->length = size; /* Encode Data indication */ diff --git a/pjnath/src/pjnath-test/stun_sock_test.c b/pjnath/src/pjnath-test/stun_sock_test.c index 2c4462d7..72c20b8a 100644 --- a/pjnath/src/pjnath-test/stun_sock_test.c +++ b/pjnath/src/pjnath-test/stun_sock_test.c @@ -52,7 +52,7 @@ static pj_bool_t srv_on_data_recvfrom(pj_activesock_t *asock, struct stun_srv *srv; pj_ssize_t sent; - srv = pj_activesock_get_user_data(asock); + srv = (struct stun_srv*) pj_activesock_get_user_data(asock); /* Ignore error */ if (status != PJ_SUCCESS) @@ -194,7 +194,7 @@ static pj_bool_t stun_sock_on_status(pj_stun_sock *stun_sock, { struct stun_client *client; - client = pj_stun_sock_get_user_data(stun_sock); + client = (struct stun_client*) pj_stun_sock_get_user_data(stun_sock); client->on_status_cnt++; client->last_op = op; client->last_status = status; @@ -221,7 +221,7 @@ static pj_bool_t stun_sock_on_rx_data(pj_stun_sock *stun_sock, PJ_UNUSED_ARG(src_addr); PJ_UNUSED_ARG(addr_len); - client = pj_stun_sock_get_user_data(stun_sock); + client = (struct stun_client*) pj_stun_sock_get_user_data(stun_sock); client->on_rx_data_cnt++; return PJ_TRUE; diff --git a/pjsip/src/pjsip-ua/sip_reg.c b/pjsip/src/pjsip-ua/sip_reg.c index 8fb48aaa..99e316db 100644 --- a/pjsip/src/pjsip-ua/sip_reg.c +++ b/pjsip/src/pjsip-ua/sip_reg.c @@ -308,7 +308,7 @@ static pj_status_t set_contact( pjsip_regc *regc, xuid_param->name = XUID_PARAM_NAME; pj_create_unique_string(regc->pool, &xuid_param->value); - sip_uri = pjsip_uri_get_uri(hdr->uri); + sip_uri = (pjsip_sip_uri*) pjsip_uri_get_uri(hdr->uri); pj_list_push_back(&sip_uri->other_param, xuid_param); } |