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 | |
| 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')
| -rw-r--r-- | res/res_fax.c | 6 | ||||
| -rw-r--r-- | res/res_monitor.c | 4 | ||||
| -rw-r--r-- | res/res_musiconhold.c | 4 |
3 files changed, 7 insertions, 7 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; } diff --git a/res/res_monitor.c b/res/res_monitor.c index 72911b5b1..f1da4ec83 100644 --- a/res/res_monitor.c +++ b/res/res_monitor.c @@ -396,7 +396,7 @@ int AST_OPTIONAL_API_NAME(ast_monitor_start)(struct ast_channel *chan, const cha /* so we know this call has been monitored in case we need to bill for it or something */ pbx_builtin_setvar_helper(chan, "__MONITORED","true"); - message = ast_channel_cached_blob_create(chan, + message = ast_channel_blob_create_from_cache(ast_channel_uniqueid(chan), ast_channel_monitor_start_type(), NULL); if (message) { @@ -516,7 +516,7 @@ int AST_OPTIONAL_API_NAME(ast_monitor_stop)(struct ast_channel *chan, int need_l ast_free(ast_channel_monitor(chan)); ast_channel_monitor_set(chan, NULL); - message = ast_channel_cached_blob_create(chan, + message = ast_channel_blob_create_from_cache(ast_channel_uniqueid(chan), ast_channel_monitor_stop_type(), NULL); if (message) { diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c index 2ed7ea52b..df6c7d787 100644 --- a/res/res_musiconhold.c +++ b/res/res_musiconhold.c @@ -1585,7 +1585,7 @@ static int local_ast_moh_start(struct ast_channel *chan, const char *mclass, con return -1; } - message = ast_channel_cached_blob_create(chan, + message = ast_channel_blob_create_from_cache(ast_channel_uniqueid(chan), ast_channel_moh_start_type(), json_object); if (message) { @@ -1611,7 +1611,7 @@ static void local_ast_moh_stop(struct ast_channel *chan) } } - message = ast_channel_cached_blob_create(chan, ast_channel_moh_stop_type(), NULL); + message = ast_channel_blob_create_from_cache(ast_channel_uniqueid(chan), ast_channel_moh_stop_type(), NULL); if (message) { stasis_publish(ast_channel_topic(chan), message); } |