diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-10-22 17:14:48 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-10-22 17:14:48 +0000 |
| commit | 283e4aff9bf83545212733a68549b4599b6a17b7 (patch) | |
| tree | 612dede0666d35622fd6874e68d333df6442b670 /include/asterisk | |
| parent | 253eced805be1c4f76b0bcac5bf06bb62dc901ee (diff) | |
Merged revisions 225360 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r225360 | tilghman | 2009-10-22 12:11:23 -0500 (Thu, 22 Oct 2009) | 11 lines
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: http://svn.digium.com/svn/asterisk/branches/1.6.2@225363 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'include/asterisk')
| -rw-r--r-- | include/asterisk/channel.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h index f0ff3d09c..2744b7e37 100644 --- a/include/asterisk/channel.h +++ b/include/asterisk/channel.h @@ -945,7 +945,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 * * Call the protocol layer, but don't destroy the channel structure * (use this if you are trying to @@ -955,12 +955,13 @@ 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) */ -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 Check to see if a channel is needing hang up * \param chan channel on which to check for hang up |