From owner-p4-projects@FreeBSD.ORG  Fri Nov 23 03:15:24 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2A38F16A468; Fri, 23 Nov 2007 03:15:24 +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 AA92716A41B
	for <perforce@freebsd.org>; Fri, 23 Nov 2007 03:15:23 +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 B055413C448
	for <perforce@freebsd.org>; Fri, 23 Nov 2007 03:15:23 +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 lAN3FNVA008708
	for <perforce@freebsd.org>; Fri, 23 Nov 2007 03:15:23 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lAN3FNAj008705
	for perforce@freebsd.org; Fri, 23 Nov 2007 03:15:23 GMT
	(envelope-from jb@freebsd.org)
Date: Fri, 23 Nov 2007 03:15:23 GMT
Message-Id: <200711230315.lAN3FNAj008705@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 129404 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, 23 Nov 2007 03:15:24 -0000

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

Change 129404 by jb@jb_freebsd1 on 2007/11/23 03:14:22

	Strict aliasing fixes.

Affected files ...

.. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/alist.c#5 edit
.. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/dwarf.c#10 edit
.. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/merge.c#9 edit

Differences ...

==== //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/alist.c#5 (text) ====

@@ -123,14 +123,17 @@
 int
 alist_find(alist_t *alist, void *name, void **value)
 {
-	alist_el_t template, *ret;
+	alist_el_t template, *retx;
+	void *ret;
 
 	template.ale_name = name;
-	if (!hash_find(alist->al_elements, &template, (void **)&ret))
+	if (!hash_find(alist->al_elements, &template, &ret))
 		return (0);
 
-	if (value)
-		*value = ret->ale_value;
+	if (value) {
+		retx = ret;
+		*value = retx->ale_value;
+	}
 
 	return (1);
 }

==== //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/dwarf.c#10 (text) ====

@@ -160,11 +160,12 @@
 static tdesc_t *
 tdesc_lookup(dwarf_t *dw, int tid)
 {
-	tdesc_t tmpl, *tdp;
+	tdesc_t tmpl;
+	void *tdp;
 
 	tmpl.t_id = tid;
 
-	if (hash_find(dw->dw_tidhash, &tmpl, (void **)&tdp))
+	if (hash_find(dw->dw_tidhash, &tmpl, &tdp))
 		return (tdp);
 	else
 		return (NULL);

==== //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/merge.c#9 (text) ====

@@ -190,10 +190,10 @@
 static tid_t
 get_mapping(alist_t *ta, int srcid)
 {
-	long ltgtid;
+	void *ltgtid;
 
 	if (alist_find(ta, (void *)(uintptr_t)srcid, (void **)&ltgtid))
-		return ((tid_t)ltgtid);
+		return ((uintptr_t)ltgtid);
 	else
 		return (0);
 }
@@ -872,7 +872,7 @@
 fwd_redir(tdesc_t *fwd, tdesc_t **fwdp, void *private)
 {
 	alist_t *map = private;
-	tdesc_t *defn;
+	void *defn;
 
 	if (!alist_find(map, (void *)fwd, (void **)&defn))
 		return (0);