[Freeswitch-svn] [commit] r7559 - in freeswitch/trunk/src/mod: applications/mod_conference loggers/mod_console xml_int/mod_xml_cdr

[Freeswitch SVN]

Author: mikej
Date: Fri Feb  8 14:06:13 2008
New Revision: 7559

Modified:
   freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c
   freeswitch/trunk/src/mod/loggers/mod_console/mod_console.c
   freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c

Log:
extra error checking.

Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c
==============================================================================
--- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c	(original)
+++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c	Fri Feb  8 14:06:13 2008
@@ -856,7 +856,7 @@
 			break;
 		}
 		switch_mutex_lock(conference->mutex);
-		ready = has_file_data = total = 0;
+		has_file_data = ready = total = 0;
 
 		/* Read one frame of audio from each member channel and save it for redistribution */
 		for (imember = conference->members; imember; imember = imember->next) {

Modified: freeswitch/trunk/src/mod/loggers/mod_console/mod_console.c
==============================================================================
--- freeswitch/trunk/src/mod/loggers/mod_console/mod_console.c	(original)
+++ freeswitch/trunk/src/mod/loggers/mod_console/mod_console.c	Fri Feb  8 14:06:13 2008
@@ -138,7 +138,7 @@
 #else
 				COLORIZE = 1;
 #endif
-			} else if (!strcasecmp(var, "loglevel")) {
+			} else if (!strcasecmp(var, "loglevel") && !switch_strlen_zero(val)) {
 				hard_log_level = switch_log_str2level(val);
 			}
 		}

Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c
==============================================================================
--- freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c	(original)
+++ freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c	Fri Feb  8 14:06:13 2008
@@ -265,23 +265,23 @@
 			char *var = (char *) switch_xml_attr_soft(param, "name");
 			char *val = (char *) switch_xml_attr_soft(param, "value");
 
-			if (!strcasecmp(var, "cred")) {
+			if (!strcasecmp(var, "cred") && !switch_strlen_zero(val)) {
 				globals.cred = strdup(val);
-			} else if (!strcasecmp(var, "url")) {
+			} else if (!strcasecmp(var, "url") && !switch_strlen_zero(val)) {
 				globals.url = strdup(val);
-			} else if (!strcasecmp(var, "delay")) {
+			} else if (!strcasecmp(var, "delay") && !switch_strlen_zero(val)) {
 				globals.delay = (uint32_t) atoi(val);
 			} else if (!strcasecmp(var, "log-b-leg")) {
 				globals.log_b = switch_true(val);
 			} else if (!strcasecmp(var, "disable-100-continue") && switch_true(val)) {
 				globals.disable100continue = 1;
-			} else if (!strcasecmp(var, "encode")) {
+			} else if (!strcasecmp(var, "encode") && !switch_strlen_zero(val)) {
 				if (!strcasecmp(val, "base64")) {
 					globals.encode = 2;
 				} else {
 					globals.encode = switch_true(val) ? 1 : 0;
 				}
-			} else if (!strcasecmp(var, "retries")) {
+			} else if (!strcasecmp(var, "retries") && !switch_strlen_zero(val)) {
 				globals.retries = (uint32_t) atoi(val);
 			} else if (!strcasecmp(var, "log-dir")) {
 				if (switch_strlen_zero(val)) {