[svn-commits] pcadach: trunk r47718 - in /trunk: ./ funcs/ include/asterisk/ main/

[svn-commits at lists.digium.com]

Author: pcadach
Date: Thu Nov 16 02:18:41 2006
New Revision: 47718

URL: http://svn.digium.com/view/asterisk?view=rev&rev=47718
Log:
Merged revisions 44809 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r44809 | pcadach | 2006-10-10 23:44:54 +0700 (Втр, 10 Окт 2006) | 1 line

CHANNEL() function sometime mix parameter and value
........

Modified:
    trunk/   (props changed)
    trunk/funcs/func_channel.c
    trunk/include/asterisk/channel.h
    trunk/main/channel.c

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

Modified: trunk/funcs/func_channel.c
URL: http://svn.digium.com/view/asterisk/trunk/funcs/func_channel.c?view=diff&rev=47718&r1=47717&r2=47718
==============================================================================
--- trunk/funcs/func_channel.c (original)
+++ trunk/funcs/func_channel.c Thu Nov 16 02:18:41 2006
@@ -112,13 +112,13 @@
 		locked_string_field_set(chan, musicclass, value);
 	else if (!strcasecmp(data, "tonezone")) {
 		struct tone_zone *new_zone;
-		if (!(new_zone = ast_get_indication_zone(data))) {
-			ast_log(LOG_ERROR, "Unknown country code for tonezone. Check indications.conf for available country codes.\n");
+		if (!(new_zone = ast_get_indication_zone(value))) {
+			ast_log(LOG_ERROR, "Unknown country code '%s' for tonezone. Check indications.conf for available country codes.\n", value);
 			ret = -1;	
 		} else 
 			chan->zone = new_zone;
 	} else if (!strcasecmp(data, "callgroup"))
-		chan->callgroup = ast_get_group(data);
+		chan->callgroup = ast_get_group(value);
 	else if (!strcasecmp(data, "txgain")) {
 		sscanf(value, "%hhd", &gainset);
 		ast_channel_setoption(chan, AST_OPTION_TXGAIN, &gainset, sizeof(gainset), 0);

Modified: trunk/include/asterisk/channel.h
URL: http://svn.digium.com/view/asterisk/trunk/include/asterisk/channel.h?view=diff&rev=47718&r1=47717&r2=47718
==============================================================================
--- trunk/include/asterisk/channel.h (original)
+++ trunk/include/asterisk/channel.h Thu Nov 16 02:18:41 2006
@@ -1323,7 +1323,7 @@
 									ast_set_flag(c, AST_FLAG_BLOCKING); \
 									} }
 
-ast_group_t ast_get_group(char *s);
+ast_group_t ast_get_group(const char *s);
 
 /*! \brief print call- and pickup groups into buffer */
 char *ast_print_group(char *buf, int buflen, ast_group_t group);

Modified: trunk/main/channel.c
URL: http://svn.digium.com/view/asterisk/trunk/main/channel.c?view=diff&rev=47718&r1=47717&r2=47718
==============================================================================
--- trunk/main/channel.c (original)
+++ trunk/main/channel.c Thu Nov 16 02:18:41 2006
@@ -4193,7 +4193,7 @@
 	return 0;
 }
 
-ast_group_t ast_get_group(char *s)
+ast_group_t ast_get_group(const char *s)
 {
 	char *piece;
 	char *c;