kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-04 11:58:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Eliminate some more unnecessary RAII_VAR() uses.

Browse Source 
RAII_VAR() is not a hammer appropriate to pound all nails.
........

Merged revisions 412413 from http://svn.asterisk.org/svn/asterisk/branches/12


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@412414 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Richard Mudgett
2014-04-15 18:30:24 +00:00
parent 45ade68cb4
commit ba1db5d8f5
4 changed files with 14 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
main/rtp_engine.c
View File

@@ -1915,28 +1915,22 @@ void ast_rtp_publish_rtcp_message(struct ast_rtp_instance *rtp,
struct ast_rtp_rtcp_report *report,
struct ast_json *blob)
{
RAII_VAR(struct rtcp_message_payload *, payload,
ao2_alloc(sizeof(*payload), rtcp_message_payload_dtor), ao2_cleanup);
RAII_VAR(struct ast_channel_snapshot *, snapshot, NULL, ao2_cleanup);
RAII_VAR(struct rtcp_message_payload *, payload, NULL, ao2_cleanup);
RAII_VAR(struct stasis_message *, message, NULL, ao2_cleanup);
payload = ao2_alloc(sizeof(*payload), rtcp_message_payload_dtor);
if (!payload || !report) {
return;
}
if (!ast_strlen_zero(rtp->channel_uniqueid)) {
snapshot = ast_channel_snapshot_get_latest(rtp->channel_uniqueid);
if (snapshot) {
ao2_ref(snapshot, +1);
}
payload->snapshot = ast_channel_snapshot_get_latest(rtp->channel_uniqueid);
}
if (blob) {
payload->blob = blob;
ast_json_ref(blob);
}
ao2_ref(report, 1);
payload->snapshot = snapshot;
payload->blob = blob;
ao2_ref(report, +1);
payload->report = report;
message = stasis_message_create(message_type, payload);