diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-09-24 13:54:17 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-09-24 13:54:17 +0000 |
| commit | 148f4e5a0866b9edbc060d3fd6f3ad94fdd61f1a (patch) | |
| tree | 8d9ea54c2e2ec99a06ca564c8ead51055dbb9eca /funcs | |
| parent | 5e87304e80f4013d2501183aa1a2753f8ecef04a (diff) | |
Merged revisions 288712 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2
........
r288712 | tilghman | 2010-09-24 08:53:30 -0500 (Fri, 24 Sep 2010) | 5 lines
Solaris won't printf a NULL.
(closes issue #18041)
Reported by: asgaroth
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.8@288713 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'funcs')
| -rw-r--r-- | funcs/func_strings.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/funcs/func_strings.c b/funcs/func_strings.c index db18d9d4a..15c219b67 100644 --- a/funcs/func_strings.c +++ b/funcs/func_strings.c @@ -939,14 +939,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) { if (origvar[0] == '_') { |