[asterisk-commits] tilghman: trunk r225360 - in /trunk: ./ apps/ include/asterisk/ main/

[SVN commits to the Asterisk project]

Author: tilghman
Date: Thu Oct 22 12:11:23 2009
New Revision: 225360

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=225360
Log:
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
........

Modified:
    trunk/   (props changed)
    trunk/apps/app_meetme.c
    trunk/include/asterisk/channel.h
    trunk/main/pbx.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/apps/app_meetme.c
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_meetme.c?view=diff&rev=225360&r1=225359&r2=225360
==============================================================================
--- trunk/apps/app_meetme.c (original)
+++ trunk/apps/app_meetme.c Thu Oct 22 12:11:23 2009
@@ -5218,7 +5218,7 @@
 		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;
 }
 

Modified: trunk/include/asterisk/channel.h
URL: http://svnview.digium.com/svn/asterisk/trunk/include/asterisk/channel.h?view=diff&rev=225360&r1=225359&r2=225360
==============================================================================
--- trunk/include/asterisk/channel.h (original)
+++ trunk/include/asterisk/channel.h Thu Oct 22 12:11:23 2009
@@ -1257,7 +1257,7 @@
  * \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 @@
  *
  * \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)
- */
-int ast_softhangup_nolock(struct ast_channel *chan, int cause);
+ * \param reason an AST_SOFTHANGUP_* reason code
+ */
+int ast_softhangup_nolock(struct ast_channel *chan, int reason);
 
 /*!
  * \brief Set the source of the hangup in this channel and it's bridge

Modified: trunk/main/pbx.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/pbx.c?view=diff&rev=225360&r1=225359&r2=225360
==============================================================================
--- trunk/main/pbx.c (original)
+++ trunk/main/pbx.c Thu Oct 22 12:11:23 2009
@@ -4764,7 +4764,7 @@
 	}
 
 	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) &&