summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Valchev <pvalchev@cvs.openbsd.org>2001-08-13 06:32:19 +0000
committerPeter Valchev <pvalchev@cvs.openbsd.org>2001-08-13 06:32:19 +0000
commit80dd80170dd11e7144c1689ea9f17c6a0e1a40e9 (patch)
tree9c2e549ed970e569739d87da621af95347d0b078
parent92d706c9e92818edf3e8a53d7f248d3ff3030889 (diff)
Wall cleanup
-rw-r--r--usr.sbin/wsmoused/mouse_protocols.c18
-rw-r--r--usr.sbin/wsmoused/wsmoused.c5
2 files changed, 3 insertions, 20 deletions
diff --git a/usr.sbin/wsmoused/mouse_protocols.c b/usr.sbin/wsmoused/mouse_protocols.c
index 7247b13e929..027a1cc4314 100644
--- a/usr.sbin/wsmoused/mouse_protocols.c
+++ b/usr.sbin/wsmoused/mouse_protocols.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mouse_protocols.c,v 1.2 2001/08/12 17:53:16 fgsch Exp $ */
+/* $OpenBSD: mouse_protocols.c,v 1.3 2001/08/13 06:32:18 pvalchev Exp $ */
/*
* Copyright (c) 2001 Jean-Baptiste Marchand, Julien Montagne and Jerome Verdon
@@ -164,18 +164,6 @@ static symtab_t pnpprod[] = {
{ NULL, -1 },
};
-static char *
-gettokenname(symtab_t *tab, int val)
-{
- int i;
-
- for (i = 0; tab[i].name != NULL; ++i) {
- if (tab[i].val == val)
- return tab[i].name;
- }
- return NULL;
-}
-
static symtab_t *
gettoken(symtab_t *tab, char *s, int len)
{
@@ -339,7 +327,6 @@ FlushInput(int fd)
static int
pnpgets(int mouse_fd, char *buf)
{
- struct timeval timeout;
struct pollfd pfd[1];
int i;
char c;
@@ -906,9 +893,6 @@ mouse_protocol(u_char rBuf, mousestatus_t *act)
};
static int pBufP = 0;
static unsigned char pBuf[8];
- static int prev_x, prev_y;
- static int on = FALSE;
- int x, y;
debug("received char 0x%x",(int)rBuf);
diff --git a/usr.sbin/wsmoused/wsmoused.c b/usr.sbin/wsmoused/wsmoused.c
index bbe4f6e3406..90d24ad459e 100644
--- a/usr.sbin/wsmoused/wsmoused.c
+++ b/usr.sbin/wsmoused/wsmoused.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wsmoused.c,v 1.2 2001/08/12 17:53:16 fgsch Exp $ */
+/* $OpenBSD: wsmoused.c,v 1.3 2001/08/13 06:32:18 pvalchev Exp $ */
/*
* Copyright (c) 2001 Jean-Baptiste Marchand, Julien Montagne and Jerome Verdon
@@ -83,7 +83,6 @@ int nodaemon = FALSE;
int background = FALSE;
int identify = FALSE;
char *pidfile = "/var/run/wsmoused.pid";
-static sigjmp_buf env;
mouse_t mouse = {
flags : 0,
@@ -567,7 +566,7 @@ main(int argc, char **argv)
wsmouse_identify();
else
printf("serial mouse: %s type\n",
- mouse_name(mouse.proto));
+ (char *)mouse_name(mouse.proto));
return (0);
}