summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorStefan Kempf <stefan@cvs.openbsd.org>2016-01-28 18:02:37 +0000
committerStefan Kempf <stefan@cvs.openbsd.org>2016-01-28 18:02:37 +0000
commit0638a573e3ca1265a97716124fd01955fc277018 (patch)
tree0087b6296df2bdf47e830b875489440311a445c0 /sys
parent548a2b4655a2174ca2ba5f15851a1f78e735aec6 (diff)
Convert to uiomove. Diff from Martin Natano.
Diffstat (limited to 'sys')
-rw-r--r--sys/kern/tty.c4
-rw-r--r--sys/kern/tty_pty.c10
2 files changed, 7 insertions, 7 deletions
diff --git a/sys/kern/tty.c b/sys/kern/tty.c
index 73211ac1bb3..92430eb22f1 100644
--- a/sys/kern/tty.c
+++ b/sys/kern/tty.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tty.c,v 1.128 2016/01/14 09:44:08 sf Exp $ */
+/* $OpenBSD: tty.c,v 1.129 2016/01/28 18:02:36 stefan Exp $ */
/* $NetBSD: tty.c,v 1.68.4.2 1996/06/06 16:04:52 thorpej Exp $ */
/*-
@@ -1782,7 +1782,7 @@ loop:
if (cc == 0) {
cc = MIN(uio->uio_resid, OBUFSIZ);
cp = obuf;
- error = uiomovei(cp, cc, uio);
+ error = uiomove(cp, cc, uio);
if (error) {
cc = 0;
break;
diff --git a/sys/kern/tty_pty.c b/sys/kern/tty_pty.c
index d94d91b1d15..578f273f3fe 100644
--- a/sys/kern/tty_pty.c
+++ b/sys/kern/tty_pty.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tty_pty.c,v 1.75 2016/01/14 09:44:08 sf Exp $ */
+/* $OpenBSD: tty_pty.c,v 1.76 2016/01/28 18:02:36 stefan Exp $ */
/* $NetBSD: tty_pty.c,v 1.33.4.1 1996/06/02 09:08:11 mrg Exp $ */
/*
@@ -461,7 +461,7 @@ ptcread(dev_t dev, struct uio *uio, int flag)
if (pti->pt_send & TIOCPKT_IOCTL) {
cc = MIN(uio->uio_resid,
sizeof(tp->t_termios));
- error = uiomovei(&tp->t_termios, cc, uio);
+ error = uiomove(&tp->t_termios, cc, uio);
if (error)
return (error);
}
@@ -496,7 +496,7 @@ ptcread(dev_t dev, struct uio *uio, int flag)
bufcc = cc;
if (cc <= 0)
break;
- error = uiomovei(buf, cc, uio);
+ error = uiomove(buf, cc, uio);
}
ttwakeupwr(tp);
if (bufcc)
@@ -529,7 +529,7 @@ again:
if (cc > bufcc)
bufcc = cc;
cp = buf;
- error = uiomovei(cp, cc, uio);
+ error = uiomove(cp, cc, uio);
if (error)
goto done;
/* check again for safety */
@@ -553,7 +553,7 @@ again:
if (cc > bufcc)
bufcc = cc;
cp = buf;
- error = uiomovei(cp, cc, uio);
+ error = uiomove(cp, cc, uio);
if (error)
goto done;
/* check again for safety */