kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-24 13:50:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert accidental overcommit.

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@393632 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Richard Mudgett
2013-07-03 23:57:37 +00:00
parent b4e9a3fc2f
commit 02f55a36a0
12 changed files with 2729 additions and 2873 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/asterisk/bridging.h
View File

@@ -1647,7 +1647,7 @@ void ast_after_bridge_goto_read(struct ast_channel *chan, char *buffer, size_t b
/*! Reason the the after bridge callback will not be called. */
enum ast_after_bridge_cb_reason {
/*! The datastore is being destroyed. Likely due to hangup. (Enum value must be zero.) */
/*! The datastore is being destroyed. Likely due to hangup. */
AST_AFTER_BRIDGE_CB_REASON_DESTROY,
/*! Something else replaced the callback with another. */
AST_AFTER_BRIDGE_CB_REASON_REPLACED,
@@ -1666,9 +1666,6 @@ enum ast_after_bridge_cb_reason {
* \param reason Reason callback is failing.
* \param data Extra data what setup the callback wanted to pass.
*
* \note Called when the channel leaves the bridging system or
* is destroyed.
*
* \return Nothing
*/
typedef void (*ast_after_bridge_cb_failed)(enum ast_after_bridge_cb_reason reason, void *data);
@@ -1708,9 +1705,6 @@ void ast_after_bridge_callback_discard(struct ast_channel *chan, enum ast_after_
*
* \note chan is locked by this function.
*
* \note failed is called when the channel leaves the bridging
* system or is destroyed.
*
* \retval 0 on success.
* \retval -1 on error.
*/

2
include/asterisk/config_options.h
View File

@@ -461,7 +461,7 @@ enum aco_process_status {
/*! \brief Process a config info via the options registered with an aco_info
*
* \param info The config_options_info to be used for handling the config
* \param reload Non-zero if this is for a reload.
* \param reload Whether or not this is a reload
*
* \retval ACO_PROCESS_OK Success
* \retval ACO_PROCESS_ERROR Failure

16
include/asterisk/stasis_channels.h
View File

@@ -421,22 +421,6 @@ struct stasis_message_type *ast_channel_monitor_start_type(void);
*/
struct stasis_message_type *ast_channel_monitor_stop_type(void);
/*!
* \since 12.0.0
* \brief Message type for agent login on a channel
*
* \retval A stasis message type
*/
struct stasis_message_type *ast_channel_agent_login_type(void);
/*!
* \since 12.0.0
* \brief Message type for agent logoff on a channel
*
* \retval A stasis message type
*/
struct stasis_message_type *ast_channel_agent_logoff_type(void);
/*!
* \since 12
* \brief Message type for starting music on hold on a channel