diff options
| author | Volker Lendecke <vl@samba.org> | 2010-06-13 15:01:34 +0200 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2010-06-13 15:04:25 +0200 |
| commit | b90eb7dd6920dccd7a814ce77eec886e3a6ca8f0 (patch) | |
| tree | 5bfeb85bfcb06170310155701c6dbe62e9b6d570 /source3 | |
| parent | 3f7e2222f47d5960cece48dd751470bcc0983d93 (diff) | |
| download | samba-b90eb7dd6920dccd7a814ce77eec886e3a6ca8f0.tar.gz samba-b90eb7dd6920dccd7a814ce77eec886e3a6ca8f0.tar.bz2 samba-b90eb7dd6920dccd7a814ce77eec886e3a6ca8f0.zip | |
s3: Remove some leftovers from macros
check_fsp and check_fsp_open used to be macros
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/smbd/reply.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c index cf4efde013..4d33652a87 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; } |