From source_changes at macosforge.org  Fri Jul 18 14:25:03 2008
From: source_changes at macosforge.org (source_changes at macosforge.org)
Date: Fri, 18 Jul 2008 14:25:03 -0700 (PDT)
Subject: [launchd-changes] [23642] branches/SULeopard/launchd/src/launchctl.c
Message-ID: <20080718212503.A53C7160349@beta.macosforge.org>

Revision: 23642
          http://trac.macosforge.org/projects/launchd/changeset/23642
Author:   zarzycki at apple.com
Date:     2008-07-18 14:25:03 -0700 (Fri, 18 Jul 2008)
Log Message:
-----------
<rdar://problem/5961228> launchd fails to compile with gcc 4.2

Modified Paths:
--------------
    branches/SULeopard/launchd/src/launchctl.c

Modified: branches/SULeopard/launchd/src/launchctl.c
===================================================================
--- branches/SULeopard/launchd/src/launchctl.c	2008-06-06 15:48:42 UTC (rev 23641)
+++ branches/SULeopard/launchd/src/launchctl.c	2008-07-18 21:25:03 UTC (rev 23642)
@@ -69,7 +69,6 @@
 #include <readline/history.h>
 #include <dns_sd.h>
 #include <paths.h>
-#include <utmp.h>
 #include <utmpx.h>
 #include <bootfiles.h>
 #include <sysexits.h>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/launchd-changes/attachments/20080718/d4b6a8ff/attachment.html 

From source_changes at macosforge.org  Fri Jul 18 14:25:56 2008
From: source_changes at macosforge.org (source_changes at macosforge.org)
Date: Fri, 18 Jul 2008 14:25:56 -0700 (PDT)
Subject: [launchd-changes] [23643] tags/launchd-258.17/
Message-ID: <20080718212556.579861603C0@beta.macosforge.org>

Revision: 23643
          http://trac.macosforge.org/projects/launchd/changeset/23643
Author:   zarzycki at apple.com
Date:     2008-07-18 14:25:56 -0700 (Fri, 18 Jul 2008)
Log Message:
-----------
"Tagging launchd-258.17 from https://svn.macosforge.org/repository/launchd/branches/SULeopard"

Added Paths:
-----------
    tags/launchd-258.17/

Copied: tags/launchd-258.17 (from rev 23642, branches/SULeopard)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/launchd-changes/attachments/20080718/dbf3c756/attachment.html 

From source_changes at macosforge.org  Tue Jul 22 08:54:00 2008
From: source_changes at macosforge.org (source_changes at macosforge.org)
Date: Tue, 22 Jul 2008 08:54:00 -0700 (PDT)
Subject: [launchd-changes] [23644] trunk/launchd/src/launchctl.c
Message-ID: <20080722155400.2226B174A34@beta.macosforge.org>

Revision: 23644
          http://trac.macosforge.org/projects/launchd/changeset/23644
Author:   zarzycki at apple.com
Date:     2008-07-22 08:53:59 -0700 (Tue, 22 Jul 2008)
Log Message:
-----------
<rdar://problem/5961228> launchd fails to compile with gcc 4.2

Modified Paths:
--------------
    trunk/launchd/src/launchctl.c

Modified: trunk/launchd/src/launchctl.c
===================================================================
--- trunk/launchd/src/launchctl.c	2008-07-18 21:25:56 UTC (rev 23643)
+++ trunk/launchd/src/launchctl.c	2008-07-22 15:53:59 UTC (rev 23644)
@@ -69,7 +69,6 @@
 #include <readline/history.h>
 #include <dns_sd.h>
 #include <paths.h>
-#include <utmp.h>
 #include <utmpx.h>
 #include <bootfiles.h>
 #include <sysexits.h>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/launchd-changes/attachments/20080722/f6f34eea/attachment.html 

From source_changes at macosforge.org  Mon Jul 28 11:12:23 2008
From: source_changes at macosforge.org (source_changes at macosforge.org)
Date: Mon, 28 Jul 2008 11:12:23 -0700 (PDT)
Subject: [launchd-changes] [23645] trunk/launchd/src/liblaunch.c
Message-ID: <20080728181223.F04BC192DDF@beta.macosforge.org>

Revision: 23645
          http://trac.macosforge.org/projects/launchd/changeset/23645
Author:   zarzycki at apple.com
Date:     2008-07-28 11:12:23 -0700 (Mon, 28 Jul 2008)
Log Message:
-----------
Style

Modified Paths:
--------------
    trunk/launchd/src/liblaunch.c

Modified: trunk/launchd/src/liblaunch.c
===================================================================
--- trunk/launchd/src/liblaunch.c	2008-07-22 15:53:59 UTC (rev 23644)
+++ trunk/launchd/src/liblaunch.c	2008-07-28 18:12:23 UTC (rev 23645)
@@ -356,11 +356,13 @@
 {
 	size_t i;
 
-	if (LAUNCH_DATA_DICTIONARY != dict->type)
+	if (LAUNCH_DATA_DICTIONARY != dict->type) {
 		return;
+	}
 
-	for (i = 0; i < dict->_array_cnt; i += 2)
+	for (i = 0; i < dict->_array_cnt; i += 2) {
 		cb(dict->_array[i + 1], dict->_array[i]->string, context);
+	}
 }
 
 bool
@@ -372,8 +374,10 @@
 		where->_array_cnt = ind + 1;
 	}
 
-	if (where->_array[ind])
+	if (where->_array[ind]) {
 		launch_data_free(where->_array[ind]);
+	}
+
 	where->_array[ind] = what;
 	return true;
 }
@@ -381,11 +385,11 @@
 launch_data_t
 launch_data_array_get_index(launch_data_t where, size_t ind)
 {
-	if (LAUNCH_DATA_ARRAY != where->type)
+	if (LAUNCH_DATA_ARRAY != where->type || ind >= where->_array_cnt) {
 		return NULL;
-	if (ind < where->_array_cnt)
+	} else {
 		return where->_array[ind];
-	return NULL;
+	}
 }
 
 launch_data_t
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/launchd-changes/attachments/20080728/5ed2d185/attachment.html