[svn-commits] russell: branch 1.6.0 r209712 - in /branches/1.6.0: ./ main/event.c

[SVN commits to the Digium repositories]

Author: russell
Date: Fri Jul 31 16:56:41 2009
New Revision: 209712

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=209712
Log:
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.
........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/main/event.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/main/event.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.0/main/event.c?view=diff&rev=209712&r1=209711&r2=209712
==============================================================================
--- branches/1.6.0/main/event.c (original)
+++ branches/1.6.0/main/event.c Fri Jul 31 16:56:41 2009
@@ -147,9 +147,9 @@
 	}
 
 	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_val = alloca(sizeof(*ie_val));
 		memset(ie_val, 0, sizeof(*ie_val));
@@ -275,9 +275,9 @@
 		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))
 	{
 		struct ast_event_ie_val *ie_val;
 		if (!(ie_val = ast_calloc(1, sizeof(*ie_val))))
@@ -478,7 +478,7 @@
 {
 	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);
 
@@ -490,9 +490,9 @@
 	}
 
 	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_val = alloca(sizeof(*ie_val));
 		memset(ie_val, 0, sizeof(*ie_val));
@@ -574,9 +574,9 @@
 	}
 
 	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))
 	{
 		cache_arg = alloca(sizeof(*cache_arg));
 		memset(cache_arg, 0, sizeof(*cache_arg));
@@ -668,9 +668,9 @@
 	}
 
 	va_start(ap, event);
-	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))
 	{
 		cache_arg = alloca(sizeof(*cache_arg));
 		memset(cache_arg, 0, sizeof(*cache_arg));