From 576a97331a04f67560b67743bfe0b1c5d586f4d1 Mon Sep 17 00:00:00 2001 From: Chris Pressey Date: Sun, 11 Apr 2004 21:28:03 +0000 Subject: [PATCH] Style(9) cleanup. - Convert K&R-style function definitions to ANSI style. - Remove `register' keywords. - Use stdarg.h instead of varargs.h for variable numbers of arguments. - #define _KERNEL_STRUCTURES when accessing kernel structures. - No functional changes. --- lib/libkvm/kvm.c | 98 ++++++++------------------------- lib/libkvm/kvm_alpha.c | 19 ++----- lib/libkvm/kvm_file.c | 14 ++--- lib/libkvm/kvm_getloadavg.c | 7 +-- lib/libkvm/kvm_getswapinfo.c | 4 +- lib/libkvm/kvm_proc.c | 103 ++++++++++------------------------- lib/libkvm/kvm_sparc.c | 37 +++++-------- 7 files changed, 78 insertions(+), 204 deletions(-) diff --git a/lib/libkvm/kvm.c b/lib/libkvm/kvm.c index 15189e335d..d8e0e679ce 100644 --- a/lib/libkvm/kvm.c +++ b/lib/libkvm/kvm.c @@ -36,7 +36,7 @@ * * @(#)kvm.c 8.2 (Berkeley) 2/13/94 * $FreeBSD: src/lib/libkvm/kvm.c,v 1.12.2.3 2002/09/13 14:53:43 nectar Exp $ - * $DragonFly: src/lib/libkvm/kvm.c,v 1.3 2003/11/12 20:21:30 eirikn Exp $ + * $DragonFly: src/lib/libkvm/kvm.c,v 1.4 2004/04/11 21:28:03 cpressey Exp $ */ #include @@ -62,6 +62,7 @@ #include #include #include +#include #include #include "kvm_private.h" @@ -70,18 +71,11 @@ int __fdnlist (int, struct nlist *); char * -kvm_geterr(kd) - kvm_t *kd; +kvm_geterr(kvm_t *kd) { return (kd->errbuf); } -#if __STDC__ -#include -#else -#include -#endif - /* * Report an error using printf style arguments. "program" is kd->program * on hard errors, and 0 on soft errors, so that under sun error emulation, @@ -89,22 +83,11 @@ kvm_geterr(kd) * generate tons of error messages when trying to access bogus pointers). */ void -#if __STDC__ _kvm_err(kvm_t *kd, const char *program, const char *fmt, ...) -#else -_kvm_err(kd, program, fmt, va_alist) - kvm_t *kd; - char *program, *fmt; - va_dcl -#endif { va_list ap; -#ifdef __STDC__ va_start(ap, fmt); -#else - va_start(ap); -#endif if (program != NULL) { (void)fprintf(stderr, "%s: ", program); (void)vfprintf(stderr, fmt, ap); @@ -117,23 +100,12 @@ _kvm_err(kd, program, fmt, va_alist) } void -#if __STDC__ _kvm_syserr(kvm_t *kd, const char *program, const char *fmt, ...) -#else -_kvm_syserr(kd, program, fmt, va_alist) - kvm_t *kd; - char *program, *fmt; - va_dcl -#endif { va_list ap; - register int n; + int n; -#if __STDC__ va_start(ap, fmt); -#else - va_start(ap); -#endif if (program != NULL) { (void)fprintf(stderr, "%s: ", program); (void)vfprintf(stderr, fmt, ap); @@ -150,9 +122,7 @@ _kvm_syserr(kd, program, fmt, va_alist) } void * -_kvm_malloc(kd, n) - register kvm_t *kd; - register size_t n; +_kvm_malloc(kvm_t *kd, size_t n) { void *p; @@ -163,12 +133,7 @@ _kvm_malloc(kd, n) } static kvm_t * -_kvm_open(kd, uf, mf, flag, errout) - register kvm_t *kd; - const char *uf; - const char *mf; - int flag; - char *errout; +_kvm_open(kvm_t *kd, const char *uf, const char *mf, int flag, char *errout) { struct stat st; @@ -257,14 +222,10 @@ failed: } kvm_t * -kvm_openfiles(uf, mf, sf, flag, errout) - const char *uf; - const char *mf; - const char *sf; - int flag; - char *errout; +kvm_openfiles(const char *uf, const char *mf, const char *sf, int flag, + char *errout) { - register kvm_t *kd; + kvm_t *kd; if ((kd = malloc(sizeof(*kd))) == NULL) { (void)strlcpy(errout, strerror(errno), _POSIX2_LINE_MAX); @@ -276,14 +237,10 @@ kvm_openfiles(uf, mf, sf, flag, errout) } kvm_t * -kvm_open(uf, mf, sf, flag, errstr) - const char *uf; - const char *mf; - const char *sf; - int flag; - const char *errstr; +kvm_open(const char *uf, const char *mf, const char *sf, int flag, + const char *errstr) { - register kvm_t *kd; + kvm_t *kd; if ((kd = malloc(sizeof(*kd))) == NULL) { if (errstr != NULL) @@ -297,10 +254,9 @@ kvm_open(uf, mf, sf, flag, errstr) } int -kvm_close(kd) - kvm_t *kd; +kvm_close(kvm_t *kd) { - register int error = 0; + int error = 0; if (kd->pmfd >= 0) error |= close(kd->pmfd); @@ -320,12 +276,10 @@ kvm_close(kd) } int -kvm_nlist(kd, nl) - kvm_t *kd; - struct nlist *nl; +kvm_nlist(kvm_t *kd, struct nlist *nl) { - register struct nlist *p; - register int nvalid; + struct nlist *p; + int nvalid; struct kld_sym_lookup lookup; /* @@ -365,14 +319,10 @@ kvm_nlist(kd, nl) } ssize_t -kvm_read(kd, kva, buf, len) - kvm_t *kd; - register u_long kva; - register void *buf; - register size_t len; +kvm_read(kvm_t *kd, u_long kva, void *buf, size_t len) { - register int cc; - register void *cp; + int cc; + void *cp; if (ISALIVE(kd)) { /* @@ -429,13 +379,9 @@ kvm_read(kd, kva, buf, len) } ssize_t -kvm_write(kd, kva, buf, len) - kvm_t *kd; - register u_long kva; - register const void *buf; - register size_t len; +kvm_write(kvm_t *kd, u_long kva, const void *buf, size_t len) { - register int cc; + int cc; if (ISALIVE(kd)) { /* diff --git a/lib/libkvm/kvm_alpha.c b/lib/libkvm/kvm_alpha.c index 587f142511..3ddd6914c9 100644 --- a/lib/libkvm/kvm_alpha.c +++ b/lib/libkvm/kvm_alpha.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/lib/libkvm/kvm_alpha.c,v 1.4 1999/12/27 07:14:56 peter Exp $ */ -/* $DragonFly: src/lib/libkvm/Attic/kvm_alpha.c,v 1.2 2003/06/17 04:26:49 dillon Exp $ */ +/* $DragonFly: src/lib/libkvm/Attic/kvm_alpha.c,v 1.3 2004/04/11 21:28:03 cpressey Exp $ */ /* $NetBSD: kvm_alpha.c,v 1.7.2.1 1997/11/02 20:34:26 mellon Exp $ */ /* @@ -56,18 +56,15 @@ struct vmstate { }; void -_kvm_freevtop(kd) - kvm_t *kd; +_kvm_freevtop(kvm_t *kd) { - /* Not actually used for anything right now, but safe. */ if (kd->vmst != 0) free(kd->vmst); } int -_kvm_initvtop(kd) - kvm_t *kd; +_kvm_initvtop(kvm_t *kd) { struct vmstate *vm; struct nlist nlist[2]; @@ -105,10 +102,7 @@ _kvm_initvtop(kd) } int -_kvm_kvatop(kd, va, pa) - kvm_t *kd; - u_long va; - u_long *pa; +_kvm_kvatop(kvm_t *kd, u_long va, u_long *pa) { u_int64_t lev1map_pa; /* PA of Lev1map */ u_int64_t page_size; @@ -203,10 +197,7 @@ lose: * Translate a physical address to a file-offset in the crash-dump. */ off_t -_kvm_pa2off(kd, pa) - kvm_t *kd; - u_long pa; +_kvm_pa2off(kvm_t *kd, u_long pa) { return ALPHA_K0SEG_TO_PHYS(pa); } - diff --git a/lib/libkvm/kvm_file.c b/lib/libkvm/kvm_file.c index 5d9b48fc7a..2f5352170e 100644 --- a/lib/libkvm/kvm_file.c +++ b/lib/libkvm/kvm_file.c @@ -32,7 +32,7 @@ * * @(#)kvm_file.c 8.1 (Berkeley) 6/4/93 * $FreeBSD: src/lib/libkvm/kvm_file.c,v 1.11 2000/02/18 16:39:00 peter Exp $ - * $DragonFly: src/lib/libkvm/kvm_file.c,v 1.2 2003/06/17 04:26:49 dillon Exp $ + * $DragonFly: src/lib/libkvm/kvm_file.c,v 1.3 2004/04/11 21:28:03 cpressey Exp $ */ /* @@ -72,14 +72,11 @@ * Get file structures. */ static int -kvm_deadfiles(kd, op, arg, filehead_o, nfiles) - kvm_t *kd; - int op, arg, nfiles; - long filehead_o; +kvm_deadfiles(kvm_t *kd, int op, int arg, long filehead_o, int nfiles) { int buflen = kd->arglen, n = 0; struct file *fp; - register char *where = kd->argspc; + char *where = kd->argspc; struct filelist filehead; /* @@ -117,10 +114,7 @@ kvm_deadfiles(kd, op, arg, filehead_o, nfiles) } char * -kvm_getfiles(kd, op, arg, cnt) - kvm_t *kd; - int op, arg; - int *cnt; +kvm_getfiles(kvm_t *kd, int op, int arg, int *cnt) { int mib[2], st, nfiles; size_t size; diff --git a/lib/libkvm/kvm_getloadavg.c b/lib/libkvm/kvm_getloadavg.c index 34eeb9170c..6dbe56365c 100644 --- a/lib/libkvm/kvm_getloadavg.c +++ b/lib/libkvm/kvm_getloadavg.c @@ -32,7 +32,7 @@ * * @(#)kvm_getloadavg.c 8.1 (Berkeley) 6/4/93 * $FreeBSD: src/lib/libkvm/kvm_getloadavg.c,v 1.3 1999/12/27 07:14:57 peter Exp $ - * $DragonFly: src/lib/libkvm/kvm_getloadavg.c,v 1.3 2003/11/21 22:46:11 dillon Exp $ + * $DragonFly: src/lib/libkvm/kvm_getloadavg.c,v 1.4 2004/04/11 21:28:03 cpressey Exp $ */ #include @@ -64,10 +64,7 @@ static struct nlist nl[] = { * Return number of samples retrieved, or -1 on error. */ int -kvm_getloadavg(kd, loadavg, nelem) - kvm_t *kd; - double loadavg[]; - int nelem; +kvm_getloadavg(kvm_t *kd, double loadavg[], int nelem) { struct loadavg loadinfo; struct nlist *p; diff --git a/lib/libkvm/kvm_getswapinfo.c b/lib/libkvm/kvm_getswapinfo.c index 7ac1966f8c..3427ce6e51 100644 --- a/lib/libkvm/kvm_getswapinfo.c +++ b/lib/libkvm/kvm_getswapinfo.c @@ -7,9 +7,11 @@ * * @(#) Copyright (c) 1999 * $FreeBSD: src/lib/libkvm/kvm_getswapinfo.c,v 1.10.2.4 2003/01/12 09:23:13 dillon Exp $ - * $DragonFly: src/lib/libkvm/kvm_getswapinfo.c,v 1.2 2003/06/17 04:26:49 dillon Exp $ + * $DragonFly: src/lib/libkvm/kvm_getswapinfo.c,v 1.3 2004/04/11 21:28:03 cpressey Exp $ */ +#define _KERNEL_STRUCTURES + #include #include #include diff --git a/lib/libkvm/kvm_proc.c b/lib/libkvm/kvm_proc.c index 6f287dcc43..68cd09ef08 100644 --- a/lib/libkvm/kvm_proc.c +++ b/lib/libkvm/kvm_proc.c @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libkvm/kvm_proc.c,v 1.25.2.3 2002/08/24 07:27:46 kris Exp $ - * $DragonFly: src/lib/libkvm/kvm_proc.c,v 1.5 2004/02/03 07:34:10 dillon Exp $ + * $DragonFly: src/lib/libkvm/kvm_proc.c,v 1.6 2004/04/11 21:28:03 cpressey Exp $ * * @(#)kvm_proc.c 8.3 (Berkeley) 9/23/93 */ @@ -75,11 +75,7 @@ #if used static char * -kvm_readswap(kd, p, va, cnt) - kvm_t *kd; - const struct proc *p; - u_long va; - u_long *cnt; +kvm_readswap(kvm_t *kd, const struct proc *p, u_long va, u_long *cnt) { #if defined(__FreeBSD__) || defined(__DragonFly__) /* XXX Stubbed out, our vm system is differnet */ @@ -97,14 +93,10 @@ kvm_readswap(kd, p, va, cnt) * at most maxcnt procs. */ static int -kvm_proclist(kd, what, arg, p, bp, maxcnt) - kvm_t *kd; - int what, arg; - struct proc *p; - struct kinfo_proc *bp; - int maxcnt; +kvm_proclist(kvm_t *kd, int what, int arg, struct proc *p, + struct kinfo_proc *bp, int maxcnt) { - register int cnt = 0; + int cnt = 0; struct eproc eproc; struct pgrp pgrp; struct session sess; @@ -248,15 +240,11 @@ kvm_proclist(kd, what, arg, p, bp, maxcnt) * Return number of procs read. maxcnt is the max we will read. */ static int -kvm_deadprocs(kd, what, arg, a_allproc, a_zombproc, maxcnt) - kvm_t *kd; - int what, arg; - u_long a_allproc; - u_long a_zombproc; - int maxcnt; +kvm_deadprocs(kvm_t *kd, int what, int arg, u_long a_allproc, + u_long a_zombproc, int maxcnt) { - register struct kinfo_proc *bp = kd->procbase; - register int acnt, zcnt; + struct kinfo_proc *bp = kd->procbase; + int acnt, zcnt; struct proc *p; if (KREAD(kd, a_allproc, &p)) { @@ -279,10 +267,7 @@ kvm_deadprocs(kd, what, arg, a_allproc, a_zombproc, maxcnt) } struct kinfo_proc * -kvm_getprocs(kd, op, arg, cnt) - kvm_t *kd; - int op, arg; - int *cnt; +kvm_getprocs(kvm_t *kd, int op, int arg, int *cnt) { int mib[4], st, nprocs; size_t size; @@ -362,8 +347,7 @@ kvm_getprocs(kd, op, arg, cnt) } void -_kvm_freeprocs(kd) - kvm_t *kd; +_kvm_freeprocs(kvm_t *kd) { if (kd->procbase) { free(kd->procbase); @@ -372,10 +356,7 @@ _kvm_freeprocs(kd) } void * -_kvm_realloc(kd, p, n) - kvm_t *kd; - void *p; - size_t n; +_kvm_realloc(kvm_t *kd, void *p, size_t n) { void *np = (void *)realloc(p, n); @@ -397,17 +378,12 @@ _kvm_realloc(kd, p, n) * environment strings. Read at most maxcnt characters of strings. */ static char ** -kvm_argv(kd, p, addr, narg, maxcnt) - kvm_t *kd; - const struct proc *p; - register u_long addr; - register int narg; - register int maxcnt; +kvm_argv(kvm_t *kd, const struct proc *p, u_long addr, int narg, int maxcnt) { - register char *np, *cp, *ep, *ap; - register u_long oaddr = -1; - register int len, cc; - register char **argv; + char *np, *cp, *ep, *ap; + u_long oaddr = -1; + int len, cc; + char **argv; /* * Check that there aren't an unreasonable number of agruments, @@ -573,20 +549,14 @@ kvm_argv(kd, p, addr, narg, maxcnt) } static void -ps_str_a(p, addr, n) - struct ps_strings *p; - u_long *addr; - int *n; +ps_str_a(struct ps_strings *p, u_long *addr, int *n) { *addr = (u_long)p->ps_argvstr; *n = p->ps_nargvstr; } static void -ps_str_e(p, addr, n) - struct ps_strings *p; - u_long *addr; - int *n; +ps_str_e(struct ps_strings *p, u_long *addr, int *n) { *addr = (u_long)p->ps_envstr; *n = p->ps_nenvstr; @@ -598,10 +568,7 @@ ps_str_e(p, addr, n) * being wrong are very low. */ static int -proc_verify(kd, kernp, p) - kvm_t *kd; - u_long kernp; - const struct proc *p; +proc_verify(kvm_t *kd, u_long kernp, const struct proc *p) { struct kinfo_proc kp; int mib[4]; @@ -619,14 +586,11 @@ proc_verify(kd, kernp, p) } static char ** -kvm_doargv(kd, kp, nchr, info) - kvm_t *kd; - const struct kinfo_proc *kp; - int nchr; - void (*info)(struct ps_strings *, u_long *, int *); +kvm_doargv(kvm_t *kd, const struct kinfo_proc *kp, int nchr, + void (*info)(struct ps_strings *, u_long *, int *)) { - register const struct proc *p = &kp->kp_proc; - register char **ap; + const struct proc *p = &kp->kp_proc; + char **ap; u_long addr; int cnt; static struct ps_strings arginfo; @@ -665,10 +629,7 @@ kvm_doargv(kd, kp, nchr, info) * Get the command args. This code is now machine independent. */ char ** -kvm_getargv(kd, kp, nchr) - kvm_t *kd; - const struct kinfo_proc *kp; - int nchr; +kvm_getargv(kvm_t *kd, const struct kinfo_proc *kp, int nchr) { int oid[4]; int i; @@ -727,10 +688,7 @@ kvm_getargv(kd, kp, nchr) } char ** -kvm_getenvv(kd, kp, nchr) - kvm_t *kd; - const struct kinfo_proc *kp; - int nchr; +kvm_getenvv(kvm_t *kd, const struct kinfo_proc *kp, int nchr) { return (kvm_doargv(kd, kp, nchr, ps_str_e)); } @@ -739,14 +697,9 @@ kvm_getenvv(kd, kp, nchr) * Read from user space. The user context is given by p. */ ssize_t -kvm_uread(kd, p, uva, buf, len) - kvm_t *kd; - register const struct proc *p; - register u_long uva; - register char *buf; - register size_t len; +kvm_uread(kvm_t *kd, const struct proc *p, u_long uva, char *buf, size_t len) { - register char *cp; + char *cp; char procfile[MAXPATHLEN]; ssize_t amount; int fd; diff --git a/lib/libkvm/kvm_sparc.c b/lib/libkvm/kvm_sparc.c index 42a6408e49..99226d382b 100644 --- a/lib/libkvm/kvm_sparc.c +++ b/lib/libkvm/kvm_sparc.c @@ -36,7 +36,7 @@ * * @(#)kvm_sparc.c 8.1 (Berkeley) 6/4/93 * $FreeBSD: src/lib/libkvm/kvm_sparc.c,v 1.3 1999/12/27 07:14:58 peter Exp $ - * $DragonFly: src/lib/libkvm/kvm_sparc.c,v 1.2 2003/06/17 04:26:49 dillon Exp $ + * $DragonFly: src/lib/libkvm/kvm_sparc.c,v 1.3 2004/04/11 21:28:03 cpressey Exp $ */ /* @@ -76,20 +76,18 @@ struct vmstate { }; void -_kvm_freevtop(kd) - kvm_t *kd; +_kvm_freevtop(kvm_t *kd) { if (kd->vmst != 0) free(kd->vmst); } int -_kvm_initvtop(kd) - kvm_t *kd; +_kvm_initvtop(kvm_t *kd) { - register int i; - register int off; - register struct vmstate *vm; + int i; + int off; + struct vmstate *vm; struct stat st; struct nlist nlist[2]; @@ -156,15 +154,11 @@ _kvm_initvtop(kd) * Translate a user virtual address to a physical address. */ int -_kvm_uvatop(kd, p, va, pa) - kvm_t *kd; - const struct proc *p; - u_long va; - u_long *pa; +_kvm_uvatop(kvm_t *kd, const struct proc *p, u_long va, u_long *pa) { int kva, pte; - register int off, frame; - register struct vmspace *vms = p->p_vmspace; + int off, frame; + struct vmspace *vms = p->p_vmspace; if ((u_long)vms < KERNBASE) { _kvm_err(kd, kd->program, "_kvm_uvatop: corrupt proc"); @@ -208,15 +202,12 @@ invalid: * physical address. This routine is used only for crashdumps. */ int -_kvm_kvatop(kd, va, pa) - kvm_t *kd; - u_long va; - u_long *pa; +_kvm_kvatop(kvm_t *kd, u_long va, u_long *pa) { - register struct vmstate *vm; - register int s; - register int pte; - register int off; + struct vmstate *vm; + int s; + int pte; + int off; if (va >= KERNBASE) { vm = kd->vmst; -- 2.41.0