use switch_set_flag in a few places we were doing it manually before

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@10534 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/src/switch_core.c b/src/switch_core.c
index 0c1132cd5ff95fe9298eca98b5dd653c7b7e17ba..8599b2e69e3de2610866ef7a478e29a8da911462 100644 (file)
--- a/src/switch_core.c
+++ b/src/switch_core.c
@@ -973,7 +973,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_init(switch_core_flag_t flags, switc
        runtime.dummy_cng_frame.data = runtime.dummy_data;
        runtime.dummy_cng_frame.datalen = sizeof(runtime.dummy_data);
        runtime.dummy_cng_frame.buflen = sizeof(runtime.dummy_data);
-       runtime.dummy_cng_frame.flags = SFF_CNG;
+       switch_set_flag(&runtime.dummy_cng_frame, SFF_CNG);
 
        switch_set_flag((&runtime), SCF_NO_NEW_SESSIONS);
        runtime.hard_log_level = SWITCH_LOG_DEBUG;

diff --git a/src/switch_ivr.c b/src/switch_ivr.c
index 4d2a92e35e6bf2576f03abb83cdbad26678702bc..12378fd4b0f286abd0405ca17ae6895f8011473e 100644 (file)
--- a/src/switch_ivr.c
+++ b/src/switch_ivr.c
@@ -50,7 +50,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_sleep(switch_core_session_t *session,
        cng_frame.data = data;
        cng_frame.datalen = 2;
        cng_frame.buflen = 2;
-       cng_frame.flags = SFF_CNG;
+       switch_set_flag(&cng_frame, SFF_CNG);
 
        for (;;) {
                now = switch_timestamp_now();

diff --git a/src/switch_ivr_menu.c b/src/switch_ivr_menu.c
index c50f16077446995fab230d3c6889b4a5c3ec1127..94a2a890fa5a05055ac8585595694cc33be3615a 100644 (file)
--- a/src/switch_ivr_menu.c
+++ b/src/switch_ivr_menu.c
@@ -178,7 +178,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_menu_init(switch_ivr_menu_t ** new_me
        menu->actions = NULL;
 
        if (newpool) {
-               menu->flags |= SWITCH_IVR_MENU_FLAG_FREEPOOL;
+               switch_set_flag(menu, SWITCH_IVR_MENU_FLAG_FREEPOOL);
        }
 
        if (menu->timeout <= 0) {
@@ -188,7 +188,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_menu_init(switch_ivr_menu_t ** new_me
        if (main) {
                switch_ivr_menu_stack_add(&main, menu);
        } else {
-               menu->flags |= SWITCH_IVR_MENU_FLAG_STACK;
+               switch_set_flag(menu, SWITCH_IVR_MENU_FLAG_STACK);
        }
 
        *new_menu = menu;

diff --git a/src/switch_rtp.c b/src/switch_rtp.c
index aeddce7f91733bda80ae5bb3dc1d0a00bd0e5f3a..78ee4f576f688d10fa8c15dc0afb7ad25039093b 100644 (file)
--- a/src/switch_rtp.c
+++ b/src/switch_rtp.c
@@ -1769,9 +1769,9 @@ SWITCH_DECLARE(switch_status_t) switch_rtp_zerocopy_read_frame(switch_rtp_t *rtp
        frame->packet = &rtp_session->recv_msg;
        frame->packetlen = bytes;
        frame->source = __FILE__;
-       frame->flags |= SFF_RAW_RTP;
+       switch_set_flag(frame, SFF_RAW_RTP);
        if (frame->payload == rtp_session->te) {
-               frame->flags |= SFF_RFC2833;
+               switch_set_flag(frame, SFF_RFC2833);
        }
        frame->timestamp = ntohl(rtp_session->recv_msg.header.ts);
        frame->seq = (uint16_t) ntohs((u_short) rtp_session->recv_msg.header.seq);