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

diff --git a/main/ccss.c b/main/ccss.c
index ce346f53e108f00d662eccab577e4d37e5e44280..3583e8472b2afa818879808e1775b71f35663220 100644 (file)
--- 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;
        }