aboutsummaryrefslogtreecommitdiffstats
path: root/funcs
diff options
context:
space:
mode:
authortilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2010-09-24 13:53:30 +0000
committertilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2010-09-24 13:53:30 +0000
commitbd3a1ae8d5ea9bba5ac6a0ea1cbb7a503110436d (patch)
tree7aa769ccae33d9ade53d6897d8a4c343e41ed39d /funcs
parenta9697cb0f74cb1f50e4497bb70bf49357f0c425d (diff)
Solaris won't printf a NULL.
(closes issue #18041) Reported by: asgaroth git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@288712 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'funcs')
-rw-r--r--funcs/func_strings.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/funcs/func_strings.c b/funcs/func_strings.c
index f69cf8d62..9af4dfca4 100644
--- a/funcs/func_strings.c
+++ b/funcs/func_strings.c
@@ -609,14 +609,14 @@ static int array(struct ast_channel *chan, const char *cmd, char *var,
* 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]);