X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=query.c;h=2a60afa1760c9247fbcf2a63953be27c2edb4843;hp=7f343fd4c8dc801f610b95c2be6a83dcfd623130;hb=2a2f2f9a5bad73c883b7f9c9b4166d932b6aaf37;hpb=108f3c7ab59844591f7540347914ea57be5245e2

diff --git a/query.c b/query.c
index 7f343fd..2a60afa 100644
--- a/query.c
+++ b/query.c
@@ -20,11 +20,11 @@
 #include <lib-lib/macros.h>
 #include <lib-lib/file.h>
 #include <lib-lib/mapping.h>
-#include <lib-lib/debug.h>
 
 #include <lib-ui/menu.h>
 
 #include "mutt.h"
+#include "alias.h"
 #include "mutt_idna.h"
 #include "sort.h"
 
@@ -54,7 +54,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 +77,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;
@@ -88,7 +88,6 @@ static QUERY *run_query (char *s, int quiet)
   mutt_expand_file_fmt (cmd, sizeof (cmd), QueryCmd, s);
 
   if ((thepid = mutt_create_filter (cmd, NULL, &fp, NULL)) < 0) {
-    debug_print (1, ("unable to fork command: %s\n", cmd));
     return 0;
   }
   if (!quiet)
@@ -131,7 +130,6 @@ static QUERY *run_query (char *s, int quiet)
   p_delete(&buf);
   fclose (fp);
   if (mutt_wait_filter (thepid)) {
-    debug_print (1, ("Error: %s\n", msg));
     if (!quiet)
       mutt_error ("%s", msg);
   }
@@ -206,7 +204,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 +233,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 +251,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 +423,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);