[svn-commits] rmudgett: branch group/issue8824 r160892 - in /team/group/issue8824: ./ funcs/

[SVN commits to the Digium repositories]

Author: rmudgett
Date: Wed Dec  3 20:09:19 2008
New Revision: 160892

URL: http://svn.digium.com/view/asterisk?view=rev&rev=160892
Log:
Resolved conflict and restarted automerge.

Merged revisions 160854,160856 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r160854 | rmudgett | 2008-12-03 19:14:22 -0600 (Wed, 03 Dec 2008) | 4 lines
  
  *  Found a couple more places where num/number needed to be done
  so 1.4 upgraders will not have problems.
  *  Added curly braces and minor tweaks.
........
  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:
    team/group/issue8824/   (props changed)
    team/group/issue8824/funcs/func_callerid.c

Propchange: team/group/issue8824/
------------------------------------------------------------------------------
    automerge = *

Propchange: team/group/issue8824/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Dec  3 20:09:19 2008
@@ -1,1 +1,1 @@
-/trunk:1-160838
+/trunk:1-160890

Modified: team/group/issue8824/funcs/func_callerid.c
URL: http://svn.digium.com/view/asterisk/team/group/issue8824/funcs/func_callerid.c?view=diff&rev=160892&r1=160891&r2=160892
==============================================================================
--- team/group/issue8824/funcs/func_callerid.c (original)
+++ team/group/issue8824/funcs/func_callerid.c Wed Dec  3 20:09:19 2008
@@ -138,6 +138,7 @@
 		} else if (!strncasecmp("name", data, 4)) {
 			ast_copy_string(buf, name, len);
 		} 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);
@@ -154,6 +155,7 @@
 				ast_copy_string(buf, chan->cid.cid_name, len);
 			}
 		} else if (!strncasecmp("num", data, 3)) {
+			/* also matches "number" */
 			if (chan->cid.cid_num) {
 				ast_copy_string(buf, chan->cid.cid_num, len);
 			}
@@ -207,8 +209,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);