[svn-commits] rmudgett: trunk r323457 - in /trunk: ./ main/event.c

[SVN commits to the Digium repositories]

Author: rmudgett
Date: Tue Jun 14 19:51:01 2011
New Revision: 323457

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=323457
Log:
Merged revisions 323456 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r323456 | rmudgett | 2011-06-14 19:50:20 -0500 (Tue, 14 Jun 2011) | 1 line
  
  Add missing break in ast_event_get_cached().
........

Modified:
    trunk/   (props changed)
    trunk/main/event.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/main/event.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/event.c?view=diff&rev=323457&r1=323456&r2=323457
==============================================================================
--- trunk/main/event.c (original)
+++ trunk/main/event.c Tue Jun 14 19:51:01 2011
@@ -381,12 +381,12 @@
 	int res = 0;
 
 	AST_LIST_TRAVERSE(&check_ie_vals->ie_vals, event_ie_val, entry) {
-		if (event_ie_val->ie_type == sub_ie_val->ie_type) {
+		if (sub_ie_val->ie_type == event_ie_val->ie_type) {
 			break;
 		}
 	}
 	if (!event_ie_val) {
-		/* The did not find the event ie the subscriber cares about. */
+		/* We did not find the event ie the subscriber cares about. */
 		return 0;
 	}
 
@@ -1340,6 +1340,7 @@
 			void *data = va_arg(ap, void *);
 			size_t datalen = va_arg(ap, size_t);
 			ast_event_append_ie_raw(&cache_arg_event, ie_type, data, datalen);
+			break;
 		}
 		case AST_EVENT_IE_PLTYPE_EXISTS:
 			ast_log(LOG_WARNING, "PLTYPE_EXISTS not supported by this function\n");