[asterisk-commits] tilghman: branch 1.6.2 r288712 - /branches/1.6.2/funcs/func_strings.c

[SVN commits to the Asterisk project]

Author: tilghman
Date: Fri Sep 24 08:53:30 2010
New Revision: 288712

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=288712
Log:
Solaris won't printf a NULL.

(closes issue #18041)
 Reported by: asgaroth

Modified:
    branches/1.6.2/funcs/func_strings.c

Modified: branches/1.6.2/funcs/func_strings.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/funcs/func_strings.c?view=diff&rev=288712&r1=288711&r2=288712
==============================================================================
--- branches/1.6.2/funcs/func_strings.c (original)
+++ branches/1.6.2/funcs/func_strings.c Fri Sep 24 08:53:30 2010
@@ -609,14 +609,14 @@
 	 * want them to be surprised by the result.  Hence, we prefer commas as the
 	 * delimiter, but we'll fall back to vertical bars if commas aren't found.
 	 */
-	ast_debug(1, "array (%s=%s)\n", var, value2);
+	ast_debug(1, "array (%s=%s)\n", var, S_OR(value2, ""));
 	AST_STANDARD_APP_ARGS(arg1, var);
 
 	AST_STANDARD_APP_ARGS(arg2, value2);
 
 	for (i = 0; i < arg1.argc; i++) {
 		ast_debug(1, "array set value (%s=%s)\n", arg1.var[i],
-				arg2.val[i]);
+				S_OR(arg2.val[i], ""));
 		if (i < arg2.argc) {
 			if (ishash) {
 				snprintf(varname, sizeof(varname), HASH_FORMAT, origvar, arg1.var[i]);