diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2012-06-08 20:49:00 +0000 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2012-06-08 20:49:00 +0000 |
| commit | 8b2412db289b43202ef33053fb4efc4481d99bd4 (patch) | |
| tree | 2b32104f4cb3176802581a4ceb4d7c58d91d6200 | |
| parent | 4ca35e090740f3df3450f4ed11abecf68c2546cc (diff) | |
Tweak ast_channel_softhangup_withcause_locked() to take a typed parameter.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@368712 65c4cc65-6c06-0410-ace0-fbb531ad65f3
| -rw-r--r-- | include/asterisk/channel.h | 8 | ||||
| -rw-r--r-- | main/channel.c | 6 |
2 files changed, 5 insertions, 9 deletions
diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h index da3515754..f183fe00e 100644 --- a/include/asterisk/channel.h +++ b/include/asterisk/channel.h @@ -1407,11 +1407,11 @@ int ast_check_hangup_locked(struct ast_channel *chan); /*! * \brief Lock the given channel, then request softhangup on the channel with the given causecode - * \param obj channel on which to hang up - * \param causecode cause code to use - * \return 0 + * \param chan channel on which to hang up + * \param causecode cause code to use (Zero if don't use cause code) + * \return Nothing */ -int ast_channel_softhangup_withcause_locked(void *obj, int causecode); +void ast_channel_softhangup_withcause_locked(struct ast_channel *chan, int causecode); /*! * \brief Compare a offset with the settings of when to hang a channel up diff --git a/main/channel.c b/main/channel.c index 8bd973501..bfca3ec8d 100644 --- a/main/channel.c +++ b/main/channel.c @@ -602,10 +602,8 @@ int ast_check_hangup_locked(struct ast_channel *chan) return res; } -int ast_channel_softhangup_withcause_locked(void *obj, int causecode) +void ast_channel_softhangup_withcause_locked(struct ast_channel *chan, int causecode) { - struct ast_channel *chan = obj; - ast_channel_lock(chan); if (causecode > 0) { @@ -618,8 +616,6 @@ int ast_channel_softhangup_withcause_locked(void *obj, int causecode) ast_softhangup_nolock(chan, AST_SOFTHANGUP_EXPLICIT); ast_channel_unlock(chan); - - return 0; } static int ast_channel_softhangup_cb(void *obj, void *arg, int flags) |