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 /main/stasis_channels.c | |
| 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 'main/stasis_channels.c')
| -rw-r--r-- | main/stasis_channels.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/main/stasis_channels.c b/main/stasis_channels.c index 249576b49..0ec40bbfb 100644 --- a/main/stasis_channels.c +++ b/main/stasis_channels.c @@ -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); |