summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lib/libkvm/kvm_cd9660.c7
-rw-r--r--lib/libkvm/kvm_file.c7
-rw-r--r--lib/libkvm/kvm_file2.c7
-rw-r--r--lib/libkvm/kvm_getloadavg.c7
-rw-r--r--lib/libkvm/kvm_m68k.c7
-rw-r--r--lib/libkvm/kvm_mips64.c7
-rw-r--r--lib/libkvm/kvm_private.h5
-rw-r--r--lib/libkvm/kvm_proc.c7
-rw-r--r--lib/libkvm/kvm_udf.c7
9 files changed, 20 insertions, 41 deletions
diff --git a/lib/libkvm/kvm_cd9660.c b/lib/libkvm/kvm_cd9660.c
index e61079e67d7..363ccfabdf8 100644
--- a/lib/libkvm/kvm_cd9660.c
+++ b/lib/libkvm/kvm_cd9660.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kvm_cd9660.c,v 1.1 2009/06/20 19:50:05 millert Exp $ */
+/* $OpenBSD: kvm_cd9660.c,v 1.2 2009/06/20 20:20:43 millert Exp $ */
/*
* Copyright (c) 2009 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -17,7 +17,7 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: kvm_cd9660.c,v 1.1 2009/06/20 19:50:05 millert Exp $";
+static char *rcsid = "$OpenBSD: kvm_cd9660.c,v 1.2 2009/06/20 20:20:43 millert Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/param.h>
@@ -38,9 +38,6 @@ static char *rcsid = "$OpenBSD: kvm_cd9660.c,v 1.1 2009/06/20 19:50:05 millert E
#include "kvm_private.h"
-#define KREAD(kd, addr, obj) \
- (kvm_read(kd, addr, obj, sizeof(*obj)) != sizeof(*obj))
-
int
_kvm_stat_cd9660(kvm_t *kd, struct kinfo_file2 *kf, struct vnode *vp)
{
diff --git a/lib/libkvm/kvm_file.c b/lib/libkvm/kvm_file.c
index c9457473304..db97d4b368a 100644
--- a/lib/libkvm/kvm_file.c
+++ b/lib/libkvm/kvm_file.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kvm_file.c,v 1.14 2006/03/31 03:59:40 deraadt Exp $ */
+/* $OpenBSD: kvm_file.c,v 1.15 2009/06/20 20:20:43 millert Exp $ */
/* $NetBSD: kvm_file.c,v 1.5 1996/03/18 22:33:18 thorpej Exp $ */
/*-
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)kvm_file.c 8.1 (Berkeley) 6/4/93";
#else
-static char *rcsid = "$OpenBSD: kvm_file.c,v 1.14 2006/03/31 03:59:40 deraadt Exp $";
+static char *rcsid = "$OpenBSD: kvm_file.c,v 1.15 2009/06/20 20:20:43 millert Exp $";
#endif
#endif /* LIBC_SCCS and not lint */
@@ -66,9 +66,6 @@ static char *rcsid = "$OpenBSD: kvm_file.c,v 1.14 2006/03/31 03:59:40 deraadt Ex
#include "kvm_private.h"
-#define KREAD(kd, addr, obj) \
- (kvm_read(kd, addr, obj, sizeof(*obj)) != sizeof(*obj))
-
static int kvm_deadfiles(kvm_t *kd, int op, int arg, long filehead_o,
int nfiles);
diff --git a/lib/libkvm/kvm_file2.c b/lib/libkvm/kvm_file2.c
index 00fd9e115d1..8778b63743e 100644
--- a/lib/libkvm/kvm_file2.c
+++ b/lib/libkvm/kvm_file2.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kvm_file2.c,v 1.7 2009/06/20 19:50:05 millert Exp $ */
+/* $OpenBSD: kvm_file2.c,v 1.8 2009/06/20 20:20:43 millert Exp $ */
/*
* Copyright (c) 2009 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -46,7 +46,7 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: kvm_file2.c,v 1.7 2009/06/20 19:50:05 millert Exp $";
+static char *rcsid = "$OpenBSD: kvm_file2.c,v 1.8 2009/06/20 20:20:43 millert Exp $";
#endif /* LIBC_SCCS and not lint */
/*
@@ -121,9 +121,6 @@ static char *rcsid = "$OpenBSD: kvm_file2.c,v 1.7 2009/06/20 19:50:05 millert Ex
#include "kvm_private.h"
-#define KREAD(kd, addr, obj) \
- (kvm_read(kd, addr, obj, sizeof(*obj)) != sizeof(*obj))
-
static struct kinfo_file2 *kvm_deadfile2_byfile(kvm_t *, int, int,
size_t, int *);
static struct kinfo_file2 *kvm_deadfile2_byid(kvm_t *, int, int,
diff --git a/lib/libkvm/kvm_getloadavg.c b/lib/libkvm/kvm_getloadavg.c
index 38dc4c838f9..66cd9af4fa0 100644
--- a/lib/libkvm/kvm_getloadavg.c
+++ b/lib/libkvm/kvm_getloadavg.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kvm_getloadavg.c,v 1.7 2006/03/31 03:59:40 deraadt Exp $ */
+/* $OpenBSD: kvm_getloadavg.c,v 1.8 2009/06/20 20:20:43 millert Exp $ */
/* $NetBSD: kvm_getloadavg.c,v 1.2 1996/03/18 22:33:31 thorpej Exp $ */
/*-
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)kvm_getloadavg.c 8.1 (Berkeley) 6/4/93";
#else
-static char *rcsid = "$OpenBSD: kvm_getloadavg.c,v 1.7 2006/03/31 03:59:40 deraadt Exp $";
+static char *rcsid = "$OpenBSD: kvm_getloadavg.c,v 1.8 2009/06/20 20:20:43 millert Exp $";
#endif
#endif /* LIBC_SCCS and not lint */
@@ -85,9 +85,6 @@ kvm_getloadavg(kvm_t *kd, double loadavg[], int nelem)
return (-1);
}
-#define KREAD(kd, addr, obj) \
- (kvm_read(kd, addr, (char *)(obj), sizeof(*obj)) != sizeof(*obj))
-
if (KREAD(kd, nl[X_AVERUNNABLE].n_value, &loadinfo)) {
_kvm_err(kd, kd->program, "can't read averunnable");
return (-1);
diff --git a/lib/libkvm/kvm_m68k.c b/lib/libkvm/kvm_m68k.c
index 0f774dbbbce..f677789b092 100644
--- a/lib/libkvm/kvm_m68k.c
+++ b/lib/libkvm/kvm_m68k.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kvm_m68k.c,v 1.17 2006/06/12 18:00:08 miod Exp $ */
+/* $OpenBSD: kvm_m68k.c,v 1.18 2009/06/20 20:20:43 millert Exp $ */
/* $NetBSD: kvm_m68k.c,v 1.9 1996/05/07 06:09:11 leo Exp $ */
/*-
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)kvm_hp300.c 8.1 (Berkeley) 6/4/93";
#else
-static char *rcsid = "$OpenBSD: kvm_m68k.c,v 1.17 2006/06/12 18:00:08 miod Exp $";
+static char *rcsid = "$OpenBSD: kvm_m68k.c,v 1.18 2009/06/20 20:20:43 millert Exp $";
#endif
#endif /* LIBC_SCCS and not lint */
@@ -79,9 +79,6 @@ static char *rcsid = "$OpenBSD: kvm_m68k.c,v 1.17 2006/06/12 18:00:08 miod Exp $
#define ptob(x) ((caddr_t)((x) << PGSHIFT)) /* XXX */
#endif
-#define KREAD(kd, addr, p)\
- (kvm_read(kd, addr, (char *)(p), sizeof(*(p))) != sizeof(*(p)))
-
void
_kvm_freevtop(kvm_t *kd)
{
diff --git a/lib/libkvm/kvm_mips64.c b/lib/libkvm/kvm_mips64.c
index 4e6b52063a2..f39d0ded1c2 100644
--- a/lib/libkvm/kvm_mips64.c
+++ b/lib/libkvm/kvm_mips64.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kvm_mips64.c,v 1.7 2007/10/18 04:32:05 miod Exp $ */
+/* $OpenBSD: kvm_mips64.c,v 1.8 2009/06/20 20:20:43 millert Exp $ */
/* $NetBSD: kvm_mips.c,v 1.3 1996/03/18 22:33:44 thorpej Exp $ */
/*-
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)kvm_mips.c 8.1 (Berkeley) 6/4/93";
#else
-static char *rcsid = "$OpenBSD: kvm_mips64.c,v 1.7 2007/10/18 04:32:05 miod Exp $";
+static char *rcsid = "$OpenBSD: kvm_mips64.c,v 1.8 2009/06/20 20:20:43 millert Exp $";
#endif
#endif /* LIBC_SCCS and not lint */
@@ -70,9 +70,6 @@ struct vmstate {
u_int Sysmapsize;
};
-#define KREAD(kd, addr, p)\
- (kvm_read(kd, addr, (char *)(p), sizeof(*(p))) != sizeof(*(p)))
-
void
_kvm_freevtop(kvm_t *kd)
{
diff --git a/lib/libkvm/kvm_private.h b/lib/libkvm/kvm_private.h
index d0b11ff0513..8c402320f21 100644
--- a/lib/libkvm/kvm_private.h
+++ b/lib/libkvm/kvm_private.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: kvm_private.h,v 1.13 2009/06/20 19:50:05 millert Exp $ */
+/* $OpenBSD: kvm_private.h,v 1.14 2009/06/20 20:20:43 millert Exp $ */
/* $NetBSD: kvm_private.h,v 1.7 1996/05/05 04:32:15 gwr Exp $ */
/*-
@@ -86,6 +86,9 @@ struct __kvm {
#define ISALIVE(kd) ((kd)->alive)
};
+#define KREAD(kd, addr, obj) \
+ (kvm_read(kd, addr, (void *)(obj), sizeof(*obj)) != sizeof(*obj))
+
/*
* Functions used internally by kvm, but across kvm modules.
*/
diff --git a/lib/libkvm/kvm_proc.c b/lib/libkvm/kvm_proc.c
index a38ce59087d..0add3192d49 100644
--- a/lib/libkvm/kvm_proc.c
+++ b/lib/libkvm/kvm_proc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kvm_proc.c,v 1.37 2009/01/21 22:18:00 miod Exp $ */
+/* $OpenBSD: kvm_proc.c,v 1.38 2009/06/20 20:20:43 millert Exp $ */
/* $NetBSD: kvm_proc.c,v 1.30 1999/03/24 05:50:50 mrg Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@
#if 0
static char sccsid[] = "@(#)kvm_proc.c 8.3 (Berkeley) 9/23/93";
#else
-static char *rcsid = "$OpenBSD: kvm_proc.c,v 1.37 2009/01/21 22:18:00 miod Exp $";
+static char *rcsid = "$OpenBSD: kvm_proc.c,v 1.38 2009/06/20 20:20:43 millert Exp $";
#endif
#endif /* LIBC_SCCS and not lint */
@@ -144,9 +144,6 @@ struct miniproc {
#define PTRTOINT64(foo) ((u_int64_t)(u_long)(foo))
-#define KREAD(kd, addr, obj) \
- (kvm_read(kd, addr, (void *)(obj), sizeof(*obj)) != sizeof(*obj))
-
ssize_t kvm_uread(kvm_t *, const struct proc *, u_long, char *, size_t);
static char *_kvm_ureadm(kvm_t *, const struct miniproc *, u_long, u_long *);
diff --git a/lib/libkvm/kvm_udf.c b/lib/libkvm/kvm_udf.c
index 0ebea8916dd..c891fb937ed 100644
--- a/lib/libkvm/kvm_udf.c
+++ b/lib/libkvm/kvm_udf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kvm_udf.c,v 1.1 2009/06/20 19:50:05 millert Exp $ */
+/* $OpenBSD: kvm_udf.c,v 1.2 2009/06/20 20:20:43 millert Exp $ */
/*
* Copyright (c) 2001, 2002 Scott Long <scottl@freebsd.org>
@@ -27,7 +27,7 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: kvm_udf.c,v 1.1 2009/06/20 19:50:05 millert Exp $";
+static char *rcsid = "$OpenBSD: kvm_udf.c,v 1.2 2009/06/20 20:20:43 millert Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/param.h>
@@ -51,9 +51,6 @@ static char *rcsid = "$OpenBSD: kvm_udf.c,v 1.1 2009/06/20 19:50:05 millert Exp
#include "kvm_private.h"
-#define KREAD(kd, addr, obj) \
- (kvm_read(kd, addr, obj, sizeof(*obj)) != sizeof(*obj))
-
/* Convert file entry permission (5 bits per owner/group/user) to a mode_t */
static mode_t
udf_permtomode(struct unode *up)
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-18 16:40:09 +0000