diff options
| author | Volker Lendecke <vl@samba.org> | 2014-07-11 12:41:54 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2014-07-22 15:32:39 +0200 |
| commit | 432130c57248b7f8085f7978053d1f6cdfb02b4a (patch) | |
| tree | e01dacd96a404ea1a93d2a5cc60ddb57e469a05a | |
| parent | 164e0cb23cd2e30d4cd2cb4ca2bad32e885bb754 (diff) | |
| download | samba-432130c57248b7f8085f7978053d1f6cdfb02b4a.tar.gz samba-432130c57248b7f8085f7978053d1f6cdfb02b4a.tar.xz samba-432130c57248b7f8085f7978053d1f6cdfb02b4a.zip | |
smbd: Use a struct initializer brl_lock
Avoids a #ifdef DEVELOPER and saves a few bytes .text
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
| -rw-r--r-- | source3/locking/brlock.c | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/source3/locking/brlock.c b/source3/locking/brlock.c index b6b8d9ab2c..51a0fd9357 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, |