[asterisk-commits] rmudgett: trunk r304555 - in /trunk: ./ main/ccss.c

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Thu Jan 27 13:12:32 2011
New Revision: 304555

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=304555
Log:
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().
........

Modified:
    trunk/   (props changed)
    trunk/main/ccss.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/main/ccss.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/ccss.c?view=diff&rev=304555&r1=304554&r2=304555
==============================================================================
--- trunk/main/ccss.c (original)
+++ trunk/main/ccss.c Thu Jan 27 13:12:32 2011
@@ -613,6 +613,7 @@
 		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 @@
 	} 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;
 	}