diff options
author | Luigi Rizzo <rizzo@icir.org> | 2006-04-21 10:37:59 +0000 |
---|---|---|
committer | Luigi Rizzo <rizzo@icir.org> | 2006-04-21 10:37:59 +0000 |
commit | ef619f6dd882f8b69f45bb81ec8e9756344ccf26 (patch) | |
tree | 3af148cbb9cb54a91b9b7ae753f0279589c6fdad /channels/chan_features.c | |
parent | 7d9c26dfeadaa6098b735e3381b7d1ab25d3d28b (diff) |
ast_strdup can handle NULL args well, so use it.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@21817 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_features.c')
-rw-r--r-- | channels/chan_features.c | 23 |
1 files changed, 4 insertions, 19 deletions
diff --git a/channels/chan_features.c b/channels/chan_features.c index a1eb195ab..0def48702 100644 --- a/channels/chan_features.c +++ b/channels/chan_features.c @@ -327,25 +327,10 @@ static int features_call(struct ast_channel *ast, char *dest, int timeout) ast_mutex_lock(&p->lock); x = indexof(p, ast, 0); if (!x && p->subchan) { - if (p->owner->cid.cid_num) - p->subchan->cid.cid_num = strdup(p->owner->cid.cid_num); - else - p->subchan->cid.cid_num = NULL; - - if (p->owner->cid.cid_name) - p->subchan->cid.cid_name = strdup(p->owner->cid.cid_name); - else - p->subchan->cid.cid_name = NULL; - - if (p->owner->cid.cid_rdnis) - p->subchan->cid.cid_rdnis = strdup(p->owner->cid.cid_rdnis); - else - p->subchan->cid.cid_rdnis = NULL; - - if (p->owner->cid.cid_ani) - p->subchan->cid.cid_ani = strdup(p->owner->cid.cid_ani); - else - p->subchan->cid.cid_ani = NULL; + p->subchan->cid.cid_num = ast_strdup(p->owner->cid.cid_num); + p->subchan->cid.cid_name = ast_strdup(p->owner->cid.cid_name); + p->subchan->cid.cid_rdnis = ast_strdup(p->owner->cid.cid_rdnis); + p->subchan->cid.cid_ani = ast_strdup(p->owner->cid.cid_ani); p->subchan->cid.cid_pres = p->owner->cid.cid_pres; ast_string_field_set(p->subchan, language, p->owner->language); |