diff options
| author | Tilghman Lesher <tilghman@meg.abyt.es> | 2010-09-24 13:55:11 +0000 |
|---|---|---|
| committer | Tilghman Lesher <tilghman@meg.abyt.es> | 2010-09-24 13:55:11 +0000 |
| commit | 794ff358a3edee3734378aed412f048315267906 (patch) | |
| tree | 5af5f5d703a14dbc04e751073e2ee2a7852f00ad /funcs | |
| parent | 296a898edbddbc76007079f72f32d2a0f4cf85c0 (diff) | |
Merged revisions 288713 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
................
r288713 | tilghman | 2010-09-24 08:54:17 -0500 (Fri, 24 Sep 2010) | 12 lines
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: https://origsvn.digium.com/svn/asterisk/trunk@288714 65c4cc65-6c06-0410-ace0-fbb531ad65f3
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] == '_') { |