From: Richard Mudgett <rmudgett@digium.com>
Date: Thu, 4 Dec 2008 01:36:39 +0000 (+0000)
Subject: Jcolp pointed out that num will also match number
X-Git-Tag: 1.6.2.0-beta1~723
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=64a1895f3ca7797fdf164fd95ff4891b8198fceb;p=thirdparty%2Fasterisk.git

Jcolp pointed out that num will also match number

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@160856 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/funcs/func_callerid.c b/funcs/func_callerid.c
index b44d7bae9b..8bce770a2b 100644
--- a/funcs/func_callerid.c
+++ b/funcs/func_callerid.c
@@ -137,8 +137,8 @@ static int callerid_read(struct ast_channel *chan, const char *cmd, char *data,
 			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);
@@ -154,8 +154,8 @@ static int callerid_read(struct ast_channel *chan, const char *cmd, char *data,
 			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);
 			}
@@ -209,8 +209,8 @@ static int callerid_write(struct ast_channel *chan, const char *cmd, char *data,
 		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);