[Core] Fix various dead assignments.

diff --git a/src/switch_event.c b/src/switch_event.c
index a29ac78858a32a68ca9cc65766c4ada3298234b5..efe43e603ae4ee439b3a9fe2cd7e7cd26e32f82c 100644 (file)
--- a/src/switch_event.c
+++ b/src/switch_event.c
@@ -2508,7 +2508,6 @@ SWITCH_DECLARE(char *) switch_event_expand_headers_check(switch_event_t *event,
                                switch_safe_free(expanded_sub_val);
                                sub_val = NULL;
                                vname = NULL;
-                               vtype = 0;
                                br = 0;
                        }
 

diff --git a/src/switch_ivr_async.c b/src/switch_ivr_async.c
index 48e75f8c548494391507b1e16e1d4f3e6eccf4d5..14063f05b1cb63f5abedb19ad0eaf527ee33feb3 100644 (file)
--- a/src/switch_ivr_async.c
+++ b/src/switch_ivr_async.c
@@ -5389,7 +5389,6 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_broadcast(const char *uuid, const cha
 
        if ((flags & SMF_ECHO_ALEG)) {
                if ((flags & SMF_EXEC_INLINE)) {
-                       nomedia = 0;
                        switch_core_session_execute_application(session, app, path);
                } else {
                        if (switch_event_create(&event, SWITCH_EVENT_COMMAND) == SWITCH_STATUS_SUCCESS) {

diff --git a/src/switch_ivr_bridge.c b/src/switch_ivr_bridge.c
index 3ce329a3f00b26073abb5f5834d8674baba2656c..cc38f1f28b877afe6584e7f14b7df13ee3014ebc 100644 (file)
--- a/src/switch_ivr_bridge.c
+++ b/src/switch_ivr_bridge.c
@@ -420,9 +420,7 @@ static void *audio_bridge_thread(switch_thread_t *thread, void *obj)
        inner_bridge = switch_channel_test_flag(chan_a, CF_INNER_BRIDGE);
 
        if (!switch_channel_test_flag(chan_a, CF_ANSWERED) && (bridge_answer_timeout = switch_channel_get_variable(chan_a, "bridge_answer_timeout"))) {
-               if ((answer_timeout = atoi(bridge_answer_timeout)) < 0) {
-                       answer_timeout = 0;
-               } else {
+               if ((answer_timeout = atoi(bridge_answer_timeout)) >= 0) {
                        answer_limit = switch_epoch_time_now(NULL) + answer_timeout;
                }
        }

diff --git a/src/switch_time.c b/src/switch_time.c
index d97ff681d4b1876fa8266bbdaaeb5b39441a7700..fc94b48ee4f1a0e28214e171bc01acc02f68b5ca 100644 (file)
--- a/src/switch_time.c
+++ b/src/switch_time.c
@@ -1103,7 +1103,6 @@ SWITCH_MODULE_RUNTIME_FUNCTION(softtimer_runtime)
                }
        }
 
-       ts = 0;
        last = 0;
        fwd_errs = rev_errs = 0;
 
@@ -1317,7 +1316,6 @@ SWITCH_MODULE_RUNTIME_FUNCTION(softtimer_runtime)
 
        if (tfd > -1) {
                close(tfd);
-               tfd = -1;
        }