From: Kevin McCarthy <kevin@8t8.us>
Date: Sat, 28 Jul 2018 19:59:35 +0000 (-0700)
Subject: Fix AUXSORT usage in compare_spam
X-Git-Tag: 2019-10-25~671^2~13
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ef985d249546dc438da2b52e7dc903b4bff24701;p=neomutt

Fix AUXSORT usage in compare_spam

AUXSORT already checks if the first parameter is zero.

Additionally, the macro expands into more than one statement, so
putting inside an unbracketed if is misleading and generates a
warning on the latest gcc.

Fortunately, both statements checked if the first parameter was zero,
so no actual bug resulted.
---

diff --git a/sort.c b/sort.c
index 4527f80ac..139a846e7 100644
--- a/sort.c
+++ b/sort.c
@@ -264,10 +264,7 @@ static int compare_spam(const void *a, const void *b)
   if (result == 0)
   {
     result = strcmp(aptr, bptr);
-    if (result == 0)
-    {
-      result = perform_auxsort(result, a, b);
-    }
+    result = perform_auxsort(result, a, b);
   }
 
   return SORTCODE(result);