diff options
| author | Kinsey Moore <kmoore@digium.com> | 2013-05-29 02:26:17 +0000 |
|---|---|---|
| committer | Kinsey Moore <kmoore@digium.com> | 2013-05-29 02:26:17 +0000 |
| commit | 6851801a5ebcb0fc7cdf20c14a68e96e67d7f96e (patch) | |
| tree | 271a81f5970dd968cc4815205717daaaafcb529c /include/asterisk/stasis_channels.h | |
| parent | bb584c55dee3fbe1bd6d4ecffdfff2c74733cc65 (diff) | |
Resolve a merge conflict
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
Diffstat (limited to 'include/asterisk/stasis_channels.h')
| -rw-r--r-- | include/asterisk/stasis_channels.h | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/include/asterisk/stasis_channels.h b/include/asterisk/stasis_channels.h index 42e50eb08..e3beb03ce 100644 --- a/include/asterisk/stasis_channels.h +++ b/include/asterisk/stasis_channels.h @@ -155,27 +155,6 @@ struct stasis_message *ast_channel_blob_create(struct ast_channel *chan, /*! * \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 * the cache. * |