[SCM] Samba Shared Repository - branch master updated - 1d83fbffae23325961fd80873c93c06cae5f7a4e

[Volker Lendecke]

The branch, master has been updated
       via  1d83fbffae23325961fd80873c93c06cae5f7a4e (commit)
       via  96a5d169dd3a8746270a9e086717ab6206ab02c6 (commit)
      from  4c68f3cd9b77414802bef08631ddb66325bfff4c (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 1d83fbffae23325961fd80873c93c06cae5f7a4e
Author: Volker Lendecke <vl at samba.org>
Date:   Wed Oct 8 17:42:22 2008 +0200

    Remove a pointless level of indirection

commit 96a5d169dd3a8746270a9e086717ab6206ab02c6
Author: Volker Lendecke <vl at samba.org>
Date:   Wed Oct 8 17:24:24 2008 +0200

    Fix a typo

-----------------------------------------------------------------------

Summary of changes:
 source3/include/proto.h  |    1 -
 source3/smbd/fake_file.c |    8 --------
 source3/smbd/files.c     |    4 +---
 source3/smbd/ipc.c       |    2 +-
 4 files changed, 2 insertions(+), 13 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/include/proto.h b/source3/include/proto.h
index b7e3632..99557a2 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -9558,7 +9558,6 @@ NTSTATUS open_fake_file(connection_struct *conn,
 				const char *fname,
 				uint32 access_mask,
 				files_struct **result);
-void destroy_fake_file_handle(struct fake_file_handle **fh);
 NTSTATUS close_fake_file(files_struct *fsp);
 
 /* The following definitions come from smbd/file_access.c  */
diff --git a/source3/smbd/fake_file.c b/source3/smbd/fake_file.c
index 8dd9abe..1761cb6 100644
--- a/source3/smbd/fake_file.c
+++ b/source3/smbd/fake_file.c
@@ -146,14 +146,6 @@ NTSTATUS open_fake_file(connection_struct *conn,
 	return NT_STATUS_OK;
 }
 
-void destroy_fake_file_handle(struct fake_file_handle **fh)
-{
-	if (!fh) {
-		return;
-	}
-	TALLOC_FREE(*fh);
-}
-
 NTSTATUS close_fake_file(files_struct *fsp)
 {
 	file_free(fsp);
diff --git a/source3/smbd/files.c b/source3/smbd/files.c
index 8d06e20..519f494 100644
--- a/source3/smbd/files.c
+++ b/source3/smbd/files.c
@@ -400,9 +400,7 @@ void file_free(files_struct *fsp)
 
 	string_free(&fsp->fsp_name);
 
-	if (fsp->fake_file_handle) {
-		destroy_fake_file_handle(&fsp->fake_file_handle);
-	}
+	TALLOC_FREE(fsp->fake_file_handle);
 
 	if (fsp->fh->ref_count == 1) {
 		SAFE_FREE(fsp->fh);
diff --git a/source3/smbd/ipc.c b/source3/smbd/ipc.c
index f4c4599..0f2caad 100644
--- a/source3/smbd/ipc.c
+++ b/source3/smbd/ipc.c
@@ -318,7 +318,7 @@ static void api_fd_reply(connection_struct *conn, uint16 vuid,
 	/* Get the file handle and hence the file name. */
 	/* 
 	 * NB. The setup array has already been transformed
-	 * via SVAL and so is in gost byte order.
+	 * via SVAL and so is in host byte order.
 	 */
 	pnum = ((int)setup[1]) & 0xFFFF;
 	subcommand = ((int)setup[0]) & 0xFFFF;


-- 
Samba Shared Repository