[launchd-changes] [23551] trunk/launchd/src

[source_changes at macosforge.org]

Revision: 23551
          http://trac.macosforge.org/projects/launchd/changeset/23551
Author:   zarzycki at apple.com
Date:     2008-03-12 10:14:11 -0700 (Wed, 12 Mar 2008)

Log Message:
-----------
<rdar://problem/5794954> liblaunch.c consumes API deprecated in 10.6

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

Modified: trunk/launchd/src/launchctl.c
===================================================================
--- trunk/launchd/src/launchctl.c	2008-03-12 16:44:23 UTC (rev 23550)
+++ trunk/launchd/src/launchctl.c	2008-03-12 17:14:11 UTC (rev 23551)
@@ -1791,11 +1791,11 @@
 			cmd = launch_data_get_string(tmp);
 
 		if ((kr = bootstrap_create_server(bootstrap_port, (char *)cmd, u, d, &msr)) != KERN_SUCCESS) {
-			fprintf(stderr, "%s: bootstrap_create_server(): %d\n", getprogname(), kr);
+			fprintf(stderr, "%s: bootstrap_create_server(): %s\n", getprogname(), bootstrap_strerror(kr));
 			continue;
 		}
 		if ((kr = bootstrap_check_in(msr, (char*)sn, &msv)) != KERN_SUCCESS) {
-			fprintf(stderr, "%s: bootstrap_create_service(): %d\n", getprogname(), kr);
+			fprintf(stderr, "%s: bootstrap_check_in(): %s\n", getprogname(), bootstrap_strerror(kr));
 			mach_port_mod_refs(mach_task_self(), msv, MACH_PORT_RIGHT_RECEIVE, -1);
 			continue;
 		}

Modified: trunk/launchd/src/liblaunch.c
===================================================================
--- trunk/launchd/src/liblaunch.c	2008-03-12 16:44:23 UTC (rev 23550)
+++ trunk/launchd/src/liblaunch.c	2008-03-12 17:14:11 UTC (rev 23551)
@@ -1224,8 +1224,8 @@
 		if (bootstrap_create_server(bootstrap_port, BEZEL_UI_PATH, target_user, true, &bezel_ui_server) == BOOTSTRAP_SUCCESS) {
 			mach_port_t srv;
 
-			if (bootstrap_create_service(bezel_ui_server, BEZEL_UI_SERVICE, &srv) == BOOTSTRAP_SUCCESS) {
-				mach_port_deallocate(mach_task_self(), srv);
+			if (bootstrap_check_in(bezel_ui_server, BEZEL_UI_SERVICE, &srv) == BOOTSTRAP_SUCCESS) {
+				mach_port_mod_refs(mach_task_self(), srv, MACH_PORT_RIGHT_RECEIVE, -1);
 			}
 
 			mach_port_deallocate(mach_task_self(), bezel_ui_server);

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/launchd-changes/attachments/20080312/29c44924/attachment.html