From 4e354aebc9219912aa7892e2d605e12b21809fd1 Mon Sep 17 00:00:00 2001 From: Richard Mudgett Date: Thu, 27 Jan 2011 19:12:32 +0000 Subject: Merged revisions 304554 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r304554 | rmudgett | 2011-01-27 13:08:14 -0600 (Thu, 27 Jan 2011) | 4 lines Warning message if CALLCOMPLETION(cc_callback_macro or cc_agent_dialstring) are empty. Test if the value pointer is not NULL instead of not ast_strlen_zero(). ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@304555 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/ccss.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/main/ccss.c b/main/ccss.c index ce346f53e..3583e8472 100644 --- a/main/ccss.c +++ b/main/ccss.c @@ -613,6 +613,7 @@ int ast_cc_get_param(struct ast_cc_config_params *params, const char * const nam char *buf, size_t buf_len) { const char *value = NULL; + if (!strcasecmp(name, "cc_callback_macro")) { value = ast_get_cc_callback_macro(params); } else if (!strcasecmp(name, "cc_agent_policy")) { @@ -622,8 +623,7 @@ int ast_cc_get_param(struct ast_cc_config_params *params, const char * const nam } else if (!strcasecmp(name, "cc_agent_dialstring")) { value = ast_get_cc_agent_dialstring(params); } - - if (!ast_strlen_zero(value)) { + if (value) { ast_copy_string(buf, value, buf_len); return 0; } -- cgit v1.2.3