kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-05 12:16:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactored the rest of the message types to use the STASIS_MESSAGE_TYPE_*

Browse Source 
macros.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@388751 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
David M. Lee
2013-05-15 02:37:22 +00:00
parent e8f4ac6c61
commit 9648e258c7
11 changed files with 53 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
main/asterisk.c
View File

@@ -415,7 +415,7 @@ static struct {
static struct stasis_topic *system_topic;
/*!\ brief The \ref stasis_message_type for network changes */
static struct stasis_message_type *network_change_type;
STASIS_MESSAGE_TYPE_DEFN(ast_network_change_type);
#if !defined(LOW_MEMORY)
struct file_version {
@@ -1063,18 +1063,12 @@ struct stasis_topic *ast_system_topic(void)
return system_topic;
}
struct stasis_message_type *ast_network_change_type(void)
{
return network_change_type;
}
/*! \brief Cleanup the \ref stasis system level items */
static void stasis_system_topic_cleanup(void)
{
ao2_ref(system_topic, -1);
system_topic = NULL;
ao2_ref(network_change_type, -1);
network_change_type = NULL;
STASIS_MESSAGE_TYPE_CLEANUP(ast_network_change_type);
}
/*! \brief Initialize the system level items for \ref stasis */
@@ -1087,8 +1081,7 @@ static int stasis_system_topic_init(void)
return 1;
}
network_change_type = stasis_message_type_create("network_change");
if (!network_change_type) {
if (STASIS_MESSAGE_TYPE_INIT(ast_network_change_type) != 0) {
return -1;
}
return 0;