summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Mudgett <rmudgett@digium.com>2011-01-27 19:12:32 +0000
committerRichard Mudgett <rmudgett@digium.com>2011-01-27 19:12:32 +0000
commit4e354aebc9219912aa7892e2d605e12b21809fd1 (patch)
tree49b45e1ee39b983c5546022d145cea38114447b1
parent650d1ce978b429c2adda5b529ae72c9af014cd4e (diff)
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
-rw-r--r--main/ccss.c4
1 files 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;
}