projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
unlink file before writing it, and don't fail if it's not here
[apps/madmutt.git]
/
sort.c
diff --git
a/sort.c
b/sort.c
index
9798823
..
505679c
100644
(file)
--- a/
sort.c
+++ b/
sort.c
@@
-7,22
+7,15
@@
* please see the file GPL in the top level source directory.
*/
* please see the file GPL in the top level source directory.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#include <unistd.h>
+#include <lib-lib/lib-lib.h>
-#include <lib-lib/macros.h>
-#include <lib-lib/str.h>
+#include <lib-ui/curses.h>
#include "mutt.h"
#include "alias.h"
#include "sort.h"
#include "thread.h"
#include "mutt.h"
#include "alias.h"
#include "sort.h"
#include "thread.h"
+#include "score.h"
#include "mutt_idna.h"
#define SORTCODE(x) (Sort & SORT_REVERSE) ? -(x) : x
#include "mutt_idna.h"
#define SORTCODE(x) (Sort & SORT_REVERSE) ? -(x) : x
@@
-38,7
+31,7
@@
static sort_t *AuxSort = NULL;
if (!code) \
code = (*((HEADER **)a))->index - (*((HEADER **)b))->index;
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;
{
HEADER **pa = (HEADER **) a;
HEADER **pb = (HEADER **) b;
@@
-48,7
+41,7
@@
int compare_score (const void *a, const void *b)
return (SORTCODE (result));
}
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;
{
HEADER **pa = (HEADER **) a;
HEADER **pb = (HEADER **) b;
@@
-58,7
+51,7
@@
int compare_size (const void *a, const void *b)
return (SORTCODE (result));
}
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;
{
HEADER **pa = (HEADER **) a;
HEADER **pb = (HEADER **) b;
@@
-68,7
+61,7
@@
int compare_date_sent (const void *a, const void *b)
return (SORTCODE (result));
}
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;
{
HEADER **pa = (HEADER **) a;
HEADER **pb = (HEADER **) b;
@@
-106,7
+99,7
@@
const char *mutt_get_name (address_t * a)
return name;
}
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;
{
HEADER **ppa = (HEADER **) a;
HEADER **ppb = (HEADER **) b;
@@
-126,7
+119,7
@@
int compare_to (const void *a, const void *b)
return (SORTCODE (result));
}
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;
{
HEADER **ppa = (HEADER **) a;
HEADER **ppb = (HEADER **) b;
@@
-146,7
+139,7
@@
int compare_from (const void *a, const void *b)
return (SORTCODE (result));
}
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;
{
HEADER **pa = (HEADER **) a;
HEADER **pb = (HEADER **) b;
@@
-156,7
+149,7
@@
int compare_date_received (const void *a, const void *b)
return (SORTCODE (result));
}
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;
{
HEADER **ha = (HEADER **) a;
HEADER **hb = (HEADER **) b;
@@
-174,7
+167,7
@@
int compare_order (const void *a, const void *b)
return (SORTCODE ((*ha)->index - (*hb)->index));
}
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;
{
HEADER **ppa = (HEADER **) a;
HEADER **ppb = (HEADER **) b;
@@
-275,7
+268,7
@@
void mutt_sort_headers (CONTEXT * ctx, int init)
if (!ctx->quiet)
mutt_message _("Sorting mailbox...");
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);
}
for (i = 0; i < ctx->msgcount; i++)
mutt_score_message (ctx, ctx->hdrs[i], 1);
}