diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2016-09-27 22:03:50 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2016-09-27 22:03:50 +0000 |
| commit | b3381929d582ecb028e6cc49d6cc963a8bfe507e (patch) | |
| tree | 762923fbd0ff40e8f60e83d895382c62e67b72f8 | |
| parent | 36d814d2556a8af6f7079c5a2d3e637bbee1b8e8 (diff) | |
remove more kvm code
| -rw-r--r-- | distrib/special/kbd/Makefile | 3 | ||||
| -rw-r--r-- | sbin/kbd/kbd_wscons.c | 11 |
2 files changed, 5 insertions, 9 deletions
diff --git a/distrib/special/kbd/Makefile b/distrib/special/kbd/Makefile index 59eb2d8068c..626ba99bb35 100644 --- a/distrib/special/kbd/Makefile +++ b/distrib/special/kbd/Makefile @@ -1,9 +1,8 @@ -# $OpenBSD: Makefile,v 1.19 2015/12/01 07:50:07 deraadt Exp $ +# $OpenBSD: Makefile,v 1.20 2016/09/27 22:03:49 deraadt Exp $ PROG= kbd SRCS= main.c kbd_wscons.c -CFLAGS+=-DNOKVM .PATH: ${.CURDIR}/../../../sbin/kbd .include <bsd.prog.mk> diff --git a/sbin/kbd/kbd_wscons.c b/sbin/kbd/kbd_wscons.c index 3d0bb7da0ef..41130a8ce65 100644 --- a/sbin/kbd/kbd_wscons.c +++ b/sbin/kbd/kbd_wscons.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kbd_wscons.c,v 1.29 2016/09/26 21:19:02 kettenis Exp $ */ +/* $OpenBSD: kbd_wscons.c,v 1.30 2016/09/27 22:03:49 deraadt Exp $ */ /* * Copyright (c) 2001 Mats O Jansson. All rights reserved. @@ -31,10 +31,8 @@ #include <err.h> #include <errno.h> -#include <kvm.h> #include <fcntl.h> #include <limits.h> -#include <nlist.h> #include <stdio.h> #include <string.h> #include <unistd.h> @@ -84,12 +82,12 @@ struct nameint kbdvar_tab[] = { extern char *__progname; -void kbd_show_enc(kvm_t *kd, int idx); +void kbd_show_enc(int idx); void kbd_list(void); void kbd_set(char *name, int verbose); void -kbd_show_enc(kvm_t *kd, int idx) +kbd_show_enc(int idx) { int i; @@ -107,7 +105,6 @@ kbd_list(void) int kbds[SA_MAX]; int fd, i, kbtype; char device[PATH_MAX]; - kvm_t *kd = NULL; bzero(kbds, sizeof(kbds)); @@ -157,7 +154,7 @@ kbd_list(void) for (i = 0; i < SA_MAX; i++) if (kbds[i] != 0) - kbd_show_enc(kd, i); + kbd_show_enc(i); } void |