Merge pull request #370 from signalwire/core_dead_assignments
[Core] Fix various dead assignments.
This commit is contained in:
commit
0d3ee4b2ae
|
@ -2508,7 +2508,6 @@ SWITCH_DECLARE(char *) switch_event_expand_headers_check(switch_event_t *event,
|
||||||
switch_safe_free(expanded_sub_val);
|
switch_safe_free(expanded_sub_val);
|
||||||
sub_val = NULL;
|
sub_val = NULL;
|
||||||
vname = NULL;
|
vname = NULL;
|
||||||
vtype = 0;
|
|
||||||
br = 0;
|
br = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -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_ECHO_ALEG)) {
|
||||||
if ((flags & SMF_EXEC_INLINE)) {
|
if ((flags & SMF_EXEC_INLINE)) {
|
||||||
nomedia = 0;
|
|
||||||
switch_core_session_execute_application(session, app, path);
|
switch_core_session_execute_application(session, app, path);
|
||||||
} else {
|
} else {
|
||||||
if (switch_event_create(&event, SWITCH_EVENT_COMMAND) == SWITCH_STATUS_SUCCESS) {
|
if (switch_event_create(&event, SWITCH_EVENT_COMMAND) == SWITCH_STATUS_SUCCESS) {
|
||||||
|
|
|
@ -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);
|
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 (!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) {
|
if ((answer_timeout = atoi(bridge_answer_timeout)) >= 0) {
|
||||||
answer_timeout = 0;
|
|
||||||
} else {
|
|
||||||
answer_limit = switch_epoch_time_now(NULL) + answer_timeout;
|
answer_limit = switch_epoch_time_now(NULL) + answer_timeout;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1103,7 +1103,6 @@ SWITCH_MODULE_RUNTIME_FUNCTION(softtimer_runtime)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
ts = 0;
|
|
||||||
last = 0;
|
last = 0;
|
||||||
fwd_errs = rev_errs = 0;
|
fwd_errs = rev_errs = 0;
|
||||||
|
|
||||||
|
@ -1317,7 +1316,6 @@ SWITCH_MODULE_RUNTIME_FUNCTION(softtimer_runtime)
|
||||||
|
|
||||||
if (tfd > -1) {
|
if (tfd > -1) {
|
||||||
close(tfd);
|
close(tfd);
|
||||||
tfd = -1;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue