kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-16 23:08:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make ast_do_masquerade() a void function.

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@381086 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Richard Mudgett
2013-02-09 01:31:55 +00:00
parent 9da5ef1b91
commit 5b236ee647
3 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
main/channel.c
View File

@@ -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)