From owner-p4-projects@FreeBSD.ORG  Tue Aug 15 02:40:04 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 E3E2216A4EA; Tue, 15 Aug 2006 02:40:03 +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 A9EE816A4E8
	for <perforce@freebsd.org>; Tue, 15 Aug 2006 02:40:03 +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 6351F43D45
	for <perforce@freebsd.org>; Tue, 15 Aug 2006 02:40:03 +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 k7F2e3ch084644
	for <perforce@freebsd.org>; Tue, 15 Aug 2006 02:40:03 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7F2e3rA084639
	for perforce@freebsd.org; Tue, 15 Aug 2006 02:40:03 GMT
	(envelope-from jb@freebsd.org)
Date: Tue, 15 Aug 2006 02:40:03 GMT
Message-Id: <200608150240.k7F2e3rA084639@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 103957 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:40:04 -0000

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

Change 103957 by jb@jb_freebsd2 on 2006/08/15 02:39:22

	Fix yet more compiler warnings.

Affected files ...

.. //depot/projects/dtrace/src/sys/contrib/opensolaris/common/ctf/ctf_lookup.c#3 edit

Differences ...

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

@@ -27,7 +27,7 @@
 
 #pragma ident	"@(#)ctf_lookup.c	1.6	06/01/07 SMI"
 
-#if	defined(sun)
+#if defined(sun)
 #include <sys/sysmacros.h>
 #endif
 #include <ctf_impl.h>
@@ -63,7 +63,7 @@
 	int h = s[len - 1] + (int)len - 105;
 	const struct qual *qp = &qhash[h];
 
-	return (h >= 0 && h < sizeof (qhash) / sizeof (qhash[0]) &&
+	return (h >= 0 && h < (int) (sizeof (qhash) / sizeof (qhash[0])) &&
 	    len == qp->q_len && strncmp(qp->q_name, s, qp->q_len) == 0);
 }
 
@@ -214,7 +214,7 @@
  * given type ID.  If the ID is invalid, the function returns NULL.
  * This function is not exported outside of the library.
  */
-const ctf_type_t *
+ctf_type_t *
 ctf_lookup_by_id(ctf_file_t **fpp, ctf_id_t type)
 {
 	ctf_file_t *fp = *fpp; /* caller passes in starting CTF container */
@@ -226,7 +226,7 @@
 	}
 
 	type = CTF_TYPE_TO_INDEX(type);
-	if (type > 0 && type <= fp->ctf_typemax) {
+	if (type > 0 && type <= (long) fp->ctf_typemax) {
 		*fpp = fp; /* function returns ending CTF container */
 		return (LCTF_INDEX_TO_TYPEPTR(fp, type));
 	}