From owner-p4-projects@FreeBSD.ORG  Wed Nov 14 18:57:50 2012
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id DB6EDE0E; Wed, 14 Nov 2012 18:57:49 +0000 (UTC)
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 75BC8E0C
 for <perforce@freebsd.org>; Wed, 14 Nov 2012 18:57:49 +0000 (UTC)
 (envelope-from brooks@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
 [IPv6:2001:4f8:fff6::2d])
 by mx1.freebsd.org (Postfix) with ESMTP id 58ADC8FC13
 for <perforce@freebsd.org>; Wed, 14 Nov 2012 18:57:49 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
 by skunkworks.freebsd.org (8.14.5/8.14.5) with ESMTP id qAEIvnlq013757
 for <perforce@freebsd.org>; Wed, 14 Nov 2012 18:57:49 GMT
 (envelope-from brooks@freebsd.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.5/8.14.5/Submit) id qAEIvn05013754
 for perforce@freebsd.org; Wed, 14 Nov 2012 18:57:49 GMT
 (envelope-from brooks@freebsd.org)
Date: Wed, 14 Nov 2012 18:57:49 GMT
Message-Id: <201211141857.qAEIvn05013754@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
 brooks@freebsd.org using -f
From: Brooks Davis <brooks@FreeBSD.org>
Subject: PERFORCE change 219783 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.14
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/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, 14 Nov 2012 18:57:50 -0000

http://p4web.freebsd.org/@@219783?ac=10

Change 219783 by brooks@brooks_zenith on 2012/11/14 18:57:26

	Small cleanups to trivial malloc.

Affected files ...

.. //depot/projects/ctsrd/cheribsd/src/ctsrd/libexec/readpng-cheri/malloc.c#2 edit

Differences ...

==== //depot/projects/ctsrd/cheribsd/src/ctsrd/libexec/readpng-cheri/malloc.c#2 (text+ko) ====

@@ -37,7 +37,7 @@
 size_t	 _sb_heaplen;
 
 void *
-malloc(size_t size __unused)
+malloc(size_t size)
 {
 	size_t rsize;
 	char *ptr;
@@ -45,7 +45,7 @@
 	rsize = roundup2(size, 4096);
 	ptr = _sb_heapbase;
 	_sb_heaplen -= rsize;
-	_sb_heapbase = (char *)_sb_heapbase + rsize;
+	_sb_heapbase = ptr + rsize;
 
 	return(ptr);
 }