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

Separate some event struct definitions from instantiation.

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@384760 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Richard Mudgett
2013-04-04 18:15:34 +00:00
parent 6a25d49296
commit b8e5189456
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
main/event.c
View File

@@ -152,10 +152,7 @@ static int ast_event_hash_presence_state_change(const void *obj, const int flags
#define MAX_CACHE_ARGS 8 #define MAX_CACHE_ARGS 8
/*! struct cache_events {
* \brief Event types that are kept in the cache.
*/
static struct {
/*! /*!
* \brief Container of cached events * \brief Container of cached events
* *
@@ -174,7 +171,12 @@ static struct {
* will be replaced. * will be replaced.
*/ */
enum ast_event_ie_type cache_args[MAX_CACHE_ARGS]; enum ast_event_ie_type cache_args[MAX_CACHE_ARGS];
} ast_event_cache[AST_EVENT_TOTAL] = { };
/*!
* \brief Event types that are kept in the cache.
*/
static struct cache_events ast_event_cache[AST_EVENT_TOTAL] = {
[AST_EVENT_MWI] = { [AST_EVENT_MWI] = {
.hash_fn = ast_event_hash_mwi, .hash_fn = ast_event_hash_mwi,
.cache_args = { AST_EVENT_IE_MAILBOX, AST_EVENT_IE_CONTEXT }, .cache_args = { AST_EVENT_IE_MAILBOX, AST_EVENT_IE_CONTEXT },
@@ -191,7 +193,6 @@ static struct {
.hash_fn = ast_event_hash_presence_state_change, .hash_fn = ast_event_hash_presence_state_change,
.cache_args = { AST_EVENT_IE_PRESENCE_STATE, }, .cache_args = { AST_EVENT_IE_PRESENCE_STATE, },
}, },
}; };
/*! /*!
@@ -218,13 +219,15 @@ static const char * const event_names[AST_EVENT_TOTAL] = {
[AST_EVENT_PRESENCE_STATE] = "PresenceState", [AST_EVENT_PRESENCE_STATE] = "PresenceState",
}; };
struct ie_map {
enum ast_event_ie_pltype ie_pltype;
const char *name;
};
/*! /*!
* \brief IE payload types and names * \brief IE payload types and names
*/ */
static const struct ie_map { static const struct ie_map ie_maps[AST_EVENT_IE_TOTAL] = {
enum ast_event_ie_pltype ie_pltype;
const char *name;
} ie_maps[AST_EVENT_IE_TOTAL] = {
[AST_EVENT_IE_NEWMSGS] = { AST_EVENT_IE_PLTYPE_UINT, "NewMessages" }, [AST_EVENT_IE_NEWMSGS] = { AST_EVENT_IE_PLTYPE_UINT, "NewMessages" },
[AST_EVENT_IE_OLDMSGS] = { AST_EVENT_IE_PLTYPE_UINT, "OldMessages" }, [AST_EVENT_IE_OLDMSGS] = { AST_EVENT_IE_PLTYPE_UINT, "OldMessages" },
[AST_EVENT_IE_MAILBOX] = { AST_EVENT_IE_PLTYPE_STR, "Mailbox" }, [AST_EVENT_IE_MAILBOX] = { AST_EVENT_IE_PLTYPE_STR, "Mailbox" },