From ff80f68c3020be0a92eb41115a64518ece097ee7 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Tue, 21 Apr 2020 14:21:49 +0200 Subject: [PATCH] srvsvc: Use a struct assignment in enum_file_fn() Looks nicer than 5 complex array references... Bug: https://bugzilla.samba.org/show_bug.cgi?id=14355 Signed-off-by: Volker Lendecke Reviewed-by: Stefan Metzmacher --- source3/rpc_server/srvsvc/srv_srvsvc_nt.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/source3/rpc_server/srvsvc/srv_srvsvc_nt.c b/source3/rpc_server/srvsvc/srv_srvsvc_nt.c index dc3ee32cd96..c795dd2c6eb 100644 --- a/source3/rpc_server/srvsvc/srv_srvsvc_nt.c +++ b/source3/rpc_server/srvsvc/srv_srvsvc_nt.c @@ -155,12 +155,14 @@ static int enum_file_fn(struct file_id id, /* now fill in the srvsvc_NetFileInfo3 struct */ - ctr3->array[i].fid = - (((uint32_t)(procid_to_pid(&e->pid))<<16) | e->share_file_id); - ctr3->array[i].permissions = permissions; - ctr3->array[i].num_locks = num_locks; - ctr3->array[i].path = fullpath; - ctr3->array[i].user = username; + ctr3->array[i] = (struct srvsvc_NetFileInfo3) { + .fid = (((uint32_t)(procid_to_pid(&e->pid))<<16) | + e->share_file_id), + .permissions = permissions, + .num_locks = num_locks, + .path = fullpath, + .user = username, + }; ctr3->count++; -- 2.47.3