From owner-p4-projects@FreeBSD.ORG  Tue Aug 15 02:41:05 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 8A4EA16A4E1; Tue, 15 Aug 2006 02:41:05 +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 659FB16A4DF
	for <perforce@freebsd.org>; Tue, 15 Aug 2006 02:41:05 +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 300F143D53
	for <perforce@freebsd.org>; Tue, 15 Aug 2006 02:41:05 +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 k7F2f551084785
	for <perforce@freebsd.org>; Tue, 15 Aug 2006 02:41:05 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7F2f4EH084782
	for perforce@freebsd.org; Tue, 15 Aug 2006 02:41:04 GMT
	(envelope-from jb@freebsd.org)
Date: Tue, 15 Aug 2006 02:41:04 GMT
Message-Id: <200608150241.k7F2f4EH084782@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 103958 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, 15 Aug 2006 02:41:05 -0000

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

Change 103958 by jb@jb_freebsd2 on 2006/08/15 02:41:00

	On Solaris this code has been linted so they are confident that the
	compiler warnings can be ignored.
	
	On FreeBSD I'd like to avoid compiler warnings.

Affected files ...

.. //depot/projects/dtrace/src/sys/contrib/opensolaris/common/ctf/ctf_labels.c#2 edit

Differences ...

==== //depot/projects/dtrace/src/sys/contrib/opensolaris/common/ctf/ctf_labels.c#2 (text) ====

@@ -31,7 +31,12 @@
 static int
 extract_label_info(ctf_file_t *fp, const ctf_lblent_t **ctl, uint_t *num_labels)
 {
+#if defined(sun)
 	const ctf_header_t *h;
+#else
+	ctf_header_t *h;
+	const void *p;
+#endif
 
 	/*
 	 * Labels are only supported in V2 or later
@@ -39,10 +44,17 @@
 	if (fp->ctf_version < CTF_VERSION_2)
 		return (ctf_set_errno(fp, ECTF_NOTSUP));
 
+#if defined(sun)
 	h = (const ctf_header_t *)fp->ctf_data.cts_data;
 
 	/* LINTED - pointer alignment */
 	*ctl = (const ctf_lblent_t *)(fp->ctf_buf + h->cth_lbloff);
+#else
+	h = (ctf_header_t *)fp->ctf_data.cts_data;
+
+	p = fp->ctf_buf + h->cth_lbloff;
+	*ctl = p;
+#endif
 	*num_labels = (h->cth_objtoff - h->cth_lbloff) / sizeof (ctf_lblent_t);
 
 	return (0);