From: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Date: Sun, 7 Apr 2024 03:07:20 +0000 (+1200)
Subject: s3:brlock: use NUMERIC_CMP in #ifdef-zeroed lock_compare
X-Git-Tag: ldb-2.8.1~23
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=13645e1131bd912cd7ece9a1f740c0f10b617e76;p=thirdparty%2Fsamba.git

s3:brlock: use NUMERIC_CMP in #ifdef-zeroed lock_compare

BUG: https://bugzilla.samba.org/show_bug.cgi?id=15625

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
(cherry picked from commit 9b73235d4957a487fbb3214fdfda6461a2cf0b21)
---

diff --git a/source3/locking/brlock.c b/source3/locking/brlock.c
index 905da049c58..328a9bfba3d 100644
--- a/source3/locking/brlock.c
+++ b/source3/locking/brlock.c
@@ -408,12 +408,9 @@ static int lock_compare(const struct lock_struct *lck1,
 			 const struct lock_struct *lck2)
 {
 	if (lck1->start != lck2->start) {
-		return (lck1->start - lck2->start);
+		return NUMERIC_CMP(lck1->start, lck2->start);
 	}
-	if (lck2->size != lck1->size) {
-		return ((int)lck1->size - (int)lck2->size);
-	}
-	return 0;
+	return NUMERIC_CMP(lck1->size, lck2->size);
 }
 #endif