From owner-p4-projects@FreeBSD.ORG  Sat May 28 03:30:13 2005
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 3FB8816A420; Sat, 28 May 2005 03:30:13 +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 13C2316A41C
	for <perforce@freebsd.org>; Sat, 28 May 2005 03:30:13 +0000 (GMT)
	(envelope-from csjp@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id E3F5843D1D
	for <perforce@freebsd.org>; Sat, 28 May 2005 03:30:12 +0000 (GMT)
	(envelope-from csjp@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 j4S3UCgg050439
	for <perforce@freebsd.org>; Sat, 28 May 2005 03:30:12 GMT
	(envelope-from csjp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j4S3UC2i050436
	for perforce@freebsd.org; Sat, 28 May 2005 03:30:12 GMT
	(envelope-from csjp@freebsd.org)
Date: Sat, 28 May 2005 03:30:12 GMT
Message-Id: <200505280330.j4S3UC2i050436@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	csjp@freebsd.org using -f
From: "Christian S.J. Peron" <csjp@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 77603 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, 28 May 2005 03:30:14 -0000

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

Change 77603 by csjp@csjp_xor on 2005/05/28 03:29:50

	Use more consistent variable naming convention: s/shac/ctx

Affected files ...

.. //depot/projects/trustedbsd/mac/usr.sbin/getfhash/getfhash.c#9 edit

Differences ...

==== //depot/projects/trustedbsd/mac/usr.sbin/getfhash/getfhash.c#9 (text+ko) ====

@@ -58,7 +58,7 @@
 static int
 calc_sha1(const char *fname, u_char *digest)
 {
-	SHA1_CTX	shac;
+	SHA1_CTX	ctx;
 	int	fd, len, error, count;
 	struct stat sb;
 	off_t b;
@@ -76,7 +76,7 @@
 	}
 	len = getpagesize();
 	buffer = malloc(len);
-	SHA1_Init(&shac);
+	SHA1_Init(&ctx);
 	for (b = 0; b < sb.st_size; b += len) {
 		if ((len + b) > sb.st_size)
 			count = sb.st_size - b;
@@ -89,10 +89,10 @@
 			warn("read failed");
 			return (error);
 		}
-		SHA1_Update(&shac, buffer, count);
+		SHA1_Update(&ctx, buffer, count);
 	}
 	close(fd);
-	SHA1_Final(digest, &shac);
+	SHA1_Final(digest, &ctx);
 	free(buffer);
 	return (0);
 }