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

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

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

Modified Files:
      Tag: unification
	inode.h 
Log Message:


Added prototypes for _sysio_p_unlink, _sysio_p_rmdir, and _sysio_p_rename.

Changed the name of _sysio_setattr to _sysio_p_setattr for consistency.

Some syntactic prettiness changes


Index: inode.h
===================================================================
RCS file: /cvsroot/libsysio/libsysio/include/inode.h,v
retrieving revision 1.27.2.3
retrieving revision 1.27.2.4
diff -u -w -b -B -p -r1.27.2.3 -r1.27.2.4
--- inode.h	10 Apr 2007 21:25:30 -0000	1.27.2.3
+++ inode.h	11 Apr 2007 20:46:32 -0000	1.27.2.4
@@ -36,7 +36,7 @@
  * Lee Ward
  * Sandia National Laboratories, New Mexico
  * P.O. Box 5800
- * Albuquerque, NM 87185-1110
+ * Albuquerque, NM 87185-1319
  *
  * le...@sa...
  */
@@ -286,10 +286,9 @@ struct pnode {
 #define PNOP_FUNC(_pno, _fbase) \
 	((_pno)->p_base->pb_ino->i_ops.inop_##_fbase)
 #define _PNOP_MKCALL(_pno, _fbase, ...) \
-	((_pno)->p_base->pb_ino ? \
-	   PNOP_CALL(PNOP_FUNC(_pno, _fbase), __VA_ARGS__) : \
-	  -ESTALE)
-
+	((_pno)->p_base->pb_ino \
+	   ? PNOP_CALL(PNOP_FUNC(_pno, _fbase), __VA_ARGS__) \
+	   : -ESTALE)
 /*
  * Operations
  */
@@ -532,13 +531,18 @@ extern struct pnode *_sysio_p_new_alias(
                                         struct pnode_base *pb,
                                         struct mount *mnt);
 extern void _sysio_p_gone(struct pnode *pno);
-extern void _sysio_pb_disconnect(struct pnode_base *pb);
 extern size_t _sysio_p_prune(struct pnode *root);
 extern int _sysio_p_kill_all(struct pnode *root);
+extern int _sysio_pb_pathof(struct pnode_base *pb,
+			    char separator,
+			    char **pathp);
 extern char *_sysio_pb_path(struct pnode_base *pb, char separator);
-extern int _sysio_setattr(struct pnode *pno,
+extern int _sysio_p_setattr(struct pnode *pno,
 			  unsigned mask,
 			  struct intnl_stat *stbuf);
+extern int _sysio_p_unlink(struct pnode *pno);
+extern int _sysio_p_rmdir(struct pnode *pno);
+extern int _sysio_p_rename(struct pnode *old, struct pnode *new);
 extern void _sysio_do_noop(void);
 extern void _sysio_do_illop(void);
 extern int _sysio_do_ebadf(void);