Remove four members of struct nameidata which have been commented

out since rev 1.1 (24 may 1994) of this file.

Add a nail to the K&R coffin by removing the #ifdef'ed K&R function
declaration for NDINIT.

1 files changed, 0 insertions, 13 deletions

diff --git a/sys/sys/namei.h b/sys/sys/namei.h
index 739b1ec..ae21e0d 100644
--- a/sys/sys/namei.h
+++ b/sys/sys/namei.h
@@ -66,13 +66,9 @@ struct nameidata {
 	 */
 	const	char *ni_dirp;		/* pathname pointer */
 	enum	uio_seg ni_segflg;	/* location of pathname */
-     /* u_long	ni_nameiop;		   namei operation */
-     /* u_long	ni_flags;		   flags to namei */
-     /* struct	proc *ni_proc;		   process requesting lookup */
 	/*
 	 * Arguments to lookup.
 	 */
-     /* struct	ucred *ni_cred;		   credentials */
 	struct	vnode *ni_startdir;	/* starting directory */
 	struct	vnode *ni_rootdir;	/* logical root directory */
 	struct	vnode *ni_topdir;	/* logical top directory */
@@ -153,20 +149,11 @@ struct nameidata {
 static void NDINIT(struct nameidata *, u_long, u_long, enum uio_seg,
 	    const char *, struct thread *);
 static __inline void
-#if defined(__STDC__) || defined(__cplusplus)
 NDINIT(struct nameidata *ndp,
 	u_long op, u_long flags,
 	enum uio_seg segflg,
 	const char *namep,
 	struct thread *td)
-#else
-NDINIT(ndp, op, flags, segflg, namep, td)
-	struct nameidata *ndp;
-	u_long op, flags;
-	enum uio_seg segflg;
-	const char *namep;
-	struct thread *td;
-#endif
 {
 	ndp->ni_cnd.cn_nameiop = op;
 	ndp->ni_cnd.cn_flags = flags;