refactor: Drop owns_lock() call

hebasto · vasild · hebasto · commit 30cc1c6609ad · 2022-10-03T12:26:37.000+01:00
Co-authored-by: Vasil Dimov &lt;vd@FreeBSD.org&gt;
diff --git a/src/sync.h b/src/sync.h
@@ -165,10 +165,11 @@ class SCOPED_LOCKABLE UniqueLock : public Base
     bool TryEnter(const char* pszName, const char* pszFile, int nLine)
     {
         EnterCritical(pszName, pszFile, nLine, Base::mutex(), true);
-        if (!Base::try_lock()) {
-            LeaveCritical();
+        if (Base::try_lock()) {
+            return true;
         }
-        return Base::owns_lock();
+        LeaveCritical();
+        return false;
     }
 
 public:

Original file line number	Diff line number	Diff line change
`@@ -165,10 +165,11 @@ class SCOPED_LOCKABLE UniqueLock : public Base`
`165`	`165`	`bool TryEnter(const char* pszName, const char* pszFile, int nLine)`
`166`	`166`	`{`
`167`	`167`	`EnterCritical(pszName, pszFile, nLine, Base::mutex(), true);`
`168`		`- if (!Base::try_lock()) {`
`169`		`- LeaveCritical();`
	`168`	`+ if (Base::try_lock()) {`
	`169`	`+ return true;`
`170`	`170`	`}`
`171`		`- return Base::owns_lock();`
	`171`	`+ LeaveCritical();`
	`172`	`+ return false;`
`172`	`173`	`}`
`173`	`174`
`174`	`175`	`public:`