[Libsysio-commit] HEAD: libsysio/include dev.h inode.h

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

Update of /cvsroot/libsysio/libsysio/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4518/include

Modified Files:
	dev.h inode.h 
Log Message:


Removed the internal getdirentries inode operation. The getdirentries
function does not return the *next* block in it's basep argument. It
simply return the cookie for the current block.

We needed one that returns the *next*, so a new interface called filldirentries
is present with this change. It takes, as it's second argument, a pointer
to a value/result pair. The value should be set to the position to be
read. The result is the position of the next block.

All the included drivers have been updated. External drivers will require
similar updates.




Index: dev.h
===================================================================
RCS file: /cvsroot/libsysio/libsysio/include/dev.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -w -b -B -p -r1.9 -r1.10
--- dev.h	26 Jul 2004 16:38:01 -0000	1.9
+++ dev.h	4 Aug 2005 20:17:10 -0000	1.10
@@ -80,11 +80,11 @@ extern const struct inode_ops _sysio_nod
 		 struct inode *, \
 		 unsigned , \
 		 struct intnl_stat *))_sysio_do_ebadf
-#define _sysio_nodev_getdirentries \
+#define _sysio_nodev_filldirentries \
 	(ssize_t (*)(struct inode *, \
+		     _SYSIO_OFF_T *, \
 		     char *, \
-		     size_t , \
-		     _SYSIO_OFF_T *))_sysio_do_illop
+		     size_t))_sysio_do_illop
 #define _sysio_nodev_inop_mkdir \
 	(int (*)(struct pnode *, \
 		 mode_t))_sysio_do_illop

Index: inode.h
===================================================================
RCS file: /cvsroot/libsysio/libsysio/include/inode.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -w -b -B -p -r1.24 -r1.25
--- inode.h	25 Feb 2005 00:01:06 -0000	1.24
+++ inode.h	4 Aug 2005 20:17:10 -0000	1.25
@@ -86,10 +86,10 @@ struct inode_ops {
                         struct inode *ino,
                         unsigned mask,
                         struct intnl_stat *stbuf);
-    ssize_t (*inop_getdirentries)(struct inode *ino,
+    ssize_t (*inop_filldirentries)(struct inode *ino,
+				   _SYSIO_OFF_T *posp,
 				  char *buf,
-				  size_t nbytes,
-				  _SYSIO_OFF_T *basep);
+				   size_t nbytes);
     int (*inop_mkdir)(struct pnode *pno, mode_t mode);
     int (*inop_rmdir)(struct pnode *pno);
     int (*inop_symlink)(struct pnode *pno, const char *data);