diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2008-12-04 01:36:39 +0000 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2008-12-04 01:36:39 +0000 |
| commit | 64a1895f3ca7797fdf164fd95ff4891b8198fceb (patch) | |
| tree | 3c2d7c81a2ac387af59c8781ae2a4196f9f92171 /funcs/func_callerid.c | |
| parent | 7ed9924348c02423de5f92ecc18caf8bb907c958 (diff) | |
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
Diffstat (limited to 'funcs/func_callerid.c')
| -rw-r--r-- | funcs/func_callerid.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/funcs/func_callerid.c b/funcs/func_callerid.c index b44d7bae9..8bce770a2 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); |