diff options
| author | oej <oej@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-11-25 19:33:33 +0000 |
|---|---|---|
| committer | oej <oej@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-11-25 19:33:33 +0000 |
| commit | bc2127888798606e6c629dc5ba9a65cc4b871b4e (patch) | |
| tree | 714382b5f2c9c7c0d60d0c5cc5bc67cc1935c01c /main | |
| parent | 6ab028735f2a5a98cbfe1fe2bf1e2d553405789a (diff) | |
Try to get channel.h and channel.c aligned in regards to ast_set_callerid as well
as change name of variables to follow the rest of the naming.
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@89564 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -rw-r--r-- | main/channel.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/main/channel.c b/main/channel.c index 8e16b733e..13968e483 100644 --- a/main/channel.c +++ b/main/channel.c @@ -3755,22 +3755,22 @@ int ast_do_masquerade(struct ast_channel *original) return 0; } -void ast_set_callerid(struct ast_channel *chan, const char *callerid, const char *calleridname, const char *ani) +void ast_set_callerid(struct ast_channel *chan, const char *cid_num, const char *cid_name, const char *cid_ani) { - if (callerid) { + if (cid_num) { if (chan->cid.cid_num) ast_free(chan->cid.cid_num); - chan->cid.cid_num = ast_strdup(callerid); + chan->cid.cid_num = ast_strdup(cid_num); } - if (calleridname) { + if (cid_name) { if (chan->cid.cid_name) ast_free(chan->cid.cid_name); - chan->cid.cid_name = ast_strdup(calleridname); + chan->cid.cid_name = ast_strdup(cid_name); } - if (ani) { + if (cid_ani) { if (chan->cid.cid_ani) ast_free(chan->cid.cid_ani); - chan->cid.cid_ani = ast_strdup(ani); + chan->cid.cid_ani = ast_strdup(cid_ani); } if (chan->cdr) ast_cdr_setcid(chan->cdr, chan); |