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 /res/res_fax.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 'res/res_fax.c')
| -rw-r--r-- | res/res_fax.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/res/res_fax.c b/res/res_fax.c index 1a9f4f749..68cd0f272 100644 --- a/res/res_fax.c +++ b/res/res_fax.c @@ -1197,7 +1197,7 @@ static int report_fax_status(struct ast_channel *chan, struct ast_fax_session_de { SCOPED_CHANNELLOCK(lock, chan); - message = ast_channel_cached_blob_create(chan, ast_channel_fax_type(), json_object); + message = ast_channel_blob_create_from_cache(ast_channel_uniqueid(chan), ast_channel_fax_type(), json_object); if (!message) { return -1; } @@ -1789,7 +1789,7 @@ static int report_receive_fax_status(struct ast_channel *chan, const char *filen return -1; } - message = ast_channel_cached_blob_create(chan, ast_channel_fax_type(), json_object); + message = ast_channel_blob_create_from_cache(ast_channel_uniqueid(chan), ast_channel_fax_type(), json_object); if (!message) { return -1; } @@ -2269,7 +2269,7 @@ static int report_send_fax_status(struct ast_channel *chan, struct ast_fax_sessi return -1; } - message = ast_channel_cached_blob_create(chan, ast_channel_fax_type(), json_obj); + message = ast_channel_blob_create_from_cache(ast_channel_uniqueid(chan), ast_channel_fax_type(), json_obj); if (!message) { return -1; } |