From owner-p4-projects@FreeBSD.ORG  Fri Oct  7 22:23:01 2011
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2E2C31065672; Fri,  7 Oct 2011 22:23:01 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E4388106566B
	for <perforce@freebsd.org>; Fri,  7 Oct 2011 22:23:00 +0000 (UTC)
	(envelope-from pjd@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id D2C208FC15
	for <perforce@freebsd.org>; Fri,  7 Oct 2011 22:23:00 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p97MN0FA001929
	for <perforce@freebsd.org>; Fri, 7 Oct 2011 22:23:00 GMT
	(envelope-from pjd@freebsd.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p97MN0m9001926
	for perforce@freebsd.org; Fri, 7 Oct 2011 22:23:00 GMT
	(envelope-from pjd@freebsd.org)
Date: Fri, 7 Oct 2011 22:23:00 GMT
Message-Id: <201110072223.p97MN0m9001926@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	pjd@freebsd.org using -f
From: Pawel Jakub Dawidek <pjd@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 199879 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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: Fri, 07 Oct 2011 22:23:01 -0000

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

Change 199879 by pjd@pjd_anger on 2011/10/07 22:21:56

	Prefer calloc() over malloc()+memset(ptr, 0, size).

Affected files ...

.. //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#97 edit

Differences ...

==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#97 (text+ko) ====

@@ -30,7 +30,7 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#96 $
+ * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#97 $
  */
 
 #include <sys/types.h>
@@ -79,12 +79,11 @@
 	(t) = malloc(sizeof(token_t));					\
 	if ((t) != NULL) {						\
 		(t)->len = (length);					\
-		(dptr) = (t->t_data) = malloc((length) * sizeof(u_char)); \
+		(dptr) = (t->t_data) = calloc((length), sizeof(u_char)); \
 		if ((dptr) == NULL) {					\
 			free(t);					\
 			(t) = NULL;					\
-		} else							\
-			memset((dptr), 0, (length));			\
+		}							\
 	} else								\
 		(dptr) = NULL;						\
 	assert((t) == NULL || (dptr) != NULL);				\