From 97b26eb2fd8f9dcac0abd6c6bc9b2242635119fd Mon Sep 17 00:00:00 2001
From: Jordan Gordeev <jgordeev@dir.bg>
Date: Wed, 13 May 2009 20:41:06 +0300
Subject: [PATCH] amd64: Fix several "sizeof(size_t) != sizeof(int)" bugs. The
 compiler warned about them.

---
 sbin/camcontrol/modeedit.c   |  2 +-
 sbin/hammer/cmd_stats.c      |  4 ++--
 usr.bin/kenv/kenv.c          |  4 ++--
 usr.bin/netstat/inet.c       |  2 +-
 usr.bin/top/machine.c        |  4 ++--
 usr.bin/vmstat/vmstat.c      | 10 +++++-----
 usr.sbin/resident/resident.c |  2 +-
 7 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/sbin/camcontrol/modeedit.c b/sbin/camcontrol/modeedit.c
index 94384bba7d..071985e3b6 100644
--- a/sbin/camcontrol/modeedit.c
+++ b/sbin/camcontrol/modeedit.c
@@ -634,7 +634,7 @@ modepage_read(FILE *file)
 	char *line;			/* Pointer to static fgetln buffer. */
 	char *name;			/* Name portion of the line buffer. */
 	char *value;			/* Value portion of line buffer.    */
-	int length;			/* Length of static fgetln buffer.  */
+	size_t length;			/* Length of static fgetln buffer.  */
 
 #define	ABORT_READ(message, param) do {					\
 	warnx(message, param);						\
diff --git a/sbin/hammer/cmd_stats.c b/sbin/hammer/cmd_stats.c
index 5da13c8d35..d84f8255c8 100644
--- a/sbin/hammer/cmd_stats.c
+++ b/sbin/hammer/cmd_stats.c
@@ -44,7 +44,7 @@ void
 hammer_cmd_bstats(char **av, int ac)
 {
 	int mibs[8][16];
-	int lens[8];
+	size_t lens[8];
 	int64_t stats[8];
 	int64_t copy[8];
 	size_t size;
@@ -110,7 +110,7 @@ void
 hammer_cmd_iostats(char **av, int ac)
 {
 	int mibs[8][16];
-	int lens[8];
+	size_t lens[8];
 	int64_t stats[8];
 	int64_t copy[8];
 	size_t size;
diff --git a/usr.bin/kenv/kenv.c b/usr.bin/kenv/kenv.c
index b9d6dbd124..d50a24da3a 100644
--- a/usr.bin/kenv/kenv.c
+++ b/usr.bin/kenv/kenv.c
@@ -47,8 +47,8 @@ int
 main(int argc, char **argv)
 {
 	int real_oid[CTL_MAXNAME];
-	size_t oidlen;
-	int ch, error, hflag, i, slen;
+	size_t oidlen, slen;
+	int ch, error, hflag, i;
 	char *env, *eq, *var, *val;
 
 	hflag = 0;
diff --git a/usr.bin/netstat/inet.c b/usr.bin/netstat/inet.c
index c6984ced62..64fc8ebedb 100644
--- a/usr.bin/netstat/inet.c
+++ b/usr.bin/netstat/inet.c
@@ -180,7 +180,7 @@ outputpcb(int proto, const char *name, struct inpcb *inp, struct xsocket *so, st
 	static struct clockinfo clockinfo;
 
 	if (clockinfo.hz == 0) {
-		int size = sizeof(clockinfo);
+		size_t size = sizeof(clockinfo);
 		sysctlbyname("kern.clockrate", &clockinfo, &size, NULL, 0);
 		if (clockinfo.hz == 0)
 			clockinfo.hz = 100;
diff --git a/usr.bin/top/machine.c b/usr.bin/top/machine.c
index 733d5c768c..2ece09449c 100644
--- a/usr.bin/top/machine.c
+++ b/usr.bin/top/machine.c
@@ -364,8 +364,8 @@ get_system_info(struct system_info *si)
     {
 	struct vmmeter vmm;
 	struct vmstats vms;
-	int vms_size = sizeof(vms);
-	int vmm_size = sizeof(vmm);
+	size_t vms_size = sizeof(vms);
+	size_t vmm_size = sizeof(vmm);
 	static unsigned int swap_delay = 0;
 	static int swapavail = 0;
 	static int swapfree = 0;
diff --git a/usr.bin/vmstat/vmstat.c b/usr.bin/vmstat/vmstat.c
index eea2623287..41da4df802 100644
--- a/usr.bin/vmstat/vmstat.c
+++ b/usr.bin/vmstat/vmstat.c
@@ -390,9 +390,9 @@ dovmstat(u_int interval, int reps)
 	struct vmtotal total;
 	time_t uptime, halfuptime;
 	struct devinfo *tmp_dinfo;
-	int vmm_size = sizeof(vmm);
-	int vms_size = sizeof(vms);
-	int vmt_size = sizeof(total);
+	size_t vmm_size = sizeof(vmm);
+	size_t vms_size = sizeof(vms);
+	size_t vmt_size = sizeof(total);
 
 	uptime = getuptime();
 	halfuptime = uptime / 2;
@@ -554,8 +554,8 @@ static void
 dosum(void)
 {
 	struct nchstats *nch_tmp, nchstats;
-	int vms_size = sizeof(vms);
-	int vmm_size = sizeof(vmm);
+	size_t vms_size = sizeof(vms);
+	size_t vmm_size = sizeof(vmm);
 	int cpucnt;
 	u_long nchtotal;
 	size_t nch_size = sizeof(struct nchstats) * SMP_MAXCPU;
diff --git a/usr.sbin/resident/resident.c b/usr.sbin/resident/resident.c
index 2bea465af3..827b1a51c9 100644
--- a/usr.sbin/resident/resident.c
+++ b/usr.sbin/resident/resident.c
@@ -57,7 +57,7 @@ list_residents(void)
 {
 	const char *mib = "vm.resident";
 	struct xresident *buf;
-	int res_count, res_total;
+	size_t res_count, res_total;
 	int error, i;
 
 	/* get the number of resident binaries */
-- 
2.11.4.GIT