mirror of
				https://github.com/asterisk/asterisk.git
				synced 2025-11-03 20:38:59 +00:00 
			
		
		
		
	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.0@209712 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
		
							
								
								
									
										22
									
								
								main/event.c
									
									
									
									
									
								
							
							
						
						
									
										22
									
								
								main/event.c
									
									
									
									
									
								
							@@ -147,9 +147,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_val = alloca(sizeof(*ie_val));
 | 
			
		||||
		memset(ie_val, 0, sizeof(*ie_val));
 | 
			
		||||
@@ -275,9 +275,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))
 | 
			
		||||
	{
 | 
			
		||||
		struct ast_event_ie_val *ie_val;
 | 
			
		||||
		if (!(ie_val = ast_calloc(1, sizeof(*ie_val))))
 | 
			
		||||
@@ -478,7 +478,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);
 | 
			
		||||
 | 
			
		||||
@@ -490,9 +490,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_val = alloca(sizeof(*ie_val));
 | 
			
		||||
		memset(ie_val, 0, sizeof(*ie_val));
 | 
			
		||||
@@ -574,9 +574,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))
 | 
			
		||||
	{
 | 
			
		||||
		cache_arg = alloca(sizeof(*cache_arg));
 | 
			
		||||
		memset(cache_arg, 0, sizeof(*cache_arg));
 | 
			
		||||
@@ -668,9 +668,9 @@ int ast_event_queue_and_cache(struct ast_event *event, ...)
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	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));
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user