Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/usr.bin/systat Functional LP64 and type sanity fixes.
details: https://anonhg.NetBSD.org/src/rev/34d00837d726
branches: trunk
changeset: 472199:34d00837d726
user: ross <ross%NetBSD.org@localhost>
date: Sat Apr 24 23:36:36 1999 +0000
description:
Functional LP64 and type sanity fixes.
diffstat:
usr.bin/systat/extern.h | 4 ++--
usr.bin/systat/fetch.c | 8 ++++----
usr.bin/systat/main.c | 8 ++++----
usr.bin/systat/netstat.c | 6 +++---
usr.bin/systat/pigs.c | 8 ++++----
5 files changed, 17 insertions(+), 17 deletions(-)
diffs (133 lines):
diff -r ea6b986995da -r 34d00837d726 usr.bin/systat/extern.h
--- a/usr.bin/systat/extern.h Sat Apr 24 22:09:56 1999 +0000
+++ b/usr.bin/systat/extern.h Sat Apr 24 23:36:36 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: extern.h,v 1.7 1999/02/21 21:48:07 jwise Exp $ */
+/* $NetBSD: extern.h,v 1.8 1999/04/24 23:36:36 ross Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -92,7 +92,7 @@
int initpigs __P((void));
int initswap __P((void));
int keyboard __P((void)) __attribute__((__noreturn__));
-int kvm_ckread __P((void *, void *, int));
+ssize_t kvm_ckread __P((void *, const void *, size_t));
void labeliostat __P((void));
void labelkre __P((void));
void labelmbufs __P((void));
diff -r ea6b986995da -r 34d00837d726 usr.bin/systat/fetch.c
--- a/usr.bin/systat/fetch.c Sat Apr 24 22:09:56 1999 +0000
+++ b/usr.bin/systat/fetch.c Sat Apr 24 23:36:36 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: fetch.c,v 1.4 1998/07/12 05:59:00 mrg Exp $ */
+/* $NetBSD: fetch.c,v 1.5 1999/04/24 23:36:36 ross Exp $ */
/*-
* Copyright (c) 1980, 1992, 1993
@@ -38,17 +38,17 @@
#if 0
static char sccsid[] = "@(#)fetch.c 8.1 (Berkeley) 6/6/93";
#endif
-__RCSID("$NetBSD: fetch.c,v 1.4 1998/07/12 05:59:00 mrg Exp $");
+__RCSID("$NetBSD: fetch.c,v 1.5 1999/04/24 23:36:36 ross Exp $");
#endif /* not lint */
#include <sys/types.h>
#include "systat.h"
#include "extern.h"
-int
+ssize_t
kvm_ckread(a, b, l)
void *a, *b;
- int l;
+ size_t l;
{
if (kvm_read(kd, (u_long)a, b, l) != l) {
if (verbose)
diff -r ea6b986995da -r 34d00837d726 usr.bin/systat/main.c
--- a/usr.bin/systat/main.c Sat Apr 24 22:09:56 1999 +0000
+++ b/usr.bin/systat/main.c Sat Apr 24 23:36:36 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.15 1998/07/19 17:47:07 drochner Exp $ */
+/* $NetBSD: main.c,v 1.16 1999/04/24 23:36:36 ross Exp $ */
/*-
* Copyright (c) 1980, 1992, 1993
@@ -40,7 +40,7 @@
#if 0
static char sccsid[] = "@(#)main.c 8.1 (Berkeley) 6/6/93";
#endif
-__RCSID("$NetBSD: main.c,v 1.15 1998/07/19 17:47:07 drochner Exp $");
+__RCSID("$NetBSD: main.c,v 1.16 1999/04/24 23:36:36 ross Exp $");
#endif /* not lint */
#include <sys/param.h>
@@ -194,8 +194,8 @@
}
gethostname(hostname, sizeof (hostname));
hostname[sizeof(hostname) - 1] = '\0';
- NREAD(X_HZ, &hz, LONG);
- NREAD(X_STATHZ, &stathz, LONG);
+ NREAD(X_HZ, &hz, sizeof hz);
+ NREAD(X_STATHZ, &stathz, sizeof stathz);
(*curcmd->c_init)();
curcmd->c_flags |= CF_INIT;
labels();
diff -r ea6b986995da -r 34d00837d726 usr.bin/systat/netstat.c
--- a/usr.bin/systat/netstat.c Sat Apr 24 22:09:56 1999 +0000
+++ b/usr.bin/systat/netstat.c Sat Apr 24 23:36:36 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: netstat.c,v 1.10 1998/08/25 20:59:40 ross Exp $ */
+/* $NetBSD: netstat.c,v 1.11 1999/04/24 23:36:36 ross Exp $ */
/*-
* Copyright (c) 1980, 1992, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)netstat.c 8.1 (Berkeley) 6/6/93";
#endif
-__RCSID("$NetBSD: netstat.c,v 1.10 1998/08/25 20:59:40 ross Exp $");
+__RCSID("$NetBSD: netstat.c,v 1.11 1999/04/24 23:36:36 ross Exp $");
#endif /* not lint */
/*
@@ -198,7 +198,7 @@
return;
}
again:
- KREAD(off, &pcbtable, sizeof (struct inpcbtable));
+ KREAD(off, &pcbtable, sizeof pcbtable);
prev = head = (struct inpcb *)&((struct inpcbtable *)off)->inpt_queue;
next = pcbtable.inpt_queue.cqh_first;
while (next != head) {
diff -r ea6b986995da -r 34d00837d726 usr.bin/systat/pigs.c
--- a/usr.bin/systat/pigs.c Sat Apr 24 22:09:56 1999 +0000
+++ b/usr.bin/systat/pigs.c Sat Apr 24 23:36:36 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pigs.c,v 1.13 1999/02/21 21:48:07 jwise Exp $ */
+/* $NetBSD: pigs.c,v 1.14 1999/04/24 23:36:36 ross Exp $ */
/*-
* Copyright (c) 1980, 1992, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)pigs.c 8.2 (Berkeley) 9/23/93";
#endif
-__RCSID("$NetBSD: pigs.c,v 1.13 1999/02/21 21:48:07 jwise Exp $");
+__RCSID("$NetBSD: pigs.c,v 1.14 1999/04/24 23:36:36 ross Exp $");
#endif /* not lint */
/*
@@ -176,8 +176,8 @@
}
KREAD(NPTR(X_CPTIME), stime, sizeof (stime));
KREAD(NPTR(X_PHYSMEM), &mempages, sizeof (mempages));
- NREAD(X_CCPU, &ccpu, LONG);
- NREAD(X_FSCALE, &fscale, LONG);
+ NREAD(X_CCPU, &ccpu, sizeof ccpu);
+ NREAD(X_FSCALE, &fscale, sizeof fscale);
lccpu = log((double) ccpu / fscale);
return(1);
Home |
Main Index |
Thread Index |
Old Index