From owner-p4-projects@FreeBSD.ORG  Tue Aug 15 02:29:47 2006
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 4397316A4E2; Tue, 15 Aug 2006 02:29:47 +0000 (UTC)
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 07D0516A4DE
	for <perforce@freebsd.org>; Tue, 15 Aug 2006 02:29:47 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id CC10143D49
	for <perforce@freebsd.org>; Tue, 15 Aug 2006 02:29:46 +0000 (GMT)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7F2Tki1083910
	for <perforce@freebsd.org>; Tue, 15 Aug 2006 02:29:46 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7F2TkkE083907
	for perforce@freebsd.org; Tue, 15 Aug 2006 02:29:46 GMT
	(envelope-from jb@freebsd.org)
Date: Tue, 15 Aug 2006 02:29:46 GMT
Message-Id: <200608150229.k7F2TkkE083907@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell <jb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 103951 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: Tue, 15 Aug 2006 02:29:47 -0000

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

Change 103951 by jb@jb_freebsd2 on 2006/08/15 02:29:03

	Undo hacks prior to simply not compiling this source file.

Affected files ...

.. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/drti.c#4 edit

Differences ...

==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/drti.c#4 (text) ====

@@ -86,11 +86,10 @@
 }
 
 #pragma init(dtrace_dof_init)
+
 static void
 dtrace_dof_init(void)
 {
-printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__);
-#ifdef DOODAD
 	dof_hdr_t *dof = &__SUNW_dof;
 #ifdef _LP64
 	Elf64_Ehdr *elf;
@@ -169,15 +168,12 @@
 		dprintf(1, "DTrace ioctl succeeded for DOF at %p\n", dof);
 
 	(void) close(fd);
-#endif
 }
 
 #pragma fini(dtrace_dof_fini)
 static void
 dtrace_dof_fini(void)
 {
-printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__);
-#ifdef DOODAD
 	int fd;
 
 	if ((fd = open64(devnamep, O_RDWR)) < 0) {
@@ -191,5 +187,4 @@
 		dprintf(1, "DTrace ioctl removed DOF (%d)\n", gen);
 
 	(void) close(fd);
-#endif
 }