ADDRESS -> address_t

[apps/madmutt.git] / query.c

diff --git a/query.c b/query.c
index 1f164da..1cf41d2 100644 (file)
--- a/query.c
+++ b/query.c
@@ -14,11 +14,12 @@
 #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 "mutt.h"
 #include "mutt_menu.h"
 #include "mutt_idna.h"
-#include "mapping.h"
 #include "sort.h"
 
 #include "lib/debug.h"
@@ -28,7 +29,7 @@
 #include <ctype.h>
 
 typedef struct query {
-  ADDRESS *addr;
+  address_t *addr;
   char *name;
   char *other;
   struct query *next;
@@ -56,9 +57,9 @@ static int SecondColumn;
 static void query_menu (char *buf, size_t buflen, QUERY * results,
                         int retbuf);
 
-static ADDRESS *result_to_addr (QUERY * r)
+static address_t *result_to_addr (QUERY * r)
 {
-  static ADDRESS *tmp;
+  static address_t *tmp;
 
   tmp = rfc822_cpy_adr (r->addr);
 
@@ -208,7 +209,7 @@ static int query_tag (MUTTMENU * menu, int n, int m)
 int mutt_query_complete (char *buf, size_t buflen)
 {
   QUERY *results = NULL;
-  ADDRESS *tmpa;
+  address_t *tmpa;
 
   if (!QueryCmd) {
     mutt_error _("Query command not defined.");
@@ -375,11 +376,11 @@ static void query_menu (char *buf, size_t buflen, QUERY * results, int retbuf)
 
       case OP_CREATE_ALIAS:
         if (menu->tagprefix) {
-          ADDRESS *naddr = NULL;
+          address_t *naddr = NULL;
 
           for (i = 0; i < menu->max; i++)
             if (QueryTable[i].tagged) {
-              ADDRESS *a = result_to_addr (QueryTable[i].data);
+              address_t *a = result_to_addr (QueryTable[i].data);
 
               rfc822_append (&naddr, a);
               rfc822_free_address (&a);
@@ -388,7 +389,7 @@ static void query_menu (char *buf, size_t buflen, QUERY * results, int retbuf)
           mutt_create_alias (NULL, naddr);
         }
         else {
-          ADDRESS *a = result_to_addr (QueryTable[menu->current].data);
+          address_t *a = result_to_addr (QueryTable[menu->current].data);
 
           mutt_create_alias (NULL, a);
           rfc822_free_address (&a);
@@ -411,7 +412,7 @@ static void query_menu (char *buf, size_t buflen, QUERY * results, int retbuf)
         else {
           for (i = 0; i < menu->max; i++)
             if (QueryTable[i].tagged) {
-              ADDRESS *a = result_to_addr (QueryTable[i].data);
+              address_t *a = result_to_addr (QueryTable[i].data);
 
               rfc822_append (&msg->env->to, a);
               rfc822_free_address (&a);
@@ -432,13 +433,13 @@ 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++) {
         if (QueryTable[i].tagged) {
           if (curpos == 0) {
-            ADDRESS *tmpa = result_to_addr (QueryTable[i].data);
+            address_t *tmpa = result_to_addr (QueryTable[i].data);
 
             mutt_addrlist_to_local (tmpa);
             tagged = 1;
@@ -447,7 +448,7 @@ static void query_menu (char *buf, size_t buflen, QUERY * results, int retbuf)
             rfc822_free_address (&tmpa);
           }
           else if (curpos + 2 < buflen) {
-            ADDRESS *tmpa = result_to_addr (QueryTable[i].data);
+            address_t *tmpa = result_to_addr (QueryTable[i].data);
 
             mutt_addrlist_to_local (tmpa);
             strcat (buf, ", "); /* __STRCAT_CHECKED__ */
@@ -460,7 +461,7 @@ static void query_menu (char *buf, size_t buflen, QUERY * results, int retbuf)
       }
       /* then enter current message */
       if (!tagged) {
-        ADDRESS *tmpa = result_to_addr (QueryTable[menu->current].data);
+        address_t *tmpa = result_to_addr (QueryTable[menu->current].data);
 
         mutt_addrlist_to_local (tmpa);
         rfc822_write_address (buf, buflen, tmpa, 0);