From b9634d5f7ab2dad058d2e81bc96b86a72c6f89f2 Mon Sep 17 00:00:00 2001 From: William King Date: Wed, 7 Oct 2015 10:55:26 -0700 Subject: [PATCH] FS-8316 resolving the build warnings in the modules too --- src/mod/applications/mod_conference/conference_member.c | 2 +- src/mod/applications/mod_conference/mod_conference.c | 2 +- src/mod/applications/mod_enum/mod_enum.c | 2 +- src/mod/endpoints/mod_skinny/skinny_server.c | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/mod/applications/mod_conference/conference_member.c b/src/mod/applications/mod_conference/conference_member.c index 8d5af7fa62..5d60dcd16c 100644 --- a/src/mod/applications/mod_conference/conference_member.c +++ b/src/mod/applications/mod_conference/conference_member.c @@ -1422,7 +1422,7 @@ switch_status_t conference_member_say(conference_member_t *member, char *text, u fp = switch_core_strdup(pool, text); switch_assert(fp); - if (!switch_event_create_brackets(fp, '{', '}', ',', ¶ms, &new_fp, SWITCH_FALSE) == SWITCH_STATUS_SUCCESS) { + if (switch_event_create_brackets(fp, '{', '}', ',', ¶ms, &new_fp, SWITCH_FALSE) != SWITCH_STATUS_SUCCESS) { new_fp = fp; } diff --git a/src/mod/applications/mod_conference/mod_conference.c b/src/mod/applications/mod_conference/mod_conference.c index 7ae047ad36..963ae9aa15 100644 --- a/src/mod/applications/mod_conference/mod_conference.c +++ b/src/mod/applications/mod_conference/mod_conference.c @@ -899,7 +899,7 @@ switch_status_t conference_say(conference_obj_t *conference, const char *text, u fp = switch_core_strdup(pool, text); switch_assert(fp); - if (!switch_event_create_brackets(fp, '{', '}', ',', ¶ms, &new_fp, SWITCH_FALSE) == SWITCH_STATUS_SUCCESS) { + if (switch_event_create_brackets(fp, '{', '}', ',', ¶ms, &new_fp, SWITCH_FALSE) != SWITCH_STATUS_SUCCESS) { new_fp = fp; } diff --git a/src/mod/applications/mod_enum/mod_enum.c b/src/mod/applications/mod_enum/mod_enum.c index 42126f3009..efa3fe3125 100644 --- a/src/mod/applications/mod_enum/mod_enum.c +++ b/src/mod/applications/mod_enum/mod_enum.c @@ -838,7 +838,7 @@ SWITCH_STANDARD_API(enum_function) } - if (!enum_lookup(root, dest, &results, NULL, session) == SWITCH_STATUS_SUCCESS) { + if (enum_lookup(root, dest, &results, NULL, session) != SWITCH_STATUS_SUCCESS) { stream->write_function(stream, "No Match!\n"); return SWITCH_STATUS_SUCCESS; } diff --git a/src/mod/endpoints/mod_skinny/skinny_server.c b/src/mod/endpoints/mod_skinny/skinny_server.c index 28b68ab8fd..497bf68b84 100644 --- a/src/mod/endpoints/mod_skinny/skinny_server.c +++ b/src/mod/endpoints/mod_skinny/skinny_server.c @@ -149,13 +149,13 @@ switch_status_t skinny_create_incoming_session(listener_t *listener, uint32_t *l goto error; } /* First create the caller profile in the patterns Dialplan */ - if (!(tech_pvt->caller_profile = switch_caller_profile_new(switch_core_session_get_pool(nsession), + if ((tech_pvt->caller_profile = switch_caller_profile_new(switch_core_session_get_pool(nsession), NULL, listener->profile->patterns_dialplan, button->displayname, button->shortname, listener->remote_ip, NULL, NULL, NULL, "skinny" /* modname */, listener->profile->patterns_context, - "")) != 0) { + "")) == NULL) { skinny_log_ls_msg(listener, nsession, SWITCH_LOG_CRIT, "Error Creating Session caller profile\n"); goto error; }