From: Russell Bryant <russell@russellbryant.com>
Date: Fri, 31 Jul 2009 21:58:34 +0000 (+0000)
Subject: Merged revisions 209711 via svnmerge from
X-Git-Tag: 1.6.1.5-rc1~26
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e36534fd9027a9e1280df4ae7043e4af0978f952;p=thirdparty%2Fasterisk.git

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 c497bd1f72..339c091006 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;