diff options
| author | simonb <simonb@NetBSD.org> | 1999-12-03 02:26:36 +0000 |
|---|---|---|
| committer | simonb <simonb@NetBSD.org> | 1999-12-03 02:26:36 +0000 |
| commit | e7f8f72d9dbf2e2c95f1e4201808ffd73697d52c (patch) | |
| tree | 4eca78d1f5bec097c95626ffcc6588d933a3e865 | |
| parent | 5801c247fa2f1d1d44c36830fb62e2efbfcd7d28 (diff) | |
Since we have an "extern.h", put all external variable declarations in
that file and not sprinkled around various .c files.
| -rw-r--r-- | bin/ps/extern.h | 4 | ||||
| -rw-r--r-- | bin/ps/fmt.c | 4 | ||||
| -rw-r--r-- | bin/ps/keyword.c | 5 | ||||
| -rw-r--r-- | bin/ps/nlist.c | 6 | ||||
| -rw-r--r-- | bin/ps/print.c | 7 |
5 files changed, 12 insertions, 14 deletions
diff --git a/bin/ps/extern.h b/bin/ps/extern.h index adc82fe2b55..5ac7660225e 100644 --- a/bin/ps/extern.h +++ b/bin/ps/extern.h @@ -1,4 +1,4 @@ -/* $NetBSD: extern.h,v 1.15 1999/12/03 02:16:41 simonb Exp $ */ +/* $NetBSD: extern.h,v 1.16 1999/12/03 02:26:36 simonb Exp $ */ /*- * Copyright (c) 1991, 1993, 1994 @@ -43,7 +43,9 @@ struct varent; extern fixpt_t ccpu; extern int eval, fscale, mempages, nlistread, rawcpu; extern int sumrusage, termwidth, totwidth; +extern int needenv, needcomm, commandonly, dontuseprocfs, use_procfs; extern uid_t myuid; +extern kvm_t *kd; extern VAR var[]; extern VARENT *vhead; diff --git a/bin/ps/fmt.c b/bin/ps/fmt.c index 5d020274eac..542ed383d80 100644 --- a/bin/ps/fmt.c +++ b/bin/ps/fmt.c @@ -1,5 +1,6 @@ -/* $NetBSD: fmt.c,v 1.13 1998/02/03 03:16:01 perry Exp $ */ +/* $NetBSD: fmt.c,v 1.14 1999/12/03 02:26:36 simonb Exp $ */ +#include <kvm.h> #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -8,7 +9,6 @@ #include <sys/time.h> #include <sys/resource.h> #include "ps.h" -#include "extern.h" void fmt_puts(s, leftp) diff --git a/bin/ps/keyword.c b/bin/ps/keyword.c index e8e73ee6956..02cbb70ec5d 100644 --- a/bin/ps/keyword.c +++ b/bin/ps/keyword.c @@ -1,4 +1,4 @@ -/* $NetBSD: keyword.c,v 1.20 1999/11/09 15:06:31 drochner Exp $ */ +/* $NetBSD: keyword.c,v 1.21 1999/12/03 02:26:36 simonb Exp $ */ /*- * Copyright (c) 1990, 1993, 1994 @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)keyword.c 8.5 (Berkeley) 4/2/94"; #else -__RCSID("$NetBSD: keyword.c,v 1.20 1999/11/09 15:06:31 drochner Exp $"); +__RCSID("$NetBSD: keyword.c,v 1.21 1999/12/03 02:26:36 simonb Exp $"); #endif #endif /* not lint */ @@ -51,6 +51,7 @@ __RCSID("$NetBSD: keyword.c,v 1.20 1999/11/09 15:06:31 drochner Exp $"); #include <err.h> #include <errno.h> +#include <kvm.h> #include <stddef.h> #include <stdio.h> #include <stdlib.h> diff --git a/bin/ps/nlist.c b/bin/ps/nlist.c index ff37890c7e1..053253891c1 100644 --- a/bin/ps/nlist.c +++ b/bin/ps/nlist.c @@ -1,4 +1,4 @@ -/* $NetBSD: nlist.c,v 1.14 1998/03/27 22:45:47 is Exp $ */ +/* $NetBSD: nlist.c,v 1.15 1999/12/03 02:26:36 simonb Exp $ */ /*- * Copyright (c) 1990, 1993, 1994 @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)nlist.c 8.4 (Berkeley) 4/2/94"; #else -__RCSID("$NetBSD: nlist.c,v 1.14 1998/03/27 22:45:47 is Exp $"); +__RCSID("$NetBSD: nlist.c,v 1.15 1999/12/03 02:26:36 simonb Exp $"); #endif #endif /* not lint */ @@ -72,8 +72,6 @@ int nlistread; /* if nlist already read. */ int mempages; /* number of pages of phys. memory */ int fscale; /* kernel _fscale variable */ -extern kvm_t *kd; - #define kread(x, v) \ kvm_read(kd, psnl[x].n_value, (char *)&v, sizeof v) != sizeof(v) diff --git a/bin/ps/print.c b/bin/ps/print.c index 41230317793..06217ebcd69 100644 --- a/bin/ps/print.c +++ b/bin/ps/print.c @@ -1,4 +1,4 @@ -/* $NetBSD: print.c,v 1.47 1999/12/03 02:16:41 simonb Exp $ */ +/* $NetBSD: print.c,v 1.48 1999/12/03 02:26:36 simonb Exp $ */ /*- * Copyright (c) 1990, 1993, 1994 @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)print.c 8.6 (Berkeley) 4/16/94"; #else -__RCSID("$NetBSD: print.c,v 1.47 1999/12/03 02:16:41 simonb Exp $"); +__RCSID("$NetBSD: print.c,v 1.48 1999/12/03 02:26:36 simonb Exp $"); #endif #endif /* not lint */ @@ -67,9 +67,6 @@ __RCSID("$NetBSD: print.c,v 1.47 1999/12/03 02:16:41 simonb Exp $"); #include "ps.h" -extern kvm_t *kd; -extern int needenv, needcomm, commandonly, dontuseprocfs, use_procfs; - static char *cmdpart __P((char *)); static void printval __P((char *, VAR *)); static int titlecmp __P((char *, char **)); |
