sort out some prototypes, put them where they belong.

[apps/madmutt.git] / sort.c

diff --git a/sort.c b/sort.c
index 38e9d87..2b70001 100644 (file)
--- a/sort.c
+++ b/sort.c
@@ -11,20 +11,19 @@
 # include "config.h"
 #endif
 
-#include <lib-lib/macros.h>
-#include <lib-lib/str.h>
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <unistd.h>
+
+#include <lib-lib/lib-lib.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 */
@@ -90,11 +89,11 @@ int compare_subject (const void *a, const void *b)
 
 const char *mutt_get_name (address_t * a)
 {
-  address_t *ali;
+  const address_t *ali;
   const char *name = "";
 
   if (a) {
-    if (option (OPTREVALIAS) && (ali = alias_reverse_lookup(Aliases, a))
+    if (option (OPTREVALIAS) && (ali = alias_reverse_lookup(a))
         && ali->personal)
       name = ali->personal;
     else if (a->personal)