[Freeswitch-trunk] [commit] r12499 - freeswitch/trunk/src

[FreeSWITCH SVN]

Author: mrene
Date: Sat Mar  7 00:50:10 2009
New Revision: 12499

Log:
avoid (null) confusion

Modified:
   freeswitch/trunk/src/switch_xml_config.c

Modified: freeswitch/trunk/src/switch_xml_config.c
==============================================================================
--- freeswitch/trunk/src/switch_xml_config.c	(original)
+++ freeswitch/trunk/src/switch_xml_config.c	Sat Mar  7 00:50:10 2009
@@ -215,8 +215,12 @@
 								newstring = value; /* Regex match, accept value*/
 							} else {
 								newstring = (char*)item->defaultvalue;  /* Regex failed */
-								switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid value [%s] for parameter [%s], setting default [%s]\n", 
-									value, item->key, newstring ? newstring : "(null)");
+								if (newstring) {
+									switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid value [%s] for parameter [%s], setting default [%s]\n", 
+										value, item->key, newstring);
+								} else {
+									switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid value [%s] for parameter [%s]\n", value, item->key);
+								}
 								switch_xml_config_item_print_doc(SWITCH_LOG_ERROR, item);
 							}
 						} else {