From owner-p4-projects@FreeBSD.ORG  Sat Jan 21 15:36:57 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 CABDA16A422; Sat, 21 Jan 2006 15:36:56 +0000 (GMT)
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 8A0FD16A41F
	for <perforce@freebsd.org>; Sat, 21 Jan 2006 15:36:56 +0000 (GMT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 47AB943D45
	for <perforce@freebsd.org>; Sat, 21 Jan 2006 15:36:56 +0000 (GMT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0LFauib087945
	for <perforce@freebsd.org>; Sat, 21 Jan 2006 15:36:56 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0LFathl087942
	for perforce@freebsd.org; Sat, 21 Jan 2006 15:36:55 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sat, 21 Jan 2006 15:36:55 GMT
Message-Id: <200601211536.k0LFathl087942@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 90095 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: Sat, 21 Jan 2006 15:36:57 -0000

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

Change 90095 by rwatson@rwatson_sesame on 2006/01/21 15:36:25

	Void '- ... -' expressions, because FlexeLint tells me I will find
	it confusing.
	
	Submitted by:	phk
	Found with:	FlexeLint

Affected files ...

.. //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#22 edit

Differences ...

==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#22 (text+ko) ====

@@ -2372,7 +2372,7 @@
 	int err = 0;
 	int recoversize;
 
-	recoversize = len - tok->len - BSM_TRAILER_SIZE;
+	recoversize = len - (tok->len + BSM_TRAILER_SIZE);
 	if (recoversize <= 0)
 		return (-1);
 
@@ -2737,7 +2737,7 @@
 		bptr += sizeof(u_int32_t);
 
 		/* now read remaining record bytes */
-		bytestoread = recsize - sizeof(u_int32_t) - sizeof(u_char);
+		bytestoread = recsize - (sizeof(u_int32_t) + sizeof(u_char));
 
 		if (fread(bptr, 1, bytestoread, fp) < bytestoread) {
 			free(*buf);