# include "config.h"
#endif
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <unistd.h>
+
#include <lib-lib/macros.h>
#include <lib-lib/str.h>
#include "mutt.h"
+#include "alias.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 */
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));
}
-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) {
- 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)
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));
}
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));
}