projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
more include simplifications
[apps/madmutt.git]
/
sort.c
diff --git
a/sort.c
b/sort.c
index
af00646
..
e758174
100644
(file)
--- a/
sort.c
+++ b/
sort.c
@@
-7,24
+7,14
@@
* 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 <lib-lib/macros.h>
-#include <lib-lib/str.h>
+#include <lib-lib/lib-lib.h>
#include "mutt.h"
#include "mutt.h"
+#include "alias.h"
#include "sort.h"
#include "thread.h"
#include "mutt_idna.h"
#include "sort.h"
#include "thread.h"
#include "mutt_idna.h"
-
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#include <unistd.h>
-
#define SORTCODE(x) (Sort & SORT_REVERSE) ? -(x) : x
/* function to use as discriminator when normal sort method is equal */
#define SORTCODE(x) (Sort & SORT_REVERSE) ? -(x) : x
/* function to use as discriminator when normal sort method is equal */
@@
-83,18
+73,18
@@
int compare_subject (const void *a, const void *b)
else if (!(*pb)->env->real_subj)
rc = 1;
else
else if (!(*pb)->env->real_subj)
rc = 1;
else
- rc =
str_casecmp
((*pa)->env->real_subj, (*pb)->env->real_subj);
+ rc =
m_strcasecmp
((*pa)->env->real_subj, (*pb)->env->real_subj);
AUXSORT (rc, a, b);
return (SORTCODE (rc));
}
AUXSORT (rc, a, b);
return (SORTCODE (rc));
}
-const char *mutt_get_name (
ADDRESS
* a)
+const char *mutt_get_name (
address_t
* a)
{
{
-
ADDRESS
*ali;
+
const address_t
*ali;
const char *name = "";
if (a) {
const char *name = "";
if (a) {
- if (option (OPTREVALIAS) && (ali = alias_reverse_lookup
(a))
+ if (option (OPTREVALIAS) && (ali = alias_reverse_lookup(a))
&& ali->personal)
name = ali->personal;
else if (a->personal)
&& ali->personal)
name = ali->personal;
else if (a->personal)
@@
-121,7
+111,7
@@
int compare_to (const void *a, const void *b)
m_strcpy(fa, sizeof(fa), mutt_get_name((*ppa)->env->to));
m_strcpy(fb, sizeof(fb), mutt_get_name((*ppb)->env->to));
m_strcpy(fa, sizeof(fa), mutt_get_name((*ppa)->env->to));
m_strcpy(fb, sizeof(fb), mutt_get_name((*ppb)->env->to));
- result =
str_casecmp
(fa, fb);
+ result =
m_strcasecmp
(fa, fb);
AUXSORT (result, a, b);
return (SORTCODE (result));
}
AUXSORT (result, a, b);
return (SORTCODE (result));
}
@@
-141,7
+131,7
@@
int compare_from (const void *a, const void *b)
m_strcpy(fa, sizeof(fa), mutt_get_name((*ppa)->env->from));
m_strcpy(fb, sizeof(fb), mutt_get_name((*ppb)->env->from));
m_strcpy(fa, sizeof(fa), mutt_get_name((*ppa)->env->from));
m_strcpy(fb, sizeof(fb), mutt_get_name((*ppb)->env->from));
- result =
str_casecmp
(fa, fb);
+ result =
m_strcasecmp
(fa, fb);
AUXSORT (result, a, b);
return (SORTCODE (result));
}
AUXSORT (result, a, b);
return (SORTCODE (result));
}