]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
windows build tweaks.
authorMichael Jerris <mike@jerris.com>
Fri, 10 Oct 2008 00:29:45 +0000 (00:29 +0000)
committerMichael Jerris <mike@jerris.com>
Fri, 10 Oct 2008 00:29:45 +0000 (00:29 +0000)
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@9922 d0543943-73ff-0310-b7d9-9358b9ac24b2

src/mod/applications/mod_commands/mod_commands.c
src/switch_ivr_originate.c

index 788f9c4c88e4ebd1e05d0b740e8eed107df2d180..03de3e736a6a17a1c5dc7186e176e89134243789 100644 (file)
@@ -2335,7 +2335,7 @@ SWITCH_STANDARD_API(uuid_session_heartbeat_function)
 
        argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0])));
 
-       if (argc != 2) {
+       if (argc != 2 || !argv[0]) {
                goto error;
        }
 
index 6d8efb2cd2ea7cdb8cc28d40a801991f7c0b313a..50fe499587367cbf151cf73fb1e305e05e407cab 100644 (file)
@@ -1280,7 +1280,6 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess
                                                ok = 1;
                                                for (i = 0; i < and_argc; i++) {
                                                        switch_channel_t *pchannel;
-                                                       switch_call_cause_t cause;
                                                        const char *cause_str;
                                                        
                                                        if (!peer_sessions[i]) {
@@ -1289,8 +1288,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess
                                                        pchannel = switch_core_session_get_channel(peer_sessions[i]);
 
                                                        if (switch_channel_get_state(pchannel) >= CS_HANGUP) {
-                                                               cause = switch_channel_get_cause(pchannel);
-                                                               cause_str = switch_channel_cause2str(cause);
+                                                               cause_str = switch_channel_cause2str(switch_channel_get_cause(pchannel));
                                                                if (switch_stristr(cause_str, fail_on_single_reject_var)) {
                                                                        ok = 0;
                                                                        break;