summaryrefslogtreecommitdiffstats
path: root/source3/modules
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2014-02-12 14:22:26 +0000
committerMichael Adam <obnox@samba.org>2014-02-12 21:47:31 +0100
commitf0a385f35f9528b8f1f0c829065562b2d90b9850 (patch)
tree21ea61a1056dcfd94492ae3a397b2c436d36c81d /source3/modules
parente4bad9248098c604272eb3e081829402b4d78697 (diff)
downloadsamba-f0a385f35f9528b8f1f0c829065562b2d90b9850.tar.gz
samba-f0a385f35f9528b8f1f0c829065562b2d90b9850.tar.xz
samba-f0a385f35f9528b8f1f0c829065562b2d90b9850.zip
smbd: Slightly simplify vfswrap_fsctl
We have the MIN macro, so use it :-) Signed-off-by: Volker Lendecke <vl@samba.org> Reviewed-by: Michael Adam <obnox@samba.org>
Diffstat (limited to 'source3/modules')
-rw-r--r--source3/modules/vfs_default.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c
index 5c48d04f1c..81a0b1bb6d 100644
--- a/source3/modules/vfs_default.c
+++ b/source3/modules/vfs_default.c
@@ -1054,7 +1054,8 @@ static NTSTATUS vfswrap_fsctl(struct vfs_handle_struct *handle,
DEBUG(10,("FSCTL_CREATE_OR_GET_OBJECT_ID: called on %s\n",
fsp_fnum_dbg(fsp)));
- *out_len = (max_out_len >= 64) ? 64 : max_out_len;
+ *out_len = MIN(max_out_len, 64);
+
/* Hmmm, will this cause problems if less data asked for? */
return_data = talloc_array(ctx, char, 64);
if (return_data == NULL) {