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

6
res/res_fax.c
View File

@@ -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;
}