Merged revisions 225105 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r225105 | tilghman | 2009-10-21 11:02:12 -0500 (Wed, 21 Oct 2009) | 4 lines

  Fix documentation for ast_softhangup() and correct the misuse thereof.
  (closes issue #16103)
   Reported by: majorbloodnok
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@225360 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index 67dd8a2..7636836 100644 (file)
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -5218,7 +5218,7 @@ static void sla_handle_hold_event(struct sla_event *event)
                ast_indicate(event->trunk_ref->trunk->chan, AST_CONTROL_HOLD);
        }
 
-       ast_softhangup(event->trunk_ref->chan, AST_CAUSE_NORMAL);
+       ast_softhangup(event->trunk_ref->chan, AST_SOFTHANGUP_DEV);
        event->trunk_ref->chan = NULL;
 }
 

diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h
index 1edd0d8..bade468 100644 (file)
--- a/include/asterisk/channel.h
+++ b/include/asterisk/channel.h
@@ -1257,7 +1257,7 @@ int ast_hangup(struct ast_channel *chan);
  * \brief Softly hangup up a channel
  *
  * \param chan channel to be soft-hung-up
- * \param cause        Ast hangupcause for hangup
+ * \param reason an AST_SOFTHANGUP_* reason code
  *
  * \details
  * Call the protocol layer, but don't destroy the channel structure
@@ -1268,14 +1268,14 @@ int ast_hangup(struct ast_channel *chan);
  *
  * \return Returns 0 regardless
  */
-int ast_softhangup(struct ast_channel *chan, int cause);
+int ast_softhangup(struct ast_channel *chan, int reason);
 
 /*!
  * \brief Softly hangup up a channel (no channel lock)
  * \param chan channel to be soft-hung-up
- * \param cause        Ast hangupcause for hangup (see cause.h)
+ * \param reason an AST_SOFTHANGUP_* reason code
  */
-int ast_softhangup_nolock(struct ast_channel *chan, int cause);
+int ast_softhangup_nolock(struct ast_channel *chan, int reason);
 
 /*!
  * \brief Set the source of the hangup in this channel and it's bridge

diff --git a/main/pbx.c b/main/pbx.c
index 58e689e..6125b17 100644 (file)
--- a/main/pbx.c
+++ b/main/pbx.c
@@ -4764,7 +4764,7 @@ static enum ast_pbx_result __ast_pbx_run(struct ast_channel *c,
        }
 
        if (!args || !args->no_hangup_chan) {
-               ast_softhangup(c, c->hangupcause ? c->hangupcause : AST_CAUSE_NORMAL_CLEARING);
+               ast_softhangup(c, AST_SOFTHANGUP_APPUNLOAD);
        }
 
        if ((!args || !args->no_hangup_chan) &&