From 16d8dfe6ac3a4100371350c930fd01cc34ab4de7 Mon Sep 17 00:00:00 2001
From: Jean Paul Galea <jeanpaul@yubico.com>
Date: Sat, 18 Jul 2015 00:46:17 +0200
Subject: [PATCH] Refactor counter logic.

- break up into multiple if comparisons.
---
 ykval-synclib.php | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/ykval-synclib.php b/ykval-synclib.php
index 6b30956..96c7be2 100644
--- a/ykval-synclib.php
+++ b/ykval-synclib.php
@@ -227,7 +227,10 @@ class SyncLib
 
 	public function countersHigherThan($p1, $p2)
 	{
-		if ($p1['yk_counter'] > $p2['yk_counter'] || ($p1['yk_counter'] == $p2['yk_counter'] && $p1['yk_use'] > $p2['yk_use']))
+		if ($p1['yk_counter'] > $p2['yk_counter'])
+			return true;
+
+		if ($p1['yk_counter'] == $p2['yk_counter'] && $p1['yk_use'] > $p2['yk_use'])
 			return true;
 
 		return false;
@@ -235,7 +238,10 @@ class SyncLib
 
 	public function countersHigherThanOrEqual($p1, $p2)
 	{
-		if ($p1['yk_counter'] > $p2['yk_counter'] || ($p1['yk_counter'] == $p2['yk_counter'] && $p1['yk_use'] >= $p2['yk_use']))
+		if ($p1['yk_counter'] > $p2['yk_counter'])
+			return true;
+
+		if ($p1['yk_counter'] == $p2['yk_counter'] && $p1['yk_use'] >= $p2['yk_use'])
 			return true;
 
 		return false;
@@ -243,7 +249,7 @@ class SyncLib
 
 	public function countersEqual($p1, $p2)
 	{
-		return ($p1['yk_counter'] == $p2['yk_counter']) && ($p1['yk_use'] == $p2['yk_use']);
+		return ($p1['yk_counter'] == $p2['yk_counter'] && $p1['yk_use'] == $p2['yk_use']);
 	}
 
 	// queue daemon