drop mem_alloc and mem_free, use my own hand crafted optmized macros that

[apps/madmutt.git] / query.c

diff --git a/query.c b/query.c
index 1443bac..893d2db 100644 (file)
--- a/query.c
+++ b/query.c
@@ -11,6 +11,8 @@
 # include "config.h"
 #endif
 
+#include <lib-lib/mem.h>
+
 #include "mutt.h"
 #include "mutt_menu.h"
 #include "mutt_idna.h"
@@ -126,7 +128,7 @@ static QUERY *run_query (char *s, int quiet)
       }
     }
   }
-  mem_free (&buf);
+  p_delete(&buf);
   fclose (fp);
   if (mutt_wait_filter (thepid)) {
     debug_print (1, ("Error: %s\n", msg));
@@ -310,14 +312,14 @@ static void query_menu (char *buf, size_t buflen, QUERY * results, int retbuf)
               queryp = results;
               while (queryp) {
                 rfc822_free_address (&queryp->addr);
-                mem_free (&queryp->name);
-                mem_free (&queryp->other);
+                p_delete(&queryp->name);
+                p_delete(&queryp->other);
                 results = queryp->next;
-                mem_free (&queryp);
+                p_delete(&queryp);
                 queryp = results;
               }
               results = newresults;
-              mem_free (&QueryTable);
+              p_delete(&QueryTable);
             }
             else {
               /* append */
@@ -473,13 +475,13 @@ static void query_menu (char *buf, size_t buflen, QUERY * results, int retbuf)
     queryp = results;
     while (queryp) {
       rfc822_free_address (&queryp->addr);
-      mem_free (&queryp->name);
-      mem_free (&queryp->other);
+      p_delete(&queryp->name);
+      p_delete(&queryp->other);
       results = queryp->next;
-      mem_free (&queryp);
+      p_delete(&queryp);
       queryp = results;
     }
-    mem_free (&QueryTable);
+    p_delete(&QueryTable);
 
     /* tell whoever called me to redraw the screen when I return */
     set_option (OPTNEEDREDRAW);