diff options
author | Matthew Jordan <mjordan@digium.com> | 2015-03-30 02:39:18 +0000 |
---|---|---|
committer | Matthew Jordan <mjordan@digium.com> | 2015-03-30 02:39:18 +0000 |
commit | 09b681e344b5f40544ae0de8685a4010cba1d21e (patch) | |
tree | be0a7c54f2a52525caebbe30d110f32c0f899650 /channels/chan_pjsip.c | |
parent | 7f33abb827135082ccc1528bc4e01206f847f468 (diff) |
clang compiler warnings: Fix invalid enum conversion
This patch fixes some invalid enum conversion warnings caught by clang. In
particular:
* chan_sip: Several functions mixed usage of the st_refresher_param
enum and st_refresher enum. This patch corrects the functions to use the
right enum.
* chan_pjsip: Fixed mixed usage of ast_sip_session_t38state and ast_t38_state.
* strings: Fixed incorrect usage of AO2 flags with strings container.
* res_stasis: Change a return enumeration to stasis_app_user_event_res.
Review: https://reviewboard.asterisk.org/r/4535
ASTERISK-24917
Reported by: dkdegroot
patches:
rb4535.patch submitted by dkdegroot (License 6600)
........
Merged revisions 433746 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/13@433747 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_pjsip.c')
-rw-r--r-- | channels/chan_pjsip.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/channels/chan_pjsip.c b/channels/chan_pjsip.c index 28ddc7630..3ccaef03c 100644 --- a/channels/chan_pjsip.c +++ b/channels/chan_pjsip.c @@ -919,7 +919,7 @@ static int chan_pjsip_queryoption(struct ast_channel *ast, int option, void *dat struct ast_sip_channel_pvt *channel = ast_channel_tech_pvt(ast); struct ast_sip_session *session = channel->session; int res = -1; - enum ast_sip_session_t38state state = T38_STATE_UNAVAILABLE; + enum ast_t38_state state = T38_STATE_UNAVAILABLE; switch (option) { case AST_OPTION_T38_STATE: |