sort out some prototypes, put them where they belong.

[apps/madmutt.git] / lib-ui / query.c

diff --git a/lib-ui/query.c b/lib-ui/query.c
index 2a60afa..11fa388 100644 (file)
--- a/lib-ui/query.c
+++ b/lib-ui/query.c
@@ -15,13 +15,11 @@
 #include <stdlib.h>
 #include <ctype.h>
 
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/macros.h>
-#include <lib-lib/file.h>
-#include <lib-lib/mapping.h>
+#include <lib-lib/lib-lib.h>
+#include <lib-sys/unix.h>
 
 #include <lib-ui/menu.h>
+#include <lib-ui/curses.h>
 
 #include "mutt.h"
 #include "alias.h"
@@ -350,7 +348,7 @@ static void query_menu (char *buf, ssize_t buflen, QUERY * results, int retbuf)
                 QueryTable[i].data = queryp;
             }
             else {
-              int clear = 0;
+              int doclear = 0;
 
               /* append */
               p_realloc(&QueryTable, menu->max);
@@ -361,10 +359,10 @@ static void query_menu (char *buf, ssize_t buflen, QUERY * results, int retbuf)
                    queryp = queryp->next, i++) {
                 /* once we hit new entries, clear/init the tag */
                 if (queryp == newresults)
-                  clear = 1;
+                  doclear = 1;
 
                 QueryTable[i].data = queryp;
-                if (clear)
+                if (doclear)
                   QueryTable[i].tagged = 0;
               }
             }