From owner-p4-projects@FreeBSD.ORG  Sun Dec  3 02:00:53 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 4BAC516A415; Sun,  3 Dec 2006 02:00:53 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 2445D16A403
	for <perforce@freebsd.org>; Sun,  3 Dec 2006 02:00:53 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 3659443C9D
	for <perforce@freebsd.org>; Sun,  3 Dec 2006 02:00: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 kB320qYg007020
	for <perforce@freebsd.org>; Sun, 3 Dec 2006 02:00:52 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB320qxD007017
	for perforce@freebsd.org; Sun, 3 Dec 2006 02:00:52 GMT
	(envelope-from jb@freebsd.org)
Date: Sun, 3 Dec 2006 02:00:52 GMT
Message-Id: <200612030200.kB320qxD007017@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 110917 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: Sun, 03 Dec 2006 02:00:53 -0000

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

Change 110917 by jb@jb_freebsd8 on 2006/12/03 02:00:27

	Cast integers up to uintptr_t before casting to void * to
	avoid compiler warnings about size mismatches.

Affected files ...

.. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/merge.c#6 edit
.. //depot/projects/opensolaris/contrib/opensolaris/tools/ctf/cvt/merge.c#3 edit

Differences ...

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

@@ -181,10 +181,10 @@
 {
 	debug(3, "Adding mapping %u => %u\n", srcid, tgtid);
 
-	assert(!alist_find(ta, (void *)(ulong_t)srcid, NULL));
+	assert(!alist_find(ta, (void *)(uintptr_t)srcid, NULL));
 	assert(srcid != 0 && tgtid != 0);
 
-	alist_add(ta, (void *)(ulong_t)srcid, (void *)(ulong_t)tgtid);
+	alist_add(ta, (void *)(uintptr_t)srcid, (void *)(uintptr_t)tgtid);
 }
 
 static tid_t
@@ -192,7 +192,7 @@
 {
 	long ltgtid;
 
-	if (alist_find(ta, (void *)(ulong_t)srcid, (void **)&ltgtid))
+	if (alist_find(ta, (void *)(uintptr_t)srcid, (void **)&ltgtid))
 		return ((int)ltgtid);
 	else
 		return (0);
@@ -908,7 +908,7 @@
 redir_mstr_fwd_cb(void *name, void *value, void *arg)
 {
 	tdesc_t *fwd = name;
-	int defnid = (ulong_t)value;
+	int defnid = (uintptr_t)value;
 	redir_mstr_data_t *rmd = arg;
 	tdesc_t template;
 	tdesc_t *defn;

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

@@ -181,10 +181,10 @@
 {
 	debug(3, "Adding mapping %u => %u\n", srcid, tgtid);
 
-	assert(!alist_find(ta, (void *)srcid, NULL));
+	assert(!alist_find(ta, (void *)(uintptr_t)srcid, NULL));
 	assert(srcid != 0 && tgtid != 0);
 
-	alist_add(ta, (void *)srcid, (void *)tgtid);
+	alist_add(ta, (void *)(uintptr_t)srcid, (void *)(uintptr_t)tgtid);
 }
 
 static tid_t
@@ -192,7 +192,7 @@
 {
 	long ltgtid;
 
-	if (alist_find(ta, (void *)srcid, (void **)&ltgtid))
+	if (alist_find(ta, (void *)(uintptr_t)srcid, (void **)&ltgtid))
 		return ((int)ltgtid);
 	else
 		return (0);
@@ -908,7 +908,7 @@
 redir_mstr_fwd_cb(void *name, void *value, void *arg)
 {
 	tdesc_t *fwd = name;
-	int defnid = (int)value;
+	int defnid = (uintptr_t)value;
 	redir_mstr_data_t *rmd = arg;
 	tdesc_t template;
 	tdesc_t *defn;