kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-25 14:06:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 160856 via svnmerge from

Browse Source 
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
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@160857 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Richard Mudgett
2008-12-04 01:38:08 +00:00
parent 3ea1eea638
commit a225f81162
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
funcs/func_callerid.c
View File

@@ -66,8 +66,8 @@ static int callerid_read(struct ast_channel *chan, const char *cmd, char *data,
snprintf(buf, len, "\"%s\" <%s>", name, num); snprintf(buf, len, "\"%s\" <%s>", name, num);
} else if (!strncasecmp("name", data, 4)) { } else if (!strncasecmp("name", data, 4)) {
ast_copy_string(buf, name, len); ast_copy_string(buf, name, len);
} else if (!strncasecmp("num", data, 3) } else if (!strncasecmp("num", data, 3)) {
|| !strncasecmp("number", data, 6)) { /* also matches "number" */
ast_copy_string(buf, num, len); ast_copy_string(buf, num, len);
} else { } else {
ast_log(LOG_ERROR, "Unknown callerid data type '%s'.\n", data); ast_log(LOG_ERROR, "Unknown callerid data type '%s'.\n", data);
@@ -83,8 +83,8 @@ static int callerid_read(struct ast_channel *chan, const char *cmd, char *data,
if (chan->cid.cid_name) { if (chan->cid.cid_name) {
ast_copy_string(buf, chan->cid.cid_name, len); ast_copy_string(buf, chan->cid.cid_name, len);
} }
} else if (!strncasecmp("num", data, 3) } else if (!strncasecmp("num", data, 3)) {
|| !strncasecmp("number", data, 6)) { /* also matches "number" */
if (chan->cid.cid_num) { if (chan->cid.cid_num) {
ast_copy_string(buf, chan->cid.cid_num, len); ast_copy_string(buf, chan->cid.cid_num, len);
} }
@@ -136,8 +136,8 @@ static int callerid_write(struct ast_channel *chan, const char *cmd, char *data,
if (chan->cdr) { if (chan->cdr) {
ast_cdr_setcid(chan->cdr, chan); ast_cdr_setcid(chan->cdr, chan);
} }
} else if (!strncasecmp("num", data, 3) } else if (!strncasecmp("num", data, 3)) {
|| !strncasecmp("number", data, 6)) { /* also matches "number" */
ast_set_callerid(chan, value, NULL, NULL); ast_set_callerid(chan, value, NULL, NULL);
if (chan->cdr) { if (chan->cdr) {
ast_cdr_setcid(chan->cdr, chan); ast_cdr_setcid(chan->cdr, chan);