From owner-p4-projects@FreeBSD.ORG  Wed Apr 12 23:41:32 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 9389916A40A; Wed, 12 Apr 2006 23:41:32 +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 5B4BA16A403
	for <perforce@freebsd.org>; Wed, 12 Apr 2006 23:41:32 +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 20D1B43D5C
	for <perforce@freebsd.org>; Wed, 12 Apr 2006 23:41:31 +0000 (GMT)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3CNfUcF081426
	for <perforce@freebsd.org>; Wed, 12 Apr 2006 23:41:30 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3CNfUOi081420
	for perforce@freebsd.org; Wed, 12 Apr 2006 23:41:30 GMT
	(envelope-from jb@freebsd.org)
Date: Wed, 12 Apr 2006 23:41:30 GMT
Message-Id: <200604122341.k3CNfUOi081420@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 95117 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: Wed, 12 Apr 2006 23:41:32 -0000

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

Change 95117 by jb@jb_freebsd2 on 2006/04/12 23:41:07

	Fix a return type. gcc treats NULL as a different type to (int) 0.

Affected files ...

.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/gelf.c#2 edit

Differences ...

==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/gelf.c#2 (text) ====

@@ -271,7 +271,7 @@
 		return (0);
 
 	if (elf_getphnum(elf, &phnum) == 0)
-		return (NULL);
+		return (0);
 
 	if (phnum < ndx) {
 		_elf_seterr(EREQ_RAND, 0);