From owner-p4-projects@FreeBSD.ORG  Mon Aug 14 20:40:17 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 EA89B16A4ED; Mon, 14 Aug 2006 20:40:16 +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 920BF16A4E1
	for <perforce@freebsd.org>; Mon, 14 Aug 2006 20:40:01 +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 F26D043D5C
	for <perforce@freebsd.org>; Mon, 14 Aug 2006 20:40:00 +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 k7EKe09i027000
	for <perforce@freebsd.org>; Mon, 14 Aug 2006 20:40:00 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7EKe0fS026997
	for perforce@freebsd.org; Mon, 14 Aug 2006 20:40:00 GMT
	(envelope-from jb@freebsd.org)
Date: Mon, 14 Aug 2006 20:40:00 GMT
Message-Id: <200608142040.k7EKe0fS026997@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 103903 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: Mon, 14 Aug 2006 20:40:17 -0000

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

Change 103903 by jb@jb_freebsd2 on 2006/08/14 20:39:02

	Remove some hacks which aren't needed after the last integration
	from libbsdelf.

Affected files ...

.. //depot/projects/dtrace/src/lib/libelf/elf_next.c#3 edit

Differences ...

==== //depot/projects/dtrace/src/lib/libelf/elf_next.c#3 (text+ko) ====

@@ -38,15 +38,12 @@
 Elf_Cmd
 elf_next(Elf *e)
 {
-#ifdef DOODAD
 	off_t next;
 	Elf *parent;
-#endif
 
 	if (e == NULL || (parent = e->e_parent) == NULL)
 		return (ELF_C_NULL);
 
-#ifdef DOODAD
 	assert (parent->e_kind == ELF_K_AR);
 	assert (parent->e_cmd == ELF_C_READ);
 	assert((uintptr_t) e->e_rawfile % 2 == 0);
@@ -56,7 +53,6 @@
 	next = (next + 1) & ~1;	/* round up to next 2-byte offset */
 
 	parent->e_u.e_ar.e_next = (next >= parent->e_rawsize) ? (off_t) -1 : next;
-#endif
 
 	return (ELF_C_READ);
 }