[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  b90eb7d... s3: Remove some leftovers from macros
      from  3f7e222... s3: Remove the pointless PRINTERNAME macro

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


- Log -----------------------------------------------------------------
commit b90eb7dd6920dccd7a814ce77eec886e3a6ca8f0
Author: Volker Lendecke <vl at samba.org>
Date:   Sun Jun 13 15:01:34 2010 +0200

    s3: Remove some leftovers from macros
    
    check_fsp and check_fsp_open used to be macros

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

Summary of changes:
 source3/smbd/reply.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index cf4efde..4d33652 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -322,11 +322,11 @@ size_t srvstr_get_path_req(TALLOC_CTX *mem_ctx, struct smb_request *req,
 bool check_fsp_open(connection_struct *conn, struct smb_request *req,
 		    files_struct *fsp)
 {
-	if (!(fsp) || !(conn)) {
+	if ((fsp == NULL) || (conn == NULL)) {
 		reply_nterror(req, NT_STATUS_INVALID_HANDLE);
 		return False;
 	}
-	if (((conn) != (fsp)->conn) || req->vuid != (fsp)->vuid) {
+	if ((conn != fsp->conn) || (req->vuid != fsp->vuid)) {
 		reply_nterror(req, NT_STATUS_INVALID_HANDLE);
 		return False;
 	}
@@ -343,15 +343,15 @@ bool check_fsp(connection_struct *conn, struct smb_request *req,
 	if (!check_fsp_open(conn, req, fsp)) {
 		return False;
 	}
-	if ((fsp)->is_directory) {
+	if (fsp->is_directory) {
 		reply_nterror(req, NT_STATUS_INVALID_DEVICE_REQUEST);
 		return False;
 	}
-	if ((fsp)->fh->fd == -1) {
+	if (fsp->fh->fd == -1) {
 		reply_nterror(req, NT_STATUS_ACCESS_DENIED);
 		return False;
 	}
-	(fsp)->num_smb_operations++;
+	fsp->num_smb_operations++;
 	return True;
 }
 


-- 
Samba Shared Repository