From ce59fabd5c01a48b8f4fcd1d7522aef9f3fbe66d Mon Sep 17 00:00:00 2001 From: Matthew Jordan Date: Mon, 30 Mar 2015 02:39:57 +0000 Subject: 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 ........ Merged revisions 433747 from http://svn.asterisk.org/svn/asterisk/branches/13 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@433748 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/strings.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'main') diff --git a/main/strings.c b/main/strings.c index b6b9fbcd7..da63cdfc0 100644 --- a/main/strings.c +++ b/main/strings.c @@ -167,7 +167,8 @@ static int str_cmp(void *lhs, void *rhs, int flags) return strcmp(lhs, rhs) ? 0 : CMP_MATCH; } -struct ao2_container *ast_str_container_alloc_options(enum ao2_container_opts opts, int buckets) +//struct ao2_container *ast_str_container_alloc_options(enum ao2_container_opts opts, int buckets) +struct ao2_container *ast_str_container_alloc_options(enum ao2_alloc_opts opts, int buckets) { return ao2_container_alloc_options(opts, buckets, str_hash, str_cmp); } -- cgit v1.2.3