[asterisk-commits] rmudgett: branch 1.6.1 r160859 - in /branches/1.6.1: ./ funcs/func_callerid.c

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Wed Dec  3 19:41:25 2008
New Revision: 160859

URL: http://svn.digium.com/view/asterisk?view=rev&rev=160859
Log:
Merged revisions 160856 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r160856 | rmudgett | 2008-12-03 19:36:39 -0600 (Wed, 03 Dec 2008) | 1 line
  
  Jcolp pointed out that num will also match number
........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/funcs/func_callerid.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/funcs/func_callerid.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/funcs/func_callerid.c?view=diff&rev=160859&r1=160858&r2=160859
==============================================================================
--- branches/1.6.1/funcs/func_callerid.c (original)
+++ branches/1.6.1/funcs/func_callerid.c Wed Dec  3 19:41:25 2008
@@ -69,8 +69,8 @@
 			snprintf(buf, len, "\"%s\" <%s>", name, num);
 		} else if (!strncasecmp("name", data, 4)) {
 			ast_copy_string(buf, name, len);
-		} else if (!strncasecmp("num", data, 3)
-			|| !strncasecmp("number", data, 6)) {
+		} else if (!strncasecmp("num", data, 3)) {
+			/* also matches "number" */
 			ast_copy_string(buf, num, len);
 		} else {
 			ast_log(LOG_ERROR, "Unknown callerid data type '%s'.\n", data);
@@ -86,8 +86,8 @@
 			if (chan->cid.cid_name) {
 				ast_copy_string(buf, chan->cid.cid_name, len);
 			}
-		} else if (!strncasecmp("num", data, 3)
-			|| !strncasecmp("number", data, 6)) {
+		} else if (!strncasecmp("num", data, 3)) {
+			/* also matches "number" */
 			if (chan->cid.cid_num) {
 				ast_copy_string(buf, chan->cid.cid_num, len);
 			}
@@ -141,8 +141,8 @@
 		if (chan->cdr) {
 			ast_cdr_setcid(chan->cdr, chan);
 		}
-	} else if (!strncasecmp("num", data, 3)
-		|| !strncasecmp("number", data, 6)) {
+	} else if (!strncasecmp("num", data, 3)) {
+		/* also matches "number" */
 		ast_set_callerid(chan, value, NULL, NULL);
 		if (chan->cdr) {
 			ast_cdr_setcid(chan->cdr, chan);