diff options
| author | Stefan Kempf <stefan@cvs.openbsd.org> | 2016-01-22 17:09:44 +0000 |
|---|---|---|
| committer | Stefan Kempf <stefan@cvs.openbsd.org> | 2016-01-22 17:09:44 +0000 |
| commit | 6e433ad02aeded0b41b5f43f6756a654340ea003 (patch) | |
| tree | a6c1ab45e1956fb8505034d10980ff55aaa44bf7 /sys | |
| parent | 4cb09e6212b04e3de7c4fb2c3fde5122a9fce304 (diff) | |
Straightforward uiomovei -> uiomove conversion. All size arguments for
uiomove had unsigned types already.
Diff from Martin Natano.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/miscfs/fuse/fuse_device.c | 4 | ||||
| -rw-r--r-- | sys/miscfs/fuse/fuse_vnops.c | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/sys/miscfs/fuse/fuse_device.c b/sys/miscfs/fuse/fuse_device.c index 255c9a32bb2..520736a6a0e 100644 --- a/sys/miscfs/fuse/fuse_device.c +++ b/sys/miscfs/fuse/fuse_device.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fuse_device.c,v 1.19 2015/09/02 04:07:11 deraadt Exp $ */ +/* $OpenBSD: fuse_device.c,v 1.20 2016/01/22 17:09:43 stefan Exp $ */ /* * Copyright (c) 2012-2013 Sylvestre Gallon <ccna.syl@gmail.com> * @@ -496,7 +496,7 @@ fusewrite(dev_t dev, struct uio *uio, int ioflag) } /* Get the missing datas from the fbuf */ - error = uiomovei(&fbuf->FD, uio->uio_resid, uio); + error = uiomove(&fbuf->FD, uio->uio_resid, uio); if (error) return error; fbuf->fb_dat = NULL; diff --git a/sys/miscfs/fuse/fuse_vnops.c b/sys/miscfs/fuse/fuse_vnops.c index c9a15b4cef8..bea1126849a 100644 --- a/sys/miscfs/fuse/fuse_vnops.c +++ b/sys/miscfs/fuse/fuse_vnops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fuse_vnops.c,v 1.25 2015/09/23 15:37:26 tedu Exp $ */ +/* $OpenBSD: fuse_vnops.c,v 1.26 2016/01/22 17:09:43 stefan Exp $ */ /* * Copyright (c) 2012-2013 Sylvestre Gallon <ccna.syl@gmail.com> * @@ -728,7 +728,7 @@ fusefs_readdir(void *v) break; } - if ((error = uiomovei(fbuf->fb_dat, fbuf->fb_len, uio))) { + if ((error = uiomove(fbuf->fb_dat, fbuf->fb_len, uio))) { fb_delete(fbuf); break; } @@ -810,7 +810,7 @@ fusefs_readlink(void *v) return (error); } - error = uiomovei(fbuf->fb_dat, fbuf->fb_len, uio); + error = uiomove(fbuf->fb_dat, fbuf->fb_len, uio); fb_delete(fbuf); return (error); @@ -1058,7 +1058,7 @@ fusefs_read(void *v) if (error) break; - error = uiomovei(fbuf->fb_dat, MIN(size, fbuf->fb_len), uio); + error = uiomove(fbuf->fb_dat, ulmin(size, fbuf->fb_len), uio); if (error) break; @@ -1112,7 +1112,7 @@ fusefs_write(void *v) fbuf->fb_io_off = uio->uio_offset; fbuf->fb_io_len = len; - if ((error = uiomovei(fbuf->fb_dat, len, uio))) { + if ((error = uiomove(fbuf->fb_dat, len, uio))) { printf("fusefs: uio error %i\n", error); break; } |