From: Jordan Lee <jordan@transmissionbt.com>
Date: Sun, 3 Feb 2013 21:43:17 +0000 (+0000)
Subject: (libT) remove redundancy from compareKeys()
X-Git-Tag: 2.80~135
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=67ae1e7b2e975d0205c6324ea031381c260599b1;p=transmission

(libT) remove redundancy from compareKeys()
---

diff --git a/libtransmission/quark.c b/libtransmission/quark.c
index d15f4ace3..f0381156d 100644
--- a/libtransmission/quark.c
+++ b/libtransmission/quark.c
@@ -399,22 +399,10 @@ compareKeys (const void * va, const void * vb)
   const struct tr_key_struct * a = va;
   const struct tr_key_struct * b = vb;
 
-  if (a->len == b->len)
-    {
-      ret = memcmp (a->str, b->str, a->len);
-    }
-  else if (a->len < b->len)
-    {
-      ret = memcmp (a->str, b->str, a->len);
-      if (!ret)
-        ret = -1;
-    }
-  else /* a->len > b->len */
-    {
-      ret = memcmp (a->str, b->str, b->len);
-      if (!ret)
-        ret = 1;
-    }
+  ret = memcmp (a->str, b->str, a->len);
+
+  if (!ret && (a->len != b->len))
+    ret = a->len < b->len ? -1 : 1;
 
   return ret;
 }