From 432130c57248b7f8085f7978053d1f6cdfb02b4a Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Fri, 11 Jul 2014 12:41:54 +0200 Subject: [PATCH] smbd: Use a struct initializer brl_lock Avoids a #ifdef DEVELOPER and saves a few bytes .text Signed-off-by: Volker Lendecke Reviewed-by: Stefan Metzmacher --- source3/locking/brlock.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/source3/locking/brlock.c b/source3/locking/brlock.c index b6b8d9ab2cc..51a0fd93578 100644 --- a/source3/locking/brlock.c +++ b/source3/locking/brlock.c @@ -964,19 +964,16 @@ NTSTATUS brl_lock(struct messaging_context *msg_ctx, } #endif -#ifdef DEVELOPER - /* Quieten valgrind on test. */ - ZERO_STRUCT(lock); -#endif - - lock.context.smblctx = smblctx; - lock.context.pid = pid; - lock.context.tid = br_lck->fsp->conn->cnum; - lock.start = start; - lock.size = size; - lock.fnum = br_lck->fsp->fnum; - lock.lock_type = lock_type; - lock.lock_flav = lock_flav; + lock = (struct lock_struct) { + .context.smblctx = smblctx, + .context.pid = pid, + .context.tid = br_lck->fsp->conn->cnum, + .start = start, + .size = size, + .fnum = br_lck->fsp->fnum, + .lock_type = lock_type, + .lock_flav = lock_flav + }; if (lock_flav == WINDOWS_LOCK) { ret = SMB_VFS_BRL_LOCK_WINDOWS(br_lck->fsp->conn, br_lck, -- 2.11.4.GIT