From owner-p4-projects@FreeBSD.ORG  Fri Nov  3 22:45:33 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 B2ABC16A417; Fri,  3 Nov 2006 22:45:33 +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 4969516A407
	for <perforce@freebsd.org>; Fri,  3 Nov 2006 22:45:33 +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 BCD6D43D8E
	for <perforce@freebsd.org>; Fri,  3 Nov 2006 22:45:29 +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 kA3MjTPn015457
	for <perforce@freebsd.org>; Fri, 3 Nov 2006 22:45:29 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA3MjTuD015454
	for perforce@freebsd.org; Fri, 3 Nov 2006 22:45:29 GMT
	(envelope-from jb@freebsd.org)
Date: Fri, 3 Nov 2006 22:45:29 GMT
Message-Id: <200611032245.kA3MjTuD015454@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 109158 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: Fri, 03 Nov 2006 22:45:34 -0000

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

Change 109158 by jb@jb_freebsd8 on 2006/11/03 22:44:43

	IFlibbsdelf

Affected files ...

.. //depot/projects/dtrace/src/lib/libelf/elf_scn.c#5 integrate

Differences ...

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

@@ -53,7 +53,7 @@
 	assert(e != NULL);
 	assert(ehdr != NULL);
 
-  #define	CHECK_EHDR(E,EH)	do {			\
+#define	CHECK_EHDR(E,EH)	do {				\
 		if (fsz != (EH)->e_shentsize ||			\
 		    shoff + fsz * shnum > e->e_rawsize) {	\
 			LIBELF_SET_ERROR(HEADER, 0);		\
@@ -225,8 +225,6 @@
 		return (NULL);
 	}
 
-	if (s == NULL)
-		s = STAILQ_FIRST(&e->e_u.e_elf.e_scn);
-
-	return (STAILQ_NEXT(s, s_next));
+	return (s == NULL ? elf_getscn(e, (size_t) 1) :
+	    STAILQ_NEXT(s, s_next));
 }