[Libsysio-commit] strided-io: libsysio/dev/stdfd stdfd.c

[Lee W. <lw...@us...>]

Update of /cvsroot/libsysio/libsysio/dev/stdfd
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4182/dev/stdfd

Modified Files:
      Tag: strided-io
	stdfd.c 
Log Message:


Gratuitous name change (sorry) from inop_ip{read,write}v to inop_{read,write}.


Index: stdfd.c
===================================================================
RCS file: /cvsroot/libsysio/libsysio/dev/stdfd/stdfd.c,v
retrieving revision 1.6.6.1
retrieving revision 1.6.6.2
diff -u -w -b -B -p -r1.6.6.1 -r1.6.6.2
--- stdfd.c	23 Jan 2004 15:18:38 -0000	1.6.6.1
+++ stdfd.c	26 Jan 2004 07:24:29 -0000	1.6.6.2
@@ -78,10 +78,8 @@
 
 static int stdfd_open(struct pnode *pno, int flags, mode_t mode);
 static int stdfd_close(struct inode *ino);
-static int stdfd_ipreadv(struct inode *ino,
-			 struct ioctx *ioctx);
-static int stdfd_ipwritev(struct inode *ino,
-			  struct ioctx *ioctx);
+static int stdfd_read(struct inode *ino, struct ioctx *ioctx);
+static int stdfd_write(struct inode *ino, struct ioctx *ioctx);
 static int stdfd_iodone(struct ioctx *ioctx);
 static int stdfd_datasync(struct inode *ino);
 static int stdfd_ioctl(struct inode *ino,
@@ -96,8 +94,8 @@ _sysio_stdfd_init()
 	stdfd_operations = _sysio_nodev_ops;
 	stdfd_operations.inop_open = stdfd_open;
 	stdfd_operations.inop_close = stdfd_close;
-	stdfd_operations.inop_ipreadv = stdfd_ipreadv;
-	stdfd_operations.inop_ipwritev = stdfd_ipwritev;
+	stdfd_operations.inop_read = stdfd_read;
+	stdfd_operations.inop_write = stdfd_write;
 	stdfd_operations.inop_iodone = stdfd_iodone;
 	stdfd_operations.inop_datasync = stdfd_datasync;
 	stdfd_operations.inop_ioctl = stdfd_ioctl;
@@ -149,7 +147,7 @@ doio(ssize_t (*f)(void *, size_t, _SYSIO
 }
 
 static ssize_t
-stdfd_read(void *buf,
+stdfd_read_simple(void *buf,
 	   size_t nbytes,
 	   _SYSIO_OFF_T off __IS_UNUSED,
 	   struct inode *ino)
@@ -161,15 +159,14 @@ stdfd_read(void *buf,
 }
 
 static int
-stdfd_ipreadv(struct inode *ino,
-	      struct ioctx *ioctx)
+stdfd_read(struct inode *ino, struct ioctx *ioctx)
 {
 
-	return doio(stdfd_read, ino, ioctx);
+	return doio(stdfd_read_simple, ino, ioctx);
 }
 
 static ssize_t
-stdfd_write(const void *buf,
+stdfd_write_simple(const void *buf,
 	    size_t nbytes,
 	    _SYSIO_OFF_T off __IS_UNUSED,
 	    struct inode *ino)
@@ -180,14 +177,13 @@ stdfd_write(const void *buf,
 }
 
 static int
-stdfd_ipwritev(struct inode *ino,
-	       struct ioctx *ioctx)
+stdfd_write(struct inode *ino, struct ioctx *ioctx)
 {
 
 	return doio((ssize_t (*)(void *,
 				 size_t,
 				 _SYSIO_OFF_T,
-				 struct inode *))stdfd_write,
+				 struct inode *))stdfd_write_simple,
 		    ino,
 		    ioctx);
 }