diff options
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 cc1e92166..db1e85ddb 100644 --- a/funcs/func_callerid.c +++ b/funcs/func_callerid.c @@ -69,8 +69,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); @@ -86,8 +86,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); } @@ -141,8 +141,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); |