X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=query.c;h=76eca912079045906ab265389fb2b07101e222a1;hp=5c5d0a3a40d4a34a9cec9d7dd768ce30e8d78580;hb=5e6273c09929249ee7a850934bf12fd03439d923;hpb=f997801a16ce4a8530cb30cddebfe6243cb3502d

diff --git a/query.c b/query.c
index 5c5d0a3..76eca91 100644
--- a/query.c
+++ b/query.c
@@ -11,15 +11,17 @@
 # include "config.h"
 #endif
 
+#include <lib-lib/mem.h>
+#include <lib-lib/str.h>
+#include <lib-lib/macros.h>
+#include <lib-lib/file.h>
+
 #include "mutt.h"
 #include "mutt_menu.h"
 #include "mutt_idna.h"
 #include "mapping.h"
 #include "sort.h"
 
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/str.h"
 #include "lib/debug.h"
 
 #include <string.h>
@@ -45,7 +47,7 @@ static struct mapping_t QueryHelp[] = {
   {N_("Make Alias"), OP_CREATE_ALIAS},
   {N_("Search"), OP_SEARCH},
   {N_("Help"), OP_HELP},
-  {NULL}
+  {NULL, OP_NULL}
 };
 
 /* Variables for outsizing output format */
@@ -62,7 +64,7 @@ static ADDRESS *result_to_addr (QUERY * r)
   tmp = rfc822_cpy_adr (r->addr);
 
   if (!tmp->next && !tmp->personal)
-    tmp->personal = safe_strdup (r->name);
+    tmp->personal = m_strdup(r->name);
 
   mutt_addrlist_to_idna (tmp, NULL);
   return tmp;
@@ -100,11 +102,11 @@ static QUERY *run_query (char *s, int quiet)
       if (first == NULL) {
         FirstColumn = 0;
         SecondColumn = 0;
-        first = (QUERY *) safe_calloc (1, sizeof (QUERY));
+        first = p_new(QUERY, 1);
         cur = first;
       }
       else {
-        cur->next = (QUERY *) safe_calloc (1, sizeof (QUERY));
+        cur->next = p_new(QUERY, 1);
         cur = cur->next;
       }
 
@@ -118,15 +120,15 @@ static QUERY *run_query (char *s, int quiet)
         l = mutt_strwidth (p);
         if (l > FirstColumn)
           FirstColumn = l;
-        cur->name = safe_strdup (p);
+        cur->name = m_strdup(p);
         p = strtok (NULL, "\t\n");
         if (p) {
-          cur->other = safe_strdup (p);
+          cur->other = m_strdup(p);
         }
       }
     }
   }
-  FREE (&buf);
+  p_delete(&buf);
   fclose (fp);
   if (mutt_wait_filter (thepid)) {
     debug_print (1, ("Error: %s\n", msg));
@@ -185,7 +187,7 @@ static void query_entry (char *s, size_t slen, MUTTMENU * m, int num)
   mutt_format_string (buf2, sizeof (buf2),
                       FirstColumn + 2, FirstColumn + 2,
                       0, ' ', table[num].data->name,
-                      safe_strlen (table[num].data->name), 0);
+                      m_strlen(table[num].data->name), 0);
 
   snprintf (s, slen, " %c %3d %s %-*.*s %s",
             table[num].tagged ? '*' : ' ',
@@ -287,8 +289,7 @@ static void query_menu (char *buf, size_t buflen, QUERY * results, int retbuf)
     for (queryp = results; queryp; queryp = queryp->next)
       menu->max++;
 
-    menu->data = QueryTable =
-      (ENTRY *) safe_calloc (menu->max, sizeof (ENTRY));
+    menu->data = QueryTable = p_new(ENTRY, menu->max);
 
     for (i = 0, queryp = results; queryp; queryp = queryp->next, i++)
       QueryTable[i].data = queryp;
@@ -310,14 +311,14 @@ static void query_menu (char *buf, size_t buflen, QUERY * results, int retbuf)
               queryp = results;
               while (queryp) {
                 rfc822_free_address (&queryp->addr);
-                FREE (&queryp->name);
-                FREE (&queryp->other);
+                p_delete(&queryp->name);
+                p_delete(&queryp->other);
                 results = queryp->next;
-                FREE (&queryp);
+                p_delete(&queryp);
                 queryp = results;
               }
               results = newresults;
-              FREE (&QueryTable);
+              p_delete(&QueryTable);
             }
             else {
               /* append */
@@ -344,8 +345,7 @@ static void query_menu (char *buf, size_t buflen, QUERY * results, int retbuf)
               menu->max++;
 
             if (op == OP_QUERY) {
-              menu->data = QueryTable =
-                (ENTRY *) safe_calloc (menu->max, sizeof (ENTRY));
+              menu->data = QueryTable = p_new(ENTRY, menu->max);
 
               for (i = 0, queryp = results; queryp;
                    queryp = queryp->next, i++)
@@ -355,7 +355,7 @@ static void query_menu (char *buf, size_t buflen, QUERY * results, int retbuf)
               int clear = 0;
 
               /* append */
-              safe_realloc (&QueryTable, menu->max * sizeof (ENTRY));
+              p_realloc(&QueryTable, menu->max);
 
               menu->data = QueryTable;
 
@@ -433,7 +433,7 @@ static void query_menu (char *buf, size_t buflen, QUERY * results, int retbuf)
       int tagged = 0;
       size_t curpos = 0;
 
-      memset (buf, 0, buflen);
+      p_clear(buf, buflen);
 
       /* check for tagged entries */
       for (i = 0; i < menu->max; i++) {
@@ -444,7 +444,7 @@ static void query_menu (char *buf, size_t buflen, QUERY * results, int retbuf)
             mutt_addrlist_to_local (tmpa);
             tagged = 1;
             rfc822_write_address (buf, buflen, tmpa, 0);
-            curpos = safe_strlen (buf);
+            curpos = m_strlen(buf);
             rfc822_free_address (&tmpa);
           }
           else if (curpos + 2 < buflen) {
@@ -454,7 +454,7 @@ static void query_menu (char *buf, size_t buflen, QUERY * results, int retbuf)
             strcat (buf, ", "); /* __STRCAT_CHECKED__ */
             rfc822_write_address ((char *) buf + curpos + 1,
                                   buflen - curpos - 1, tmpa, 0);
-            curpos = safe_strlen (buf);
+            curpos = m_strlen(buf);
             rfc822_free_address (&tmpa);
           }
         }
@@ -473,13 +473,13 @@ static void query_menu (char *buf, size_t buflen, QUERY * results, int retbuf)
     queryp = results;
     while (queryp) {
       rfc822_free_address (&queryp->addr);
-      FREE (&queryp->name);
-      FREE (&queryp->other);
+      p_delete(&queryp->name);
+      p_delete(&queryp->other);
       results = queryp->next;
-      FREE (&queryp);
+      p_delete(&queryp);
       queryp = results;
     }
-    FREE (&QueryTable);
+    p_delete(&QueryTable);
 
     /* tell whoever called me to redraw the screen when I return */
     set_option (OPTNEEDREDRAW);