Module Name: src
Committed By: tsutsui
Date: Fri Nov 27 11:23:51 UTC 2009
Modified Files:
src/sys/kern: subr_disk.c
Log Message:
u_short -> uint16_t, some KNF.
To generate a diff of this commit:
cvs rdiff -u -r1.97 -r1.98 src/sys/kern/subr_disk.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/subr_disk.c
diff -u src/sys/kern/subr_disk.c:1.97 src/sys/kern/subr_disk.c:1.98
--- src/sys/kern/subr_disk.c:1.97 Wed May 20 03:26:21 2009
+++ src/sys/kern/subr_disk.c Fri Nov 27 11:23:50 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_disk.c,v 1.97 2009/05/20 03:26:21 dyoung Exp $ */
+/* $NetBSD: subr_disk.c,v 1.98 2009/11/27 11:23:50 tsutsui Exp $ */
/*-
* Copyright (c) 1996, 1997, 1999, 2000, 2009 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_disk.c,v 1.97 2009/05/20 03:26:21 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_disk.c,v 1.98 2009/11/27 11:23:50 tsutsui Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -85,20 +85,21 @@
u_int
dkcksum(struct disklabel *lp)
{
+
return dkcksum_sized(lp, lp->d_npartitions);
}
u_int
dkcksum_sized(struct disklabel *lp, size_t npartitions)
{
- u_short *start, *end;
- u_short sum = 0;
+ uint16_t *start, *end;
+ uint16_t sum = 0;
- start = (u_short *)lp;
- end = (u_short *)&lp->d_partitions[npartitions];
+ start = (uint16_t *)lp;
+ end = (uint16_t *)&lp->d_partitions[npartitions];
while (start < end)
sum ^= *start++;
- return (sum);
+ return sum;
}
/*
