[SCM] Samba Shared Repository - branch master updated
Günther Deschner
gd at samba.org
Wed May 4 04:32:03 MDT 2011
The branch, master has been updated
via b8eaec6 s3-vfs: make vfswrap_llistxattr and vfswrap_flistxattr static.
from 7febcb5 s3: Filter out duplicates in name_query()
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit b8eaec6b666b1f0d3711540c492edd79cd02b1fe
Author: Günther Deschner <gd at samba.org>
Date: Tue May 3 21:42:04 2011 +0200
s3-vfs: make vfswrap_llistxattr and vfswrap_flistxattr static.
Guenther
Autobuild-User: Günther Deschner <gd at samba.org>
Autobuild-Date: Wed May 4 12:31:10 CEST 2011 on sn-devel-104
-----------------------------------------------------------------------
Summary of changes:
source3/include/proto.h | 6 ------
source3/modules/vfs_default.c | 4 ++--
2 files changed, 2 insertions(+), 8 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/include/proto.h b/source3/include/proto.h
index bb2c64b..dfe44a1 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -2093,12 +2093,6 @@ bool enumerate_domain_trusts( TALLOC_CTX *mem_ctx, const char *domain,
struct dom_sid **sids );
NTSTATUS change_trust_account_password( const char *domain, const char *remote_machine);
-/* The following definitions come from modules/vfs_default.c */
-
-ssize_t vfswrap_llistxattr(struct vfs_handle_struct *handle, const char *path, char *list, size_t size);
-ssize_t vfswrap_flistxattr(struct vfs_handle_struct *handle, struct files_struct *fsp, char *list, size_t size);
-NTSTATUS vfs_default_init(void);
-
/* The following definitions come from param/loadparm.c */
char *lp_smb_ports(void);
diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c
index cf6e24f..5d6b512 100644
--- a/source3/modules/vfs_default.c
+++ b/source3/modules/vfs_default.c
@@ -1512,12 +1512,12 @@ static ssize_t vfswrap_listxattr(struct vfs_handle_struct *handle, const char *p
return sys_listxattr(path, list, size);
}
-ssize_t vfswrap_llistxattr(struct vfs_handle_struct *handle, const char *path, char *list, size_t size)
+static ssize_t vfswrap_llistxattr(struct vfs_handle_struct *handle, const char *path, char *list, size_t size)
{
return sys_llistxattr(path, list, size);
}
-ssize_t vfswrap_flistxattr(struct vfs_handle_struct *handle, struct files_struct *fsp, char *list, size_t size)
+static ssize_t vfswrap_flistxattr(struct vfs_handle_struct *handle, struct files_struct *fsp, char *list, size_t size)
{
return sys_flistxattr(fsp->fh->fd, list, size);
}
--
Samba Shared Repository
More information about the samba-cvs
mailing list