continue the include dance

[apps/madmutt.git] / query.c

diff --git a/query.c b/query.c
index 7f343fd..ce1f052 100644 (file)
--- a/query.c
+++ b/query.c
@@ -25,6 +25,7 @@
 #include <lib-ui/menu.h>
 
 #include "mutt.h"
+#include "alias.h"
 #include "mutt_idna.h"
 #include "sort.h"
 
@@ -54,7 +55,7 @@ static struct mapping_t QueryHelp[] = {
 static int FirstColumn;
 static int SecondColumn;
 
-static void query_menu (char *buf, size_t buflen, QUERY * results,
+static void query_menu (char *buf, ssize_t buflen, QUERY * results,
                         int retbuf);
 
 static address_t *result_to_addr (QUERY * r)
@@ -77,7 +78,7 @@ static QUERY *run_query (char *s, int quiet)
   QUERY *cur = NULL;
   char cmd[_POSIX_PATH_MAX];
   char *buf = NULL;
-  size_t buflen;
+  ssize_t buflen;
   int dummy = 0;
   char msg[STRING];
   char *p;
@@ -206,7 +207,7 @@ static int query_tag (MUTTMENU * menu, int n, int m)
   return cur->tagged - ot;
 }
 
-int mutt_query_complete (char *buf, size_t buflen)
+int mutt_query_complete (char *buf, ssize_t buflen)
 {
   QUERY *results = NULL;
   address_t *tmpa;
@@ -235,7 +236,7 @@ int mutt_query_complete (char *buf, size_t buflen)
   return (0);
 }
 
-void mutt_query_menu (char *buf, size_t buflen)
+void mutt_query_menu (char *buf, ssize_t buflen)
 {
   if (!QueryCmd) {
     mutt_error _("Query command not defined.");
@@ -253,7 +254,7 @@ void mutt_query_menu (char *buf, size_t buflen)
   }
 }
 
-static void query_menu (char *buf, size_t buflen, QUERY * results, int retbuf)
+static void query_menu (char *buf, ssize_t buflen, QUERY * results, int retbuf)
 {
   MUTTMENU *menu;
   HEADER *msg = NULL;
@@ -425,7 +426,7 @@ static void query_menu (char *buf, size_t buflen, QUERY * results, int retbuf)
     /* if we need to return the selected entries */
     if (retbuf && (done == 2)) {
       int tagged = 0;
-      size_t curpos = 0;
+      ssize_t curpos = 0;
 
       p_clear(buf, buflen);