From: Volker Lendecke Date: Mon, 27 May 2019 14:21:12 +0000 (+0200) Subject: smbd: Adapt brl_pending_overlap to README.Coding X-Git-Url: http://git.samba.org/?p=metze%2Fsamba%2Fwip.git;a=commitdiff_plain;h=73080f255e379ed030005031f560c3ed71919b06 smbd: Adapt brl_pending_overlap to README.Coding Just reformatting, no behaviour change. This just looked too ugly to me. Signed-off-by: Volker Lendecke Reviewed-by: Jeremy Allison Autobuild-User(master): Jeremy Allison Autobuild-Date(master): Tue May 28 22:22:28 UTC 2019 on sn-devel-184 --- diff --git a/source3/locking/brlock.c b/source3/locking/brlock.c index 31e0f857d5c3..5a4bd0d5c063 100644 --- a/source3/locking/brlock.c +++ b/source3/locking/brlock.c @@ -295,13 +295,18 @@ static bool brl_conflict_other(const struct lock_struct *lock, Check if an unlock overlaps a pending lock. ****************************************************************************/ -static bool brl_pending_overlap(const struct lock_struct *lock, const struct lock_struct *pend_lock) +static bool brl_pending_overlap(const struct lock_struct *lock, + const struct lock_struct *pend_lock) { - if ((lock->start <= pend_lock->start) && (lock->start + lock->size > pend_lock->start)) - return True; - if ((lock->start >= pend_lock->start) && (lock->start < pend_lock->start + pend_lock->size)) - return True; - return False; + if ((lock->start <= pend_lock->start) && + (lock->start + lock->size > pend_lock->start)) { + return true; + } + if ((lock->start >= pend_lock->start) && + (lock->start < pend_lock->start + pend_lock->size)) { + return true; + } + return false; } /****************************************************************************