Below the conversion from uiovmovei() to uiomove() for miscfs/fusefs/.
All size parameters already are size_t, so the diff is straightforward.
Index: miscfs/fuse/fuse_device.c
===================================================================
RCS file: /cvs/src/sys/miscfs/fuse/fuse_device.c,v
retrieving revision 1.19
diff -u -p -u -r1.19 fuse_device.c
--- miscfs/fuse/fuse_device.c 2 Sep 2015 04:07:11 -0000 1.19
+++ miscfs/fuse/fuse_device.c 9 Jan 2016 07:28:04 -0000
@@ -496,7 +496,7 @@ fusewrite(dev_t dev, struct uio *uio, in
}
/* 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;
Index: miscfs/fuse/fuse_vnops.c
===================================================================
RCS file: /cvs/src/sys/miscfs/fuse/fuse_vnops.c,v
retrieving revision 1.25
diff -u -p -u -r1.25 fuse_vnops.c
--- miscfs/fuse/fuse_vnops.c 23 Sep 2015 15:37:26 -0000 1.25
+++ miscfs/fuse/fuse_vnops.c 9 Jan 2016 07:28:09 -0000
@@ -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, MIN(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;
}
cheers,
natano