kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-20 08:40:16 +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

4
main/stasis_channels.c
View File

@@ -250,12 +250,12 @@ static struct stasis_message *create_channel_blob_message(struct ast_channel_sna
return msg;
}
struct stasis_message *ast_channel_cached_blob_create(struct ast_channel *chan,
struct stasis_message *ast_channel_blob_create_from_cache(const char *channel_id,
struct stasis_message_type *type,
struct ast_json *blob)
{
RAII_VAR(struct ast_channel_snapshot *, snapshot,
ast_channel_snapshot_get_latest(ast_channel_uniqueid(chan)),
ast_channel_snapshot_get_latest(channel_id),
ao2_cleanup);
return create_channel_blob_message(snapshot, type, blob);