aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2009-07-31 21:58:34 +0000
committerrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2009-07-31 21:58:34 +0000
commit5b199beb8e8e877b8c05acfc68d969629938b8ce (patch)
treefd3149ca8659039db13202b056aa7950c7984ffd
parentcca6f6548f012369c344b4ed06a88ff8fa4eb419 (diff)
Merged revisions 209711 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk ........ r209711 | russell | 2009-07-31 16:53:31 -0500 (Fri, 31 Jul 2009) | 2 lines Fix some places where ast_event_type was used instead of ast_event_ie_type. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@209714 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--main/event.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/main/event.c b/main/event.c
index c497bd1f7..339c09100 100644
--- a/main/event.c
+++ b/main/event.c
@@ -334,9 +334,9 @@ enum ast_event_subscriber_res ast_event_check_subscriber(enum ast_event_type typ
}
va_start(ap, type);
- for (ie_type = va_arg(ap, enum ast_event_type);
+ for (ie_type = va_arg(ap, enum ast_event_ie_type);
ie_type != AST_EVENT_IE_END;
- ie_type = va_arg(ap, enum ast_event_type))
+ ie_type = va_arg(ap, enum ast_event_ie_type))
{
struct ast_event_ie_val *ie_value = alloca(sizeof(*ie_value));
memset(ie_value, 0, sizeof(*ie_value));
@@ -688,9 +688,9 @@ struct ast_event_sub *ast_event_subscribe(enum ast_event_type type, ast_event_cb
return NULL;
va_start(ap, userdata);
- for (ie_type = va_arg(ap, enum ast_event_type);
+ for (ie_type = va_arg(ap, enum ast_event_ie_type);
ie_type != AST_EVENT_IE_END;
- ie_type = va_arg(ap, enum ast_event_type))
+ ie_type = va_arg(ap, enum ast_event_ie_type))
{
enum ast_event_ie_pltype ie_pltype;
@@ -898,7 +898,7 @@ struct ast_event *ast_event_new(enum ast_event_type type, ...)
{
va_list ap;
struct ast_event *event;
- enum ast_event_type ie_type;
+ enum ast_event_ie_type ie_type;
struct ast_event_ie_val *ie_val;
AST_LIST_HEAD_NOLOCK_STATIC(ie_vals, ast_event_ie_val);
@@ -910,9 +910,9 @@ struct ast_event *ast_event_new(enum ast_event_type type, ...)
}
va_start(ap, type);
- for (ie_type = va_arg(ap, enum ast_event_type);
+ for (ie_type = va_arg(ap, enum ast_event_ie_type);
ie_type != AST_EVENT_IE_END;
- ie_type = va_arg(ap, enum ast_event_type))
+ ie_type = va_arg(ap, enum ast_event_ie_type))
{
struct ast_event_ie_val *ie_value = alloca(sizeof(*ie_value));
memset(ie_value, 0, sizeof(*ie_value));
@@ -1015,9 +1015,9 @@ struct ast_event *ast_event_get_cached(enum ast_event_type type, ...)
}
va_start(ap, type);
- for (ie_type = va_arg(ap, enum ast_event_type);
+ for (ie_type = va_arg(ap, enum ast_event_ie_type);
ie_type != AST_EVENT_IE_END;
- ie_type = va_arg(ap, enum ast_event_type))
+ ie_type = va_arg(ap, enum ast_event_ie_type))
{
enum ast_event_ie_pltype ie_pltype;