X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=sort.c;h=505679cdcf73a4d33277b27c1a49cf553ed8e497;hp=3e60387f4ba457479701ff3454869c88ac54f6be;hb=57ad79c17d6c89072cd119fa66631b8b094e36c2;hpb=45528548fd2dddcbef9396b0589ec88d722766ee

diff --git a/sort.c b/sort.c
index 3e60387..505679c 100644
--- a/sort.c
+++ b/sort.c
@@ -15,6 +15,7 @@
 #include "alias.h"
 #include "sort.h"
 #include "thread.h"
+#include "score.h"
 #include "mutt_idna.h"
 
 #define SORTCODE(x) (Sort & SORT_REVERSE) ? -(x) : x
@@ -30,7 +31,7 @@ static sort_t *AuxSort = NULL;
 if (!code) \
   code = (*((HEADER **)a))->index - (*((HEADER **)b))->index;
 
-int compare_score (const void *a, const void *b)
+static int compare_score (const void *a, const void *b)
 {
   HEADER **pa = (HEADER **) a;
   HEADER **pb = (HEADER **) b;
@@ -40,7 +41,7 @@ int compare_score (const void *a, const void *b)
   return (SORTCODE (result));
 }
 
-int compare_size (const void *a, const void *b)
+static int compare_size (const void *a, const void *b)
 {
   HEADER **pa = (HEADER **) a;
   HEADER **pb = (HEADER **) b;
@@ -50,7 +51,7 @@ int compare_size (const void *a, const void *b)
   return (SORTCODE (result));
 }
 
-int compare_date_sent (const void *a, const void *b)
+static int compare_date_sent (const void *a, const void *b)
 {
   HEADER **pa = (HEADER **) a;
   HEADER **pb = (HEADER **) b;
@@ -60,7 +61,7 @@ int compare_date_sent (const void *a, const void *b)
   return (SORTCODE (result));
 }
 
-int compare_subject (const void *a, const void *b)
+static int compare_subject (const void *a, const void *b)
 {
   HEADER **pa = (HEADER **) a;
   HEADER **pb = (HEADER **) b;
@@ -98,7 +99,7 @@ const char *mutt_get_name (address_t * a)
   return name;
 }
 
-int compare_to (const void *a, const void *b)
+static int compare_to (const void *a, const void *b)
 {
   HEADER **ppa = (HEADER **) a;
   HEADER **ppb = (HEADER **) b;
@@ -118,7 +119,7 @@ int compare_to (const void *a, const void *b)
   return (SORTCODE (result));
 }
 
-int compare_from (const void *a, const void *b)
+static int compare_from (const void *a, const void *b)
 {
   HEADER **ppa = (HEADER **) a;
   HEADER **ppb = (HEADER **) b;
@@ -138,7 +139,7 @@ int compare_from (const void *a, const void *b)
   return (SORTCODE (result));
 }
 
-int compare_date_received (const void *a, const void *b)
+static int compare_date_received (const void *a, const void *b)
 {
   HEADER **pa = (HEADER **) a;
   HEADER **pb = (HEADER **) b;
@@ -148,7 +149,7 @@ int compare_date_received (const void *a, const void *b)
   return (SORTCODE (result));
 }
 
-int compare_order (const void *a, const void *b)
+static int compare_order (const void *a, const void *b)
 {
   HEADER **ha = (HEADER **) a;
   HEADER **hb = (HEADER **) b;
@@ -166,7 +167,7 @@ int compare_order (const void *a, const void *b)
     return (SORTCODE ((*ha)->index - (*hb)->index));
 }
 
-int compare_spam (const void *a, const void *b)
+static int compare_spam (const void *a, const void *b)
 {
   HEADER **ppa = (HEADER **) a;
   HEADER **ppb = (HEADER **) b;
@@ -267,7 +268,7 @@ void mutt_sort_headers (CONTEXT * ctx, int init)
   if (!ctx->quiet)
     mutt_message _("Sorting mailbox...");
 
-  if (option (OPTNEEDRESCORE) && option (OPTSCORE)) {
+  if (option (OPTNEEDRESCORE) && mod_score.enable) {
     for (i = 0; i < ctx->msgcount; i++)
       mutt_score_message (ctx, ctx->hdrs[i], 1);
   }