kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-16 01:36:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

stasis_channels.c: Eliminate another overuse of RAII_VAR().

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/12@411636 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Richard Mudgett
2014-04-01 22:24:39 +00:00
parent 79d467285a
commit 6b46e78b59
1 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
main/stasis_channels.c
View File

@@ -366,14 +366,9 @@ void ast_channel_publish_dial(struct ast_channel *caller, struct ast_channel *pe
static struct stasis_message *create_channel_blob_message(struct ast_channel_snapshot *snapshot, static struct stasis_message *create_channel_blob_message(struct ast_channel_snapshot *snapshot,
struct stasis_message_type *type, struct stasis_message_type *type,
struct ast_json *blob) struct ast_json *blob)
{ {
RAII_VAR(struct stasis_message *, msg, NULL, ao2_cleanup); struct stasis_message *msg;
RAII_VAR(struct ast_channel_blob *, obj, NULL, ao2_cleanup); struct ast_channel_blob *obj;
if (blob == NULL) {
blob = ast_json_null();
}
obj = ao2_alloc(sizeof(*obj), channel_blob_dtor); obj = ao2_alloc(sizeof(*obj), channel_blob_dtor);
if (!obj) { if (!obj) {
@@ -384,14 +379,13 @@ static struct stasis_message *create_channel_blob_message(struct ast_channel_sna
obj->snapshot = snapshot; obj->snapshot = snapshot;
ao2_ref(obj->snapshot, +1); ao2_ref(obj->snapshot, +1);
} }
if (!blob) {
blob = ast_json_null();
}
obj->blob = ast_json_ref(blob); obj->blob = ast_json_ref(blob);
msg = stasis_message_create(type, obj); msg = stasis_message_create(type, obj);
if (!msg) { ao2_cleanup(obj);
return NULL;
}
ao2_ref(msg, +1);
return msg; return msg;
} }