summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vlendec@samba.org>2007-08-14 06:18:55 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:29:39 -0500
commit3038f27a5916b650b024e60bf9ff3decd7378505 (patch)
tree7fb854096ceffb4060029d407b8518c0cc71678d
parent4b485d807ef9ddd761ff9d9f15fce2882bf5d9f1 (diff)
downloadsamba-3038f27a5916b650b024e60bf9ff3decd7378505.tar.gz
samba-3038f27a5916b650b024e60bf9ff3decd7378505.tar.bz2
samba-3038f27a5916b650b024e60bf9ff3decd7378505.zip
r24392: Minor simplifications
(This used to be commit 96a943587418e07019974b45c368e749a5ef82c2)
-rw-r--r--source3/smbd/reply.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index 43e702803f..826306c883 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -2459,9 +2459,7 @@ void send_file_readbraw(connection_struct *conn,
DATA_BLOB header_blob;
_smb_setlen(header,nread);
- header_blob.data = (uint8 *)header;
- header_blob.length = 4;
- header_blob.free = NULL;
+ header_blob = data_blob_const(header, 4);
if ( SMB_VFS_SENDFILE( smbd_server_fd(), fsp, fsp->fh->fd,
&header_blob, startpos, nread) == -1) {
@@ -2594,7 +2592,7 @@ void reply_readbraw(connection_struct *conn, struct smb_request *req)
flush_write_cache(fsp, READRAW_FLUSH);
startpos = IVAL_TO_SMB_OFF_T(req->inbuf,smb_vwv1);
- if(CVAL(req->inbuf,smb_wct) == 10) {
+ if(req->wct == 10) {
/*
* This is a large offset (64 bit) read.
*/