diff options
| author | Benny Prijono <bennylp@teluu.com> | 2011-12-26 09:00:42 +0000 |
|---|---|---|
| committer | Benny Prijono <bennylp@teluu.com> | 2011-12-26 09:00:42 +0000 |
| commit | 57b2e219e8e79171c5bc773d325bd6c8a3afdf08 (patch) | |
| tree | 2ddd855418e90ba6e9192cfc8c917bf44500ce66 /pjsip/src/pjsua-lib/pjsua_media.c | |
| parent | e4835c6a39ebb52f541f3f842e412e75396a6aa7 (diff) | |
Re #1393 (misc): renamed label on_error to on_return and fixed warning re constness
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@3921 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjsip/src/pjsua-lib/pjsua_media.c')
| -rw-r--r-- | pjsip/src/pjsua-lib/pjsua_media.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/pjsip/src/pjsua-lib/pjsua_media.c b/pjsip/src/pjsua-lib/pjsua_media.c index 2f5c0b5b..109108cd 100644 --- a/pjsip/src/pjsua-lib/pjsua_media.c +++ b/pjsip/src/pjsua-lib/pjsua_media.c @@ -1343,7 +1343,7 @@ static pj_status_t call_media_init_cb(pjsua_call_media *call_med, int err_code = 0; if (status != PJ_SUCCESS) - goto on_error; + goto on_return; if (call_med->tp_st == PJSUA_MED_TP_CREATING) set_media_tp_state(call_med, PJSUA_MED_TP_IDLE); @@ -1368,7 +1368,7 @@ static pj_status_t call_media_init_cb(pjsua_call_media *call_med, if (security_level < acc->cfg.srtp_secure_signaling) { err_code = PJSIP_SC_NOT_ACCEPTABLE; status = PJSIP_ESESSIONINSECURE; - goto on_error; + goto on_return; } } @@ -1388,7 +1388,7 @@ static pj_status_t call_media_init_cb(pjsua_call_media *call_med, &srtp_opt, &srtp); if (status != PJ_SUCCESS) { err_code = PJSIP_SC_INTERNAL_SERVER_ERROR; - goto on_error; + goto on_return; } /* Set SRTP as current media transport */ @@ -1407,7 +1407,7 @@ static pj_status_t call_media_init_cb(pjsua_call_media *call_med, pj_sockaddr_cp(&call_med->rtp_addr, &tpinfo.sock_info.rtp_addr_name); -on_error: +on_return: if (status != PJ_SUCCESS && call_med->tp) { pjmedia_transport_close(call_med->tp); call_med->tp = NULL; @@ -1557,7 +1557,7 @@ static pj_status_t media_channel_init_cb(pjsua_call_id call_id, if (status != PJ_SUCCESS) { pjsua_media_channel_deinit(call_id); - goto on_error; + goto on_return; } /* Tell the media transport of a new offer/answer session */ @@ -1598,7 +1598,7 @@ static pj_status_t media_channel_init_cb(pjsua_call_id call_id, call->med_ch_info.state = call_med->tp_st; call->med_ch_info.sip_err_code = PJSIP_SC_NOT_ACCEPTABLE; pjsua_media_channel_deinit(call_id); - goto on_error; + goto on_return; } set_media_tp_state(call_med, PJSUA_MED_TP_INIT); @@ -1607,7 +1607,7 @@ static pj_status_t media_channel_init_cb(pjsua_call_id call_id, call->med_ch_info.status = PJ_SUCCESS; -on_error: +on_return: if (call->med_ch_cb) (*call->med_ch_cb)(call->index, &call->med_ch_info); @@ -1715,7 +1715,7 @@ pj_status_t pjsua_media_channel_init(pjsua_call_id call_id, * count from the call setting only. */ if (reinit) { - pjmedia_sdp_session *sdp; + const pjmedia_sdp_session *sdp; status = pjmedia_sdp_neg_get_active_local(call->inv->neg, &sdp); pj_assert(status == PJ_SUCCESS); |