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

diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h
index da35157..f183fe0 100644 (file)
--- 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
 
 /*!
  * \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
 
 /*!
  * \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 8bd9735..bfca3ec 100644 (file)
--- a/main/channel.c
+++ b/main/channel.c
@@ -602,10 +602,8 @@ int ast_check_hangup_locked(struct ast_channel *chan)
        return res;
 }
 
        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) {
        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);
        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)
 }
 
 static int ast_channel_softhangup_cb(void *obj, void *arg, int flags)