diff options
| author | Stefan Metzmacher <metze@samba.org> | 2014-03-05 14:00:40 +0100 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2014-03-05 10:49:47 -0800 |
| commit | 734e1b65044a33eba01b41695502c2257c1a4d9e (patch) | |
| tree | 96def996e6bebb77d46fee43bc09b4dd65211c03 /source3 | |
| parent | 8b746f5a2137b74e28bce5370f5aa9d4bcdac6c2 (diff) | |
| download | samba-734e1b65044a33eba01b41695502c2257c1a4d9e.tar.gz samba-734e1b65044a33eba01b41695502c2257c1a4d9e.tar.xz samba-734e1b65044a33eba01b41695502c2257c1a4d9e.zip | |
s3:smbd: simplify maxentries calculation in reply_search()
Using helper variables make it much easier to understand.
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/smbd/reply.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c index b2d3f44b220..a334490f242 100644 --- a/source3/smbd/reply.c +++ b/source3/smbd/reply.c @@ -1698,11 +1698,10 @@ void reply_search(struct smb_request *req) } } else { unsigned int i; - maxentries = MIN( - maxentries, - ((BUFFER_SIZE - - ((uint8 *)smb_buf(req->outbuf) + 3 - req->outbuf)) - /DIR_STRUCT_SIZE)); + size_t hdr_size = ((uint8_t *)smb_buf(req->outbuf) + 3 - req->outbuf); + size_t available_space = BUFFER_SIZE - hdr_size; + + maxentries = MIN(maxentries, available_space/DIR_STRUCT_SIZE); DEBUG(8,("dirpath=<%s> dontdescend=<%s>\n", directory,lp_dont_descend(ctx, SNUM(conn)))); |