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: mutt-1-11-rel~104
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8a81930db9285bbcf8494560144ffa4e43e988a4;p=mutt

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 f2e1d5ef..40cb4b88 100644
--- a/sort.c
+++ b/sort.c
@@ -203,8 +203,7 @@ static int compare_spam (const void *a, const void *b)
   if (result == 0)
   {
     result = strcmp(aptr, bptr);
-    if (result == 0)
-      AUXSORT(result, a, b);
+    AUXSORT(result, a, b);
   }
 
   return (SORTCODE(result));