Francois Gouget : testbot/lib: Simplify a couple of job sorting functions.

[Alexandre Julliard]

Module: tools
Branch: master
Commit: 89bb44ec1046696fe4ed741e7eb30e6da5ada5b5
URL:    http://source.winehq.org/git/tools.git/?a=commit;h=89bb44ec1046696fe4ed741e7eb30e6da5ada5b5

Author: Francois Gouget <fgouget at codeweavers.com>
Date:   Mon Oct 29 15:39:13 2012 +0100

testbot/lib: Simplify a couple of job sorting functions.

---

 testbot/lib/WineTestBot/Jobs.pm |   16 ++--------------
 1 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm
index b56e203..de66023 100644
--- a/testbot/lib/WineTestBot/Jobs.pm
+++ b/testbot/lib/WineTestBot/Jobs.pm
@@ -357,24 +357,12 @@ sub CreateJobs
 
 sub CompareJobPriority
 {
-  my $Compare = $a->Priority <=> $b->Priority;
-  if ($Compare == 0)
-  {
-    $Compare = $a->Id <=> $b->Id;
-  }
-
-  return $Compare;
+  return $a->Priority <=> $b->Priority || $a->Id <=> $b->Id;
 }
 
 sub CompareTaskStatus
 {
-  my $Compare = $b->Status cmp $a->Status;
-  if ($Compare == 0)
-  {
-    $Compare = $a->No <=> $b->No;
-  }
-
-  return $Compare;
+  return $b->Status cmp $a->Status || $a->No <=> $b->No;
 }
 
 =pod