diff options
| author | Robert Watson <rwatson@FreeBSD.org> | 2001-03-19 05:44:15 +0000 |
|---|---|---|
| committer | Robert Watson <rwatson@FreeBSD.org> | 2001-03-19 05:44:15 +0000 |
| commit | 3063207147ec11ca538dd8313af5447b965669ef (patch) | |
| tree | ad6842c6374db2386729bc3b42e03e279f9687e9 /sys/sys | |
| parent | d51048c93b51a6811343d87d9db9c771a4496347 (diff) | |
| download | src-3063207147ec11ca538dd8313af5447b965669ef.tar.gz src-3063207147ec11ca538dd8313af5447b965669ef.zip | |
o Rename "namespace" argument to "attrnamespace" as namespace is a C++
reserved word.
Submitted by: jkh
Obtained from: TrustedBSD Project
Notes
Notes:
svn path=/head/; revision=74437
Diffstat (limited to 'sys/sys')
| -rw-r--r-- | sys/sys/extattr.h | 8 | ||||
| -rw-r--r-- | sys/sys/mount.h | 4 | ||||
| -rw-r--r-- | sys/sys/vnode.h | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/sys/sys/extattr.h b/sys/sys/extattr.h index 4b545dafd74e..dbde54082539 100644 --- a/sys/sys/extattr.h +++ b/sys/sys/extattr.h @@ -58,12 +58,12 @@ struct iovec; __BEGIN_DECLS int extattrctl(const char *path, int cmd, const char *filename, - int namespace, const char *attrname); -int extattr_delete_file(const char *path, int namespace, + int attrnamespace, const char *attrname); +int extattr_delete_file(const char *path, int attrnamespace, const char *attrname); -int extattr_get_file(const char *path, int namespace, +int extattr_get_file(const char *path, int attrnamespace, const char *attrname, struct iovec *iovp, unsigned iovcnt); -int extattr_set_file(const char *path, int namespace, +int extattr_set_file(const char *path, int attrnamespace, const char *attrname, struct iovec *iovp, unsigned iovcnt); __END_DECLS diff --git a/sys/sys/mount.h b/sys/sys/mount.h index 88585291858d..fdd5d44d1fb4 100644 --- a/sys/sys/mount.h +++ b/sys/sys/mount.h @@ -340,7 +340,7 @@ struct vfsops { int (*vfs_uninit) __P((struct vfsconf *)); int (*vfs_extattrctl) __P((struct mount *mp, int cmd, struct vnode *filename_vp, - int namespace, const char *attrname, + int attrnamespace, const char *attrname, struct proc *p)); }; @@ -455,7 +455,7 @@ int vfs_stdvptofh __P((struct vnode *vp, struct fid *fhp)); int vfs_stdinit __P((struct vfsconf *)); int vfs_stduninit __P((struct vfsconf *)); int vfs_stdextattrctl __P((struct mount *mp, int cmd, - struct vnode *filename_vp, int namespace, const char *attrname, + struct vnode *filename_vp, int attrnamespace, const char *attrname, struct proc *p)); /* XXX - these should be indirect functions!!! */ diff --git a/sys/sys/vnode.h b/sys/sys/vnode.h index 76093ae4e16f..dd33b8a995ff 100644 --- a/sys/sys/vnode.h +++ b/sys/sys/vnode.h @@ -607,11 +607,11 @@ dev_t vn_todev __P((struct vnode *vp)); int vn_write_suspend_wait __P((struct vnode *vp, struct mount *mp, int flags)); int vn_writechk __P((struct vnode *vp)); -int vn_extattr_get __P((struct vnode *vp, int ioflg, int namespace, +int vn_extattr_get __P((struct vnode *vp, int ioflg, int attrnamespace, const char *attrname, int *buflen, char *buf, struct proc *p)); -int vn_extattr_set __P((struct vnode *vp, int ioflg, int namespace, +int vn_extattr_set __P((struct vnode *vp, int ioflg, int attrnamespace, const char *attrname, int buflen, char *buf, struct proc *p)); -int vn_extattr_rm(struct vnode *vp, int ioflg, int namespace, +int vn_extattr_rm(struct vnode *vp, int ioflg, int attrnamespace, const char *attrname, struct proc *p); int vfs_cache_lookup __P((struct vop_lookup_args *ap)); int vfs_object_create __P((struct vnode *vp, struct proc *p, |