[Freeswitch-svn] [commit] r9922 - in freeswitch/trunk/src: . mod/applications/mod_commands

[Freeswitch SVN]

Author: mikej
Date: Thu Oct  9 20:29:45 2008
New Revision: 9922

Modified:
   freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c
   freeswitch/trunk/src/switch_ivr_originate.c

Log:
windows build tweaks.

Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c
==============================================================================
--- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c	(original)
+++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c	Thu Oct  9 20:29:45 2008
@@ -2335,7 +2335,7 @@
 
 	argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0])));
 
-	if (argc != 2) {
+	if (argc != 2 || !argv[0]) {
 		goto error;
 	}
 

Modified: freeswitch/trunk/src/switch_ivr_originate.c
==============================================================================
--- freeswitch/trunk/src/switch_ivr_originate.c	(original)
+++ freeswitch/trunk/src/switch_ivr_originate.c	Thu Oct  9 20:29:45 2008
@@ -1280,7 +1280,6 @@
 						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 @@
 							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;