diff options
| -rw-r--r-- | sbin/wsconsctl/keysym.c | 4 | ||||
| -rw-r--r-- | sbin/wsconsctl/mouse.c | 12 | ||||
| -rw-r--r-- | sbin/wsconsctl/util.c | 4 | ||||
| -rw-r--r-- | sbin/wsconsctl/wsconsctl.c | 6 |
4 files changed, 13 insertions, 13 deletions
diff --git a/sbin/wsconsctl/keysym.c b/sbin/wsconsctl/keysym.c index 10bb5d56a45..c5e93c4137e 100644 --- a/sbin/wsconsctl/keysym.c +++ b/sbin/wsconsctl/keysym.c @@ -1,4 +1,4 @@ -/* $OpenBSD: keysym.c,v 1.6 2010/06/28 20:40:39 maja Exp $ */ +/* $OpenBSD: keysym.c,v 1.7 2012/07/14 08:25:12 shadchin Exp $ */ /* $NetBSD: keysym.c,v 1.3 1999/02/08 11:08:23 hannken Exp $ */ /*- @@ -160,7 +160,7 @@ ksym2name(int k) if (first_time) sort_ksym_tab(); - + r = bsearch(&k, ksym_tab_by_ksym, NUMKSYMS, sizeof(struct ksym), bcmp_ksym_enc); diff --git a/sbin/wsconsctl/mouse.c b/sbin/wsconsctl/mouse.c index e9dd90fe03f..650b8abafaa 100644 --- a/sbin/wsconsctl/mouse.c +++ b/sbin/wsconsctl/mouse.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mouse.c,v 1.11 2010/08/20 00:20:55 fgsch Exp $ */ +/* $OpenBSD: mouse.c,v 1.12 2012/07/14 08:25:12 shadchin Exp $ */ /* $NetBSD: mouse.c,v 1.3 1999/11/15 13:47:30 ad Exp $ */ /*- @@ -44,7 +44,7 @@ static int resolution; static int samplerate; static int rawmode; -struct wsmouse_calibcoords wmcoords, wmcoords_save; +struct wsmouse_calibcoords wmcoords, wmcoords_save; struct field mouse_field_tab[] = { { "resolution", &resolution, FMT_UINT, FLG_WRONLY }, @@ -61,8 +61,8 @@ mouse_get_values(int fd) if (field_by_value(mouse_field_tab, &mstype)->flags & FLG_GET) if (ioctl(fd, WSMOUSEIO_GTYPE, &mstype) < 0) warn("WSMOUSEIO_GTYPE"); - - if (field_by_value(mouse_field_tab, &rawmode)->flags & FLG_GET) { + + if (field_by_value(mouse_field_tab, &rawmode)->flags & FLG_GET) { if (ioctl(fd, WSMOUSEIO_GCALIBCOORDS, &wmcoords) < 0) { if (errno == ENOTTY) field_by_value(mouse_field_tab, @@ -80,7 +80,7 @@ mouse_get_values(int fd) &wmcoords)->flags |= FLG_DEAD; else warn("WSMOUSEIO_GCALIBCOORDS"); - } + } } int @@ -98,7 +98,7 @@ mouse_put_values(int fd) return 1; } } - if (field_by_value(mouse_field_tab, &rawmode)->flags & FLG_SET) { + if (field_by_value(mouse_field_tab, &rawmode)->flags & FLG_SET) { wmcoords.samplelen = rawmode; if (ioctl(fd, WSMOUSEIO_SCALIBCOORDS, &wmcoords) < 0) { if (errno == ENOTTY) { diff --git a/sbin/wsconsctl/util.c b/sbin/wsconsctl/util.c index 45040366da9..b0824aa2acd 100644 --- a/sbin/wsconsctl/util.c +++ b/sbin/wsconsctl/util.c @@ -1,4 +1,4 @@ -/* $OpenBSD: util.c,v 1.57 2012/04/17 14:53:47 deraadt Exp $ */ +/* $OpenBSD: util.c,v 1.58 2012/07/14 08:25:12 shadchin Exp $ */ /* $NetBSD: util.c,v 1.8 2000/03/14 08:11:53 sato Exp $ */ /*- @@ -45,7 +45,7 @@ extern struct wskbd_map_data kbmap; /* from keyboard.c */ extern struct wskbd_map_data newkbmap; /* from map_parse.y */ -extern struct wsmouse_calibcoords wmcoords; /* from mouse.c */ +extern struct wsmouse_calibcoords wmcoords; /* from mouse.c */ struct nameint { int value; diff --git a/sbin/wsconsctl/wsconsctl.c b/sbin/wsconsctl/wsconsctl.c index 3141d8d208d..bdffbc2f567 100644 --- a/sbin/wsconsctl/wsconsctl.c +++ b/sbin/wsconsctl/wsconsctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wsconsctl.c,v 1.26 2010/08/20 00:20:55 fgsch Exp $ */ +/* $OpenBSD: wsconsctl.c,v 1.27 2012/07/14 08:25:12 shadchin Exp $ */ /* $NetBSD: wsconsctl.c,v 1.2 1998/12/29 22:40:20 hannken Exp $ */ /*- @@ -125,7 +125,7 @@ main(int argc, char *argv[]) if (!device || errno != ENXIO) { if (device && errno != ENOENT) { warn("%s", device); - error = 1; + error = 1; } break; } else @@ -319,7 +319,7 @@ tab_by_name(const char *var, int *idx) } } else i = 0; - + *idx = i; return (sw); |