diff options
| author | Benny Prijono <bennylp@teluu.com> | 2013-04-23 05:37:41 +0000 |
|---|---|---|
| committer | Benny Prijono <bennylp@teluu.com> | 2013-04-23 05:37:41 +0000 |
| commit | 38bff95961417943c24b15392e0901c34e5a5650 (patch) | |
| tree | 0a98bd2973be5ff997da2e1f5082ca933493fe0b | |
| parent | 29c2410ae1d21f43fb6ba2ddcd5c6a67cfe85fd0 (diff) | |
Re #1630: fixed various warnings
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4487 74dad513-b988-da41-8d7b-12977e46ad98
| -rw-r--r-- | pjlib/src/pjlib-test/activesock.c | 2 | ||||
| -rw-r--r-- | pjmedia/src/pjmedia-codec/opencore_amr.c | 6 | ||||
| -rw-r--r-- | pjmedia/src/pjmedia/sound_port.c | 4 | ||||
| -rw-r--r-- | pjsip/src/pjsip-ua/sip_inv.c | 2 |
4 files changed, 9 insertions, 5 deletions
diff --git a/pjlib/src/pjlib-test/activesock.c b/pjlib/src/pjlib-test/activesock.c index 41fa5190..560f0c66 100644 --- a/pjlib/src/pjlib-test/activesock.c +++ b/pjlib/src/pjlib-test/activesock.c @@ -101,7 +101,6 @@ static pj_status_t udp_echo_srv_create(pj_pool_t *pool, struct udp_echo_srv *srv; pj_sock_t sock_fd = PJ_INVALID_SOCKET; pj_sockaddr addr; - int addr_len; pj_activesock_cb activesock_cb; pj_status_t status; @@ -109,7 +108,6 @@ static pj_status_t udp_echo_srv_create(pj_pool_t *pool, srv->echo_enabled = enable_echo; pj_sockaddr_in_init(&addr.ipv4, NULL, 0); - addr_len = sizeof(addr); pj_bzero(&activesock_cb, sizeof(activesock_cb)); activesock_cb.on_data_recvfrom = &udp_echo_srv_on_data_recvfrom; diff --git a/pjmedia/src/pjmedia-codec/opencore_amr.c b/pjmedia/src/pjmedia-codec/opencore_amr.c index 35d9e522..99ad54ef 100644 --- a/pjmedia/src/pjmedia-codec/opencore_amr.c +++ b/pjmedia/src/pjmedia-codec/opencore_amr.c @@ -808,7 +808,6 @@ static pj_status_t amr_codec_encode( pjmedia_codec *codec, pj_size_t payload_len; unsigned dtx_cnt, sid_cnt; pj_status_t status; - int size; pj_assert(amr_data != NULL); PJ_ASSERT_RETURN(input && output, PJ_EINVAL); @@ -826,16 +825,21 @@ static pj_status_t amr_codec_encode( pjmedia_codec *codec, speech = (pj_int16_t*)input->buf; bitstream = (unsigned char*)output->buf; while (nsamples >= samples_per_frame) { + int size; if (amr_data->enc_setting.amr_nb) { #ifdef USE_AMRNB size = Encoder_Interface_Encode (amr_data->encoder, amr_data->enc_mode, speech, bitstream, 0); +#else + size = 0; #endif } else { #ifdef USE_AMRWB size = E_IF_encode (amr_data->encoder, amr_data->enc_mode, speech, bitstream, 0); +#else + size = 0; #endif } if (size == 0) { diff --git a/pjmedia/src/pjmedia/sound_port.c b/pjmedia/src/pjmedia/sound_port.c index f42e5b51..3bf8316b 100644 --- a/pjmedia/src/pjmedia/sound_port.c +++ b/pjmedia/src/pjmedia/sound_port.c @@ -234,7 +234,7 @@ static pj_status_t start_sound_device( pj_pool_t *pool, if (param_copy.flags & PJMEDIA_AUD_DEV_CAP_EC) { /* EC is wanted */ if ((snd_port->prm_ec_options & PJMEDIA_ECHO_USE_SW_ECHO) == 0 && - snd_port->aud_caps & PJMEDIA_AUD_DEV_CAP_EC) + (snd_port->aud_caps & PJMEDIA_AUD_DEV_CAP_EC)) { /* Device supports EC */ /* Nothing to do */ @@ -527,7 +527,7 @@ PJ_DEF(pj_status_t) pjmedia_snd_port_set_ec( pjmedia_snd_port *snd_port, /* Determine whether we use device or software EC */ if ((snd_port->prm_ec_options & PJMEDIA_ECHO_USE_SW_ECHO) == 0 && - snd_port->aud_caps & PJMEDIA_AUD_DEV_CAP_EC) + (snd_port->aud_caps & PJMEDIA_AUD_DEV_CAP_EC)) { /* We use device EC */ pj_bool_t ec_enabled; diff --git a/pjsip/src/pjsip-ua/sip_inv.c b/pjsip/src/pjsip-ua/sip_inv.c index a0f9c913..fe7174a4 100644 --- a/pjsip/src/pjsip-ua/sip_inv.c +++ b/pjsip/src/pjsip-ua/sip_inv.c @@ -3887,6 +3887,7 @@ static void inv_on_state_early( pjsip_inv_session *inv, pjsip_event *e) default: pj_assert(!"Unexpected INVITE tsx state"); + break; } } else if (inv->role == PJSIP_ROLE_UAS && @@ -4035,6 +4036,7 @@ static void inv_on_state_connecting( pjsip_inv_session *inv, pjsip_event *e) default: pj_assert(!"Unexpected state"); + break; } } else if (tsx->role == PJSIP_ROLE_UAS && |