git.samba.org
/
sfrench
/
samba-autobuild
/
.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0e3ea71
)
smbd: Use MIN macro in fake_sendfile
author
Christof Schmitt
<cs@samba.org>
Mon, 11 Aug 2014 20:19:46 +0000
(13:19 -0700)
committer
Jeremy Allison
<jra@samba.org>
Fri, 3 Oct 2014 22:11:21 +0000
(
00:11
+0200)
Signed-off-by: Christof Schmitt <cs@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
source3/smbd/reply.c
patch
|
blob
|
history
diff --git
a/source3/smbd/reply.c
b/source3/smbd/reply.c
index 21be320bb67be3f846ffeaf03dc8f08c08409637..9b3ed65447377bceee1ef14e50eec7a273d7ac0c 100644
(file)
--- a/
source3/smbd/reply.c
+++ b/
source3/smbd/reply.c
@@
-3107,11
+3107,7
@@
ssize_t fake_sendfile(struct smbXsrv_connection *xconn, files_struct *fsp,
ssize_t ret;
size_t cur_read;
- if (tosend > bufsize) {
- cur_read = bufsize;
- } else {
- cur_read = tosend;
- }
+ cur_read = MIN(tosend, bufsize);
ret = read_file(fsp,buf,startpos,cur_read);
if (ret == -1) {
SAFE_FREE(buf);