summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2009-09-05 15:37:05 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2009-09-05 15:37:05 +0000
commit02994e924bf637f5b2a2c6b0bc04f99be6730af3 (patch)
tree7eb2accffbf18e5ed0d8c0611aa542dcf2f5157d
parentec17529a5bd62e044b53345c38f067d1451d619b (diff)
fix typos
-rw-r--r--sys/arch/sparc/dev/xd.c4
-rw-r--r--sys/arch/sparc/dev/xy.c4
-rw-r--r--sys/arch/vax/vsa/hdc9224.c14
3 files changed, 11 insertions, 11 deletions
diff --git a/sys/arch/sparc/dev/xd.c b/sys/arch/sparc/dev/xd.c
index 7e9d908001f..78c20da2b54 100644
--- a/sys/arch/sparc/dev/xd.c
+++ b/sys/arch/sparc/dev/xd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: xd.c,v 1.46 2009/09/05 00:48:39 krw Exp $ */
+/* $OpenBSD: xd.c,v 1.47 2009/09/05 15:37:04 deraadt Exp $ */
/* $NetBSD: xd.c,v 1.37 1997/07/29 09:58:16 fair Exp $ */
/*
@@ -873,7 +873,7 @@ xdioctl(dev, command, addr, flag, p)
if (xd->state == XD_DRIVE_NOLABEL)
xd->state = XD_DRIVE_ONLINE;
- if (cmd == DIOCWDINFO) {
+ if (command == DIOCWDINFO) {
/*
* Simulate opening partition 0 so write
* succeeds.
diff --git a/sys/arch/sparc/dev/xy.c b/sys/arch/sparc/dev/xy.c
index 41afe3b6b84..754597b47d6 100644
--- a/sys/arch/sparc/dev/xy.c
+++ b/sys/arch/sparc/dev/xy.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: xy.c,v 1.43 2009/09/05 00:48:39 krw Exp $ */
+/* $OpenBSD: xy.c,v 1.44 2009/09/05 15:37:04 deraadt Exp $ */
/* $NetBSD: xy.c,v 1.26 1997/07/19 21:43:56 pk Exp $ */
/*
@@ -834,7 +834,7 @@ xyioctl(dev, command, addr, flag, p)
if (xy->state == XY_DRIVE_NOLABEL)
xy->state = XY_DRIVE_ONLINE;
- if (cmd == DIOCWDINFO) {
+ if (command == DIOCWDINFO) {
/*
* Simulate opening partition 0 so write
* succeeds.
diff --git a/sys/arch/vax/vsa/hdc9224.c b/sys/arch/vax/vsa/hdc9224.c
index 126cf8700a6..be06500f518 100644
--- a/sys/arch/vax/vsa/hdc9224.c
+++ b/sys/arch/vax/vsa/hdc9224.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hdc9224.c,v 1.25 2009/09/05 00:48:39 krw Exp $ */
+/* $OpenBSD: hdc9224.c,v 1.26 2009/09/05 15:37:04 deraadt Exp $ */
/* $NetBSD: hdc9224.c,v 1.16 2001/07/26 15:05:09 wiz Exp $ */
/*
* Copyright (c) 1996 Ludd, University of Lule}, Sweden.
@@ -698,7 +698,7 @@ hdioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct proc *p)
{
struct hdsoftc *hd = hd_cd.cd_devs[DISKUNIT(dev)];
struct disklabel *lp = hd->sc_disk.dk_label;
- int err = 0;
+ int error = 0;
switch (cmd) {
case DIOCGDINFO:
@@ -715,23 +715,23 @@ hdioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct proc *p)
case DIOCSDINFO:
if ((flag & FWRITE) == 0)
return EBADF;
- error = setdisklabel(lp, (struct disklabel *)addr, 0) :
+ error = setdisklabel(lp, (struct disklabel *)addr, 0);
if (error == 0) {
if (cmd == DIOCWDINFO)
- error = writedisklabel(dev, hdstrategy, lp));
+ error = writedisklabel(dev, hdstrategy, lp);
}
break;
case DIOCWLABEL:
if ((flag & FWRITE) == 0)
- err = EBADF;
+ error = EBADF;
break;
default:
- err = ENOTTY;
+ error = ENOTTY;
break;
}
- return err;
+ return error;
}
/*