diff options
| author | rmudgett <rmudgett@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-04-03 02:12:33 +0000 |
|---|---|---|
| committer | rmudgett <rmudgett@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-04-03 02:12:33 +0000 |
| commit | f42e29b281d0cd12ab8ec57afc89061c613e4d62 (patch) | |
| tree | d5314391644adec2c19d0dc0b36644a20a12c759 /main/dial.c | |
| parent | fa32b379746e68f554e1b59db0911a2181bfcb75 (diff) | |
Consolidate ast_channel.cid.cid_rdnis into ast_channel.redirecting.from.number.
SWP-1229
ABE-2161
* Ensure chan_local.c:local_call() will not leak cid.cid_dnid when
copying.
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@256104 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/dial.c')
| -rw-r--r-- | main/dial.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/main/dial.c b/main/dial.c index 31ac899f8..7435d926c 100644 --- a/main/dial.c +++ b/main/dial.c @@ -174,15 +174,6 @@ static const struct ast_option_types { { AST_DIAL_OPTION_MAX, NULL, NULL }, /*!< Terminator of list */ }; -/*! \brief free the buffer if allocated, and set the pointer to the second arg */ -#define S_REPLACE(s, new_val) \ - do { \ - if (s) { \ - free(s); \ - } \ - s = (new_val); \ - } while (0) - /*! \brief Maximum number of channels we can watch at a time */ #define AST_MAX_WATCHERS 256 @@ -275,7 +266,6 @@ static int begin_dial_channel(struct ast_dial_channel *channel, struct ast_chann ast_channel_datastore_inherit(chan, channel->owner); /* Copy over callerid information */ - S_REPLACE(channel->owner->cid.cid_rdnis, ast_strdup(chan->cid.cid_rdnis)); ast_party_redirecting_copy(&channel->owner->redirecting, &chan->redirecting); channel->owner->cid.cid_tns = chan->cid.cid_tns; |