diff options
| author | Christof Schmitt <cs@samba.org> | 2014-08-11 13:19:46 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2014-10-04 00:11:21 +0200 |
| commit | b7af51a1424483371c61f34dbbf0c8bddcaae48c (patch) | |
| tree | b2afb85a63354a2382aef886b361796ce63a657f | |
| parent | 0e3ea71c21d682ae4378230ccd4d5c859da75891 (diff) | |
| download | samba-b7af51a1424483371c61f34dbbf0c8bddcaae48c.tar.gz samba-b7af51a1424483371c61f34dbbf0c8bddcaae48c.tar.xz samba-b7af51a1424483371c61f34dbbf0c8bddcaae48c.zip | |
smbd: Use MIN macro in fake_sendfile
Signed-off-by: Christof Schmitt <cs@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
| -rw-r--r-- | source3/smbd/reply.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c index 21be320bb6..9b3ed65447 100644 --- 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); |