diff options
author | Luigi Rizzo <rizzo@icir.org> | 2006-06-03 23:46:23 +0000 |
---|---|---|
committer | Luigi Rizzo <rizzo@icir.org> | 2006-06-03 23:46:23 +0000 |
commit | 2724885b78a7afb65c041246df5f4d2ecc8758dc (patch) | |
tree | 48ba3f2843c2f28464f15d6acc9f5a163d232d14 /channels | |
parent | 24d1d23a93bb35733361d7b1ab407ee6d43f7d24 (diff) |
small simplification in assignments, and fix a typo in a comment.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@31871 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels')
-rw-r--r-- | channels/chan_sip.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 63897dcf3..e57942b83 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -7417,20 +7417,14 @@ static int get_refer_info(struct sip_pvt *transferer, struct sip_request *outgoi } -/*! \brief Call transfer support (old way, depreciated by the IETF)--*/ +/*! \brief Call transfer support (old way, deprecated by the IETF)--*/ static int get_also_info(struct sip_pvt *p, struct sip_request *oreq) { char tmp[256] = "", *c, *a; - struct sip_request *req = oreq; - struct sip_refer *referdata; + struct sip_request *req = oreq ? oreq : &p->initreq; + struct sip_refer *referdata = p->refer; const char *transfer_context = NULL; - referdata = p->refer; - - if (!oreq) - req = &p->initreq; - else - req = oreq; ast_copy_string(tmp, get_header(req, "Also"), sizeof(tmp)); c = get_in_brackets(tmp); |