Module Name: src Committed By: tsutsui Date: Sat Oct 24 18:15:46 UTC 2009
Modified Files: src/sbin/disklabel: dkcksum.c dkcksum.h Log Message: - u_short -> uint16_t - KNF a bit To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sbin/disklabel/dkcksum.c cvs rdiff -u -r1.3 -r1.4 src/sbin/disklabel/dkcksum.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sbin/disklabel/dkcksum.c diff -u src/sbin/disklabel/dkcksum.c:1.11 src/sbin/disklabel/dkcksum.c:1.12 --- src/sbin/disklabel/dkcksum.c:1.11 Sun Jun 12 19:18:34 2005 +++ src/sbin/disklabel/dkcksum.c Sat Oct 24 18:15:45 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: dkcksum.c,v 1.11 2005/06/12 19:18:34 dyoung Exp $ */ +/* $NetBSD: dkcksum.c,v 1.12 2009/10/24 18:15:45 tsutsui Exp $ */ /*- * Copyright (c) 1991, 1993 @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)dkcksum.c 8.1 (Berkeley) 6/5/93"; #else -__RCSID("$NetBSD: dkcksum.c,v 1.11 2005/06/12 19:18:34 dyoung Exp $"); +__RCSID("$NetBSD: dkcksum.c,v 1.12 2009/10/24 18:15:45 tsutsui Exp $"); #endif #endif /* not lint */ @@ -50,16 +50,16 @@ #endif /* HAVE_NBTOOL_CONFIG_H */ #include "dkcksum.h" -u_short +uint16_t dkcksum(struct disklabel *lp) { - u_short *start, *end; - u_short sum; + uint16_t *start, *end; + uint16_t sum; sum = 0; - start = (u_short *)lp; - end = (u_short *)&lp->d_partitions[lp->d_npartitions]; + start = (uint16_t *)lp; + end = (uint16_t *)&lp->d_partitions[lp->d_npartitions]; while (start < end) sum ^= *start++; - return (sum); + return sum; } Index: src/sbin/disklabel/dkcksum.h diff -u src/sbin/disklabel/dkcksum.h:1.3 src/sbin/disklabel/dkcksum.h:1.4 --- src/sbin/disklabel/dkcksum.h:1.3 Sun Dec 24 05:59:11 2000 +++ src/sbin/disklabel/dkcksum.h Sat Oct 24 18:15:45 2009 @@ -1,3 +1,3 @@ -/* $NetBSD: dkcksum.h,v 1.3 2000/12/24 05:59:11 lukem Exp $ */ +/* $NetBSD: dkcksum.h,v 1.4 2009/10/24 18:15:45 tsutsui Exp $ */ -u_short dkcksum(struct disklabel *); +uint16_t dkcksum(struct disklabel *);