vclock: simplification of descends/2

basho · Jun 6, 2011 · e58c769 · e58c769
1 parent c4fe87f
commit e58c769
Showing 1 changed file with 6 additions and 15 deletions.
diff --git a/src/vclock.erl b/src/vclock.erl
@@ -64,21 +64,12 @@ descends(_, []) ->
     true;
 descends(Va, Vb) ->
     [{NodeB, {CtrB, _T}}|RestB] = Vb,
-    CtrA = 
-	case lists:keyfind(NodeB, 1, Va) of
-	    false           -> false;
-	    {_, {CA, _TSA}} -> CA
-	end,
-    case CtrA of
-	false -> false;
-	_ -> 
-	    if
-		CtrA < CtrB ->
-		    false;
-		true ->
-		    descends(Va,RestB)
-	    end
-    end.
+    case lists:keyfind(NodeB, 1, Va) of
+        false ->
+            false;
+        {_, {CtrA, _TSA}} ->
+            (CtrA >= CtrB) andalso descends(Va,RestB)
+        end.
 
 % @doc Combine all VClocks in the input list into their least possible
 %      common descendant.