From 406450d44e9c7a31b9db9cdb16c0b404f133d006 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Mon, 15 Apr 2013 11:56:59 +0200 Subject: [PATCH] smbd: Remove NTSTATUS based create_synthetic_smb_fname Signed-off-by: Volker Lendecke Reviewed-by: Jeremy Allison Autobuild-User(master): Jeremy Allison Autobuild-Date(master): Thu Apr 18 02:52:40 CEST 2013 on sn-devel-104 --- source3/include/proto.h | 8 -------- source3/lib/filename_util.c | 25 ------------------------- 2 files changed, 33 deletions(-) diff --git a/source3/include/proto.h b/source3/include/proto.h index f481e9977de..83ab77a2a9d 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -1597,14 +1597,6 @@ bool lookup_unix_group_name(const char *name, struct dom_sid *sid); NTSTATUS get_full_smb_filename(TALLOC_CTX *ctx, const struct smb_filename *smb_fname, char **full_name); -NTSTATUS create_synthetic_smb_fname(TALLOC_CTX *ctx, const char *base_name, - const char *stream_name, - const SMB_STRUCT_STAT *psbuf, - struct smb_filename **smb_fname_out); -NTSTATUS create_synthetic_smb_fname_split(TALLOC_CTX *ctx, - const char *fname, - const SMB_STRUCT_STAT *psbuf, - struct smb_filename **smb_fname_out); struct smb_filename *synthetic_smb_fname(TALLOC_CTX *mem_ctx, const char *base_name, const char *stream_name, diff --git a/source3/lib/filename_util.c b/source3/lib/filename_util.c index 51b2d1d9306..656dd2abcee 100644 --- a/source3/lib/filename_util.c +++ b/source3/lib/filename_util.c @@ -50,19 +50,6 @@ NTSTATUS get_full_smb_filename(TALLOC_CTX *ctx, * enumerate streams using the vfs_streaminfo interface and then want to * operate on each stream. */ -NTSTATUS create_synthetic_smb_fname(TALLOC_CTX *ctx, const char *base_name, - const char *stream_name, - const SMB_STRUCT_STAT *psbuf, - struct smb_filename **smb_fname_out) -{ - *smb_fname_out = synthetic_smb_fname(ctx, base_name, stream_name, - psbuf); - if (*smb_fname_out == NULL) { - return NT_STATUS_NO_MEMORY; - } - return NT_STATUS_OK; -} - struct smb_filename *synthetic_smb_fname(TALLOC_CTX *mem_ctx, const char *base_name, const char *stream_name, @@ -86,18 +73,6 @@ struct smb_filename *synthetic_smb_fname(TALLOC_CTX *mem_ctx, * XXX: This is temporary and there should be no callers of this once * smb_filename is plumbed through all path based operations. */ -NTSTATUS create_synthetic_smb_fname_split(TALLOC_CTX *ctx, - const char *fname, - const SMB_STRUCT_STAT *psbuf, - struct smb_filename **smb_fname_out) -{ - *smb_fname_out = synthetic_smb_fname_split(ctx, fname, psbuf); - if (*smb_fname_out == NULL) { - return NT_STATUS_NO_MEMORY; - } - return NT_STATUS_OK; -} - struct smb_filename *synthetic_smb_fname_split(TALLOC_CTX *ctx, const char *fname, const SMB_STRUCT_STAT *psbuf) -- 2.34.1