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

stasis_system: Remove silly usage of RAII_VAR.

Browse Source 
Change-Id: Iedbe5656cee68cd3a96a953558764aa02d4a0c3b
This commit is contained in:
Corey Farrell
2018-01-09 11:53:28 -05:00
parent 9397c2535c
commit 3074c4165c
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
main/stasis_system.c
View File

@@ -117,9 +117,9 @@ STASIS_MESSAGE_TYPE_DEFN(ast_cluster_discovery_type);
void ast_system_publish_registry(const char *channeltype, const char *username, const char *domain, const char *status, const char *cause) void ast_system_publish_registry(const char *channeltype, const char *username, const char *domain, const char *status, const char *cause)
{ {
RAII_VAR(struct ast_json *, registry, NULL, ast_json_unref); struct ast_json *registry;
RAII_VAR(struct ast_json_payload *, payload, NULL, ao2_cleanup); struct ast_json_payload *payload;
RAII_VAR(struct stasis_message *, message, NULL, ao2_cleanup); struct stasis_message *message;
if (!ast_system_registry_type()) { if (!ast_system_registry_type()) {
return; return;
@@ -133,15 +133,20 @@ void ast_system_publish_registry(const char *channeltype, const char *username,
"status", status, "status", status,
"cause", S_OR(cause, "")); "cause", S_OR(cause, ""));
if (!(payload = ast_json_payload_create(registry))) { payload = ast_json_payload_create(registry);
ast_json_unref(registry);
if (!payload) {
return; return;
} }
if (!(message = stasis_message_create(ast_system_registry_type(), payload))) { message = stasis_message_create(ast_system_registry_type(), payload);
ao2_ref(payload, -1);
if (!message) {
return; return;
} }
stasis_publish(ast_system_topic(), message); stasis_publish(ast_system_topic(), message);
ao2_ref(message, -1);
} }
static struct ast_manager_event_blob *system_registry_to_ami(struct stasis_message *message) static struct ast_manager_event_blob *system_registry_to_ami(struct stasis_message *message)