[svn-commits] rmudgett: branch group/v14_colp r148327 - /team/group/v14_colp/funcs/

[SVN commits to the Digium repositories]

Author: rmudgett
Date: Fri Oct 10 13:50:03 2008
New Revision: 148327

URL: http://svn.digium.com/view/asterisk?view=rev&rev=148327
Log:
Fixed CALLERID, CONNECTEDLINE, and REDIRECTING to use the pre Asterisk v1.6 internal option separator character.

Modified:
    team/group/v14_colp/funcs/func_callerid.c
    team/group/v14_colp/funcs/func_connectedline.c
    team/group/v14_colp/funcs/func_redirecting.c

Modified: team/group/v14_colp/funcs/func_callerid.c
URL: http://svn.digium.com/view/asterisk/team/group/v14_colp/funcs/func_callerid.c?view=diff&rev=148327&r1=148326&r2=148327
==============================================================================
--- team/group/v14_colp/funcs/func_callerid.c (original)
+++ team/group/v14_colp/funcs/func_callerid.c Fri Oct 10 13:50:03 2008
@@ -59,10 +59,10 @@
 	if (!chan)
 		return -1;
 
-	if (strchr(opt, ',')) {
+	if (strchr(opt, '|')) {
 		char name[80], num[80];
 
-		data = strsep(&opt, ",");
+		data = strsep(&opt, "|");
 		ast_callerid_split(opt, name, sizeof(name), num, sizeof(num));
 
 		if (!strncasecmp("all", data, 3)) {

Modified: team/group/v14_colp/funcs/func_connectedline.c
URL: http://svn.digium.com/view/asterisk/team/group/v14_colp/funcs/func_connectedline.c?view=diff&rev=148327&r1=148326&r2=148327
==============================================================================
--- team/group/v14_colp/funcs/func_connectedline.c (original)
+++ team/group/v14_colp/funcs/func_connectedline.c Fri Oct 10 13:50:03 2008
@@ -92,7 +92,7 @@
 	}
 
 	/* Determine if the update indication inhibit option is present */
-	option = strchr(data, ',');
+	option = strchr(data, '|');
 	if (option) {
 		option = ast_skip_blanks(option + 1);
 		switch (*option) {

Modified: team/group/v14_colp/funcs/func_redirecting.c
URL: http://svn.digium.com/view/asterisk/team/group/v14_colp/funcs/func_redirecting.c?view=diff&rev=148327&r1=148326&r2=148327
==============================================================================
--- team/group/v14_colp/funcs/func_redirecting.c (original)
+++ team/group/v14_colp/funcs/func_redirecting.c Fri Oct 10 13:50:03 2008
@@ -78,8 +78,8 @@
 
 	if (!strncasecmp("all", data, 3)) {
 		snprintf(buf, len, "\"%s\" <%s>",
-			 S_OR(id->name, ""),
-			 S_OR(id->number, ""));
+			S_OR(id->name, ""),
+			S_OR(id->number, ""));
 	} else if (!strncasecmp("name", data, 4)) {
 		if (id->name) {
 			ast_copy_string(buf, id->name, len);
@@ -264,7 +264,7 @@
 	}
 
 	/* Determine if the update indication inhibit option is present */
-	option = strchr(data, ',');
+	option = strchr(data, '|');
 	if (option) {
 		option = ast_skip_blanks(option + 1);
 		switch (*option) {