From owner-p4-projects@FreeBSD.ORG  Sun Dec  3 01:54:43 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 62D9F16A415; Sun,  3 Dec 2006 01:54:43 +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 3C73316A407
	for <perforce@freebsd.org>; Sun,  3 Dec 2006 01:54:43 +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 6C42443CA3
	for <perforce@freebsd.org>; Sun,  3 Dec 2006 01:54:19 +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 kB31sgSt006657
	for <perforce@freebsd.org>; Sun, 3 Dec 2006 01:54:42 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB31sgXm006654
	for perforce@freebsd.org; Sun, 3 Dec 2006 01:54:42 GMT
	(envelope-from jb@freebsd.org)
Date: Sun, 3 Dec 2006 01:54:42 GMT
Message-Id: <200612030154.kB31sgXm006654@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 110915 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 01:54:43 -0000

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

Change 110915 by jb@jb_freebsd8 on 2006/12/03 01:53:50

	Match return types.

Affected files ...

.. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/output.c#7 edit

Differences ...

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

@@ -466,7 +466,7 @@
 	int pad;
 	int i;
 
-	if (gelf_newehdr(dst, gelf_getclass(src)) == 0)
+	if (gelf_newehdr(dst, gelf_getclass(src)) == NULL)
 		elfterminate(dstname, "Cannot copy ehdr to temp file");
 	gelf_getehdr(src, &sehdr);
 	memcpy(&dehdr, &sehdr, sizeof (GElf_Ehdr));
@@ -482,7 +482,7 @@
 	 */
 	if (sehdr.e_phnum != 0) {
 		(void) elf_flagelf(dst, ELF_C_SET, ELF_F_LAYOUT);
-		if (gelf_newphdr(dst, sehdr.e_phnum) == 0)
+		if (gelf_newphdr(dst, sehdr.e_phnum) == NULL)
 			elfterminate(dstname, "Cannot make phdrs in temp file");
 
 		for (i = 0; i < sehdr.e_phnum; i++) {