summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorRichard Mudgett <rmudgett@digium.com>2013-02-09 01:31:55 +0000
committerRichard Mudgett <rmudgett@digium.com>2013-02-09 01:31:55 +0000
commit5b236ee647c5fb3e220a0e6405b5bf6a21ba6e1c (patch)
treedfd55b12e310fe0693a8f247910ad2afe1e83918 /main
parent9da5ef1b911e9d3883286fd79d44978ee8c4e1af (diff)
Make ast_do_masquerade() a void function.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@381086 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main')
-rw-r--r--main/channel.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/main/channel.c b/main/channel.c
index 30df1432c..9c8f32cb5 100644
--- a/main/channel.c
+++ b/main/channel.c
@@ -6863,7 +6863,7 @@ static void masquerade_colp_transfer(struct ast_channel *transferee, struct xfer
* this function, it invalidates our channel container locking order. All channels
* must be unlocked before it is permissible to lock the channels' ao2 container.
*/
-int ast_do_masquerade(struct ast_channel *original)
+void ast_do_masquerade(struct ast_channel *original)
{
int x;
int origstate;
@@ -6940,7 +6940,7 @@ int ast_do_masquerade(struct ast_channel *original)
*/
ast_channel_unlock(original);
ao2_unlock(channels);
- return 0;
+ return;
}
/* Bump the refs to ensure that they won't dissapear on us. */
@@ -7345,8 +7345,6 @@ int ast_do_masquerade(struct ast_channel *original)
/* Release our held safety references. */
ast_channel_unref(original);
ast_channel_unref(clonechan);
-
- return 0;
}
void ast_set_callerid(struct ast_channel *chan, const char *cid_num, const char *cid_name, const char *cid_ani)