[Freeswitch-svn] [commit] r8897 - freeswitch/trunk/src

[Freeswitch SVN]

Author: mikej
Date: Thu Jul  3 19:37:19 2008
New Revision: 8897

Modified:
   freeswitch/trunk/src/switch_ivr_async.c
   freeswitch/trunk/src/switch_utils.c

Log:
build tweaks

Modified: freeswitch/trunk/src/switch_ivr_async.c
==============================================================================
--- freeswitch/trunk/src/switch_ivr_async.c	(original)
+++ freeswitch/trunk/src/switch_ivr_async.c	Thu Jul  3 19:37:19 2008
@@ -544,7 +544,7 @@
 			if ( (argc = switch_separate_string(data, ',', argv, (sizeof(argv) / sizeof(argv[0])))) ) {
 				for ( i = 0; i < argc; i++ ) {
 					/* If one of the group matches, then ok */
-					if ( !strcmp(argv[i], require_group)) {
+					if (argv[i] && !strcmp(argv[i], require_group)) {
 						ok = 1;
 					}
 				}

Modified: freeswitch/trunk/src/switch_utils.c
==============================================================================
--- freeswitch/trunk/src/switch_utils.c	(original)
+++ freeswitch/trunk/src/switch_utils.c	Thu Jul  3 19:37:19 2008
@@ -1097,8 +1097,7 @@
 	}
 
 	if (getnameinfo(addr, sa->salen, host, sizeof(host), serv, sizeof(serv),
-		(flags & SWITCH_URI_NUMERIC_HOST) ? NI_NUMERICHOST : 0 |
-		(flags & SWITCH_URI_NUMERIC_PORT) ? NI_NUMERICSERV : 0) != 0) {
+		((flags & SWITCH_URI_NUMERIC_HOST) ? NI_NUMERICHOST : 0) | ((flags & SWITCH_URI_NUMERIC_PORT) ? NI_NUMERICSERV : 0)) != 0) {
 			return 0;
 	}