[launchd-changes] [23954] branches/PR-7242460/launchd/src/launchd_runtime.c

[source_changes at macosforge.org]

Revision: 23954
          http://trac.macosforge.org/projects/launchd/changeset/23954
Author:   dsorresso at apple.com
Date:     2009-11-17 17:07:18 -0800 (Tue, 17 Nov 2009)
Log Message:
-----------
Fix for rdar://problem/7242460.

Modified Paths:
--------------
    branches/PR-7242460/launchd/src/launchd_runtime.c

Modified: branches/PR-7242460/launchd/src/launchd_runtime.c
===================================================================
--- branches/PR-7242460/launchd/src/launchd_runtime.c	2009-11-18 01:00:02 UTC (rev 23953)
+++ branches/PR-7242460/launchd/src/launchd_runtime.c	2009-11-18 01:07:18 UTC (rev 23954)
@@ -538,11 +538,11 @@
 #if 0
 			if (launchd_assumes(kev.udata != NULL)) {
 #endif
-				log_kevent_struct(LOG_DEBUG, &kev, i);
+				log_kevent_struct(LOG_DEBUG, &kev, 0);
 				(*((kq_callback *)kev.udata))(kev.udata, &kev);
 #if 0
 			} else {
-				log_kevent_struct(LOG_ERR, &kev, i);
+				log_kevent_struct(LOG_ERR, &kev, 0);
 			}
 #endif
 			/* the callback may have tainted our ability to continue this for loop */
@@ -590,7 +590,7 @@
 	if (launchd_assumes((bulk_kev_cnt = kevent(fd, NULL, 0, kev, BULK_KEV_MAX, &ts)) != -1)) {
 	#if 0	
 		for (i = 0; i < bulk_kev_cnt; i++) {
-			log_kevent_struct(LOG_DEBUG, kev, i);
+			log_kevent_struct(LOG_DEBUG, kev, 0);
 		}
 	#endif
 		for (i = 0; i < bulk_kev_cnt; i++) {
@@ -611,7 +611,7 @@
 					runtime_ktrace0(RTKT_LAUNCHD_BSD_KEVENT|DBG_FUNC_END);
 				} else {
 					runtime_syslog(LOG_ERR, "The following kevent had invalid context data.");
-					log_kevent_struct(LOG_EMERG, kevi, i);
+					log_kevent_struct(LOG_EMERG, kev, i);
 				}
 			#else
 				runtime_ktrace(RTKT_LAUNCHD_BSD_KEVENT|DBG_FUNC_START, kevi->ident, kevi->filter, kevi->fflags);
@@ -863,7 +863,7 @@
 		for( i = bulk_kev_i + 1; i < bulk_kev_cnt; i++ ) {
 			if( bulk_kev[i].filter == filter && bulk_kev[i].ident == ident ) {
 				runtime_syslog(LOG_DEBUG, "Pruning the following kevent:");
-				log_kevent_struct(LOG_DEBUG, &bulk_kev[i], i);
+				log_kevent_struct(LOG_DEBUG, bulk_kev, i);
 				bulk_kev[i].filter = (short)0;
 			}
 		}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/launchd-changes/attachments/20091117/32d5a458/attachment.html>