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: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@209714 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/main/event.c b/main/event.c
index c497bd1f7219cb52219c972bfa1c8740d3c6213b..339c0910069002c5018f56cfe59b1f97e7bba081 100644 (file)
--- 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;