kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-13 13:28:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Resolve a merge conflict

Browse Source 
When ast_channel_cached_blob_create was merged,
ast_channel_blob_create_from_cache was partially removed in an
unresolved merge conflict. This restores ast_channel_blob_create_from_cache
and refactors usage of ast_channel_cached_blob_create (requires an
ast_channel) to use ast_channel_blob_create_from_cache (requires a
channel uniqueid) instead.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@389974 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kinsey Moore
2013-05-29 02:26:17 +00:00
parent bb584c55de
commit 6851801a5e
6 changed files with 10 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
include/asterisk/stasis_channels.h
View File

@@ -153,27 +153,6 @@ struct ast_channel_snapshot *ast_channel_snapshot_get_latest(const char *uniquei
struct stasis_message *ast_channel_blob_create(struct ast_channel *chan,
struct stasis_message_type *type, struct ast_json *blob);
/*!
* \since 12
* \brief Creates a \ref ast_channel_blob message using the current cached
* \ref ast_channel_snapshot for the passed in \ref ast_channel
*
* The given \a blob should be treated as immutable and not modified after it is
* put into the message.
*
* \param chan Channel blob is associated with, or \c NULL for global/all channels.
* \param type Message type for this blob.
* \param blob JSON object representing the data, or \c NULL for no data. If
* \c NULL, ast_json_null() is put into the object.
*
* \param chan Channel blob is associated with
* \param blob JSON object representing the data.
* \return \ref ast_channel_blob message.
* \return \c NULL on error
*/
struct stasis_message *ast_channel_cached_blob_create(struct ast_channel *chan,
struct stasis_message_type *type, struct ast_json *blob);
/*!
* \since 12
* \brief Create a \ref ast_channel_blob message, pulling channel state from