From owner-p4-projects@FreeBSD.ORG  Sat Aug 20 08:56:59 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3A90816A421; Sat, 20 Aug 2005 08:56:59 +0000 (GMT)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 04C8F16A41F
	for <perforce@freebsd.org>; Sat, 20 Aug 2005 08:56:59 +0000 (GMT)
	(envelope-from soc-tyler@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id C580443D45
	for <perforce@freebsd.org>; Sat, 20 Aug 2005 08:56:58 +0000 (GMT)
	(envelope-from soc-tyler@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j7K8uwnH023129
	for <perforce@freebsd.org>; Sat, 20 Aug 2005 08:56:58 GMT
	(envelope-from soc-tyler@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j7K8uwKY023126
	for perforce@freebsd.org; Sat, 20 Aug 2005 08:56:58 GMT
	(envelope-from soc-tyler@freebsd.org)
Date: Sat, 20 Aug 2005 08:56:58 GMT
Message-Id: <200508200856.j7K8uwKY023126@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	soc-tyler@freebsd.org using -f
From: soc-tyler <soc-tyler@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 82313 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 20 Aug 2005 08:57:00 -0000

http://perforce.freebsd.org/chv.cgi?CH=82313

Change 82313 by soc-tyler@soc-tyler_launchd on 2005/08/20 08:56:34

	Thanks for not warning, and yelling at me gcc. -lpthread to make
	launch_client_init() do what it printf("should do, damnit\n");
	
	gah.

Affected files ...

.. //depot/projects/soc2005/launchd/Makefile#13 edit
.. //depot/projects/soc2005/launchd/launchctl/Makefile#6 edit
.. //depot/projects/soc2005/launchd/liblaunch.c#8 edit

Differences ...

==== //depot/projects/soc2005/launchd/Makefile#13 (text+ko) ====

@@ -21,7 +21,7 @@
 
 # -lcrypt needed by original FreeBSD init(8) code
 DPADD=	${LIBUTIL} ${LIBCRYPT}
-LDADD+=	-lutil -lcrypt
+LDADD+=	-lutil -lcrypt -lpthread
 
 
 .include <bsd.prog.mk>

==== //depot/projects/soc2005/launchd/launchctl/Makefile#6 (text+ko) ====

@@ -9,7 +9,7 @@
 LAUNCHD=  ${.CURDIR}/../
 
 CFLAGS+= -g -Wall -W -Wshadow -Wpadded -I${LAUNCHD}/includes -D_LAUNCHD_
-LDADD+=	-lreadline -lutil
+LDADD+=	-lreadline -lutil -lpthread
 
 .PATH: ${LAUNCHD}
 

==== //depot/projects/soc2005/launchd/liblaunch.c#8 (text+ko) ====

@@ -130,10 +130,8 @@
 	_lc = calloc(1, sizeof(struct _launch_client));
 
 	// if we can't calloc() _lc, exit function
-	if (_lc == NULL) {
-		printf("we can't calloc(_lc) in liblaunch.c:%d\n", __LINE__);
+	if (_lc == NULL) 
 		return;
-	}
 
 	pthread_mutex_init(&_lc->mtx, NULL);
 
@@ -666,8 +664,9 @@
 }
 
 
-int launch_get_fd(void)
-{
+int launch_get_fd(void) {
+// XXX: This function is *never* called....why does it exist?
+/*
 	pthread_once(&_lc_once, launch_client_init);
 
 	if (_lc == NULL) {
@@ -676,6 +675,8 @@
 	}
 
 	return _lc->l->fd;
+*/
+	return 0;
 }
 
 static void launch_msg_getmsgs(launch_data_t m, void *context)