From owner-p4-projects@FreeBSD.ORG  Tue Jan  8 20:46:19 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A1A8616A41B; Tue,  8 Jan 2008 20:46:19 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 65A6516A418
	for <perforce@freebsd.org>; Tue,  8 Jan 2008 20:46:19 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 3E39C13C457
	for <perforce@freebsd.org>; Tue,  8 Jan 2008 20:46:19 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m08KkJe2013142
	for <perforce@freebsd.org>; Tue, 8 Jan 2008 20:46:19 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m08KkJND013139
	for perforce@freebsd.org; Tue, 8 Jan 2008 20:46:19 GMT
	(envelope-from jb@freebsd.org)
Date: Tue, 8 Jan 2008 20:46:19 GMT
Message-Id: <200801082046.m08KkJND013139@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 132809 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, 08 Jan 2008 20:46:20 -0000

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

Change 132809 by jb@jb_freebsd1 on 2008/01/08 20:45:58

	Just get the specified attribute and let the caller decide what to
	do in the case where it isn't found. The previous code was just wrong.

Affected files ...

.. //depot/projects/dtrace/src/lib/libdwarf/dwarf_attrval.c#2 edit

Differences ...

==== //depot/projects/dtrace/src/lib/libdwarf/dwarf_attrval.c#2 (text+ko) ====

@@ -35,35 +35,11 @@
 dwarf_attrval_find(Dwarf_Die die, Dwarf_Half attr)
 {
 	Dwarf_AttrValue av;
-	Dwarf_AttrValue av_sib;
-	Dwarf_CU cu;
-	Dwarf_Die die_sib;
 
-	do {
-		av_sib = NULL;
-
-		STAILQ_FOREACH(av, &die->die_attrval, av_next) {
-			if (av->av_attrib == attr)
-				break;
-			if (av->av_attrib == DW_AT_sibling)
-				av_sib = av;
-		}
-
-		if (av != NULL || av_sib == NULL)
+	STAILQ_FOREACH(av, &die->die_attrval, av_next) {
+		if (av->av_attrib == attr)
 			break;
-
-		cu = die->die_cu;
-
-		die = NULL;
-
-		STAILQ_FOREACH(die_sib, &cu->cu_die, die_next) {
-			if (die_sib->die_offset == av_sib->u[0].u64) {
-				die = die_sib;
-				break;
-			}
-		}
-
-	} while (die != NULL);
+	}
 
 	return av;
 }