[asterisk-commits] sgriepentrog: branch 1.8 r404951 - /branches/1.8/funcs/func_strings.c

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Mon Jan 6 11:31:33 CST 2014


Author: sgriepentrog
Date: Mon Jan  6 11:31:31 2014
New Revision: 404951

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=404951
Log:
func_strings: fix for memmove patch test

In r404674 the AST_TEST_DEFINE(test_REPLACE) test was added
that made use of a function that doesn't exist in 1.8. This
fixes that by reverting to directly accessing chan varshead.

Reported by: Tzafrir Cohen
(issue ASTERISK-22910)


Modified:
    branches/1.8/funcs/func_strings.c

Modified: branches/1.8/funcs/func_strings.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/funcs/func_strings.c?view=diff&rev=404951&r1=404950&r2=404951
==============================================================================
--- branches/1.8/funcs/func_strings.c (original)
+++ branches/1.8/funcs/func_strings.c Mon Jan  6 11:31:31 2014
@@ -1666,12 +1666,12 @@
 			break;
 		}
 
-		AST_LIST_INSERT_HEAD(ast_channel_varshead(chan), var, entries);
+		AST_LIST_INSERT_HEAD(&chan->varshead, var, entries);
 
 		snprintf(expression, sizeof(expression), "${REPLACE(%s,%s,%s)}", var->name, test_args[i].find_chars, test_args[i].replace_char);
 		ast_str_substitute_variables(&str, 0, chan, expression);
 
-		AST_LIST_REMOVE(ast_channel_varshead(chan), var, entries);
+		AST_LIST_REMOVE(&chan->varshead, var, entries);
 		ast_var_delete(var);
 
 		if (strcasecmp(ast_str_buffer(str), test_args[i].expected)) {




More information about the asterisk-commits mailing list