ADDRESS -> address_t

[apps/madmutt.git] / lib-mime / rfc822.c

diff --git a/lib-mime/rfc822.c b/lib-mime/rfc822.c
index 82c3e7c..0337478 100644 (file)
--- a/lib-mime/rfc822.c
+++ b/lib-mime/rfc822.c
@@ -79,9 +79,9 @@ void rfc822_dequote_comment (char *s)
   *w = 0;
 }
 
-void rfc822_free_address (ADDRESS ** p)
+void rfc822_free_address (address_t ** p)
 {
-  ADDRESS *t;
+  address_t *t;
 
   while (*p) {
     t = *p;
@@ -202,7 +202,7 @@ static const char *parse_address (const char *s,
                                   char *token, size_t * tokenlen,
                                   size_t tokenmax, char *comment,
                                   size_t * commentlen, size_t commentmax,
-                                  ADDRESS * addr)
+                                  address_t * addr)
 {
   s = parse_mailboxdomain (s, ".\"(\\",
                            token, tokenlen, tokenmax,
@@ -233,7 +233,7 @@ static const char *parse_address (const char *s,
 
 static const char *parse_route_addr (const char *s,
                                      char *comment, size_t * commentlen,
-                                     size_t commentmax, ADDRESS * addr)
+                                     size_t commentmax, address_t * addr)
 {
   char token[STRING];
   size_t tokenlen = 0;
@@ -278,7 +278,7 @@ static const char *parse_route_addr (const char *s,
 
 static const char *parse_addr_spec (const char *s,
                                     char *comment, size_t * commentlen,
-                                    size_t commentmax, ADDRESS * addr)
+                                    size_t commentmax, address_t * addr)
 {
   char token[STRING];
   size_t tokenlen = 0;
@@ -294,10 +294,10 @@ static const char *parse_addr_spec (const char *s,
 }
 
 static void
-add_addrspec (ADDRESS ** top, ADDRESS ** last, const char *phrase,
+add_addrspec (address_t ** top, address_t ** last, const char *phrase,
               char *comment, size_t * commentlen, size_t commentmax)
 {
-  ADDRESS *cur = rfc822_new_address ();
+  address_t *cur = rfc822_new_address ();
 
   if (parse_addr_spec (phrase, comment, commentlen, commentmax, cur) == NULL) {
     rfc822_free_address (&cur);
@@ -311,13 +311,13 @@ add_addrspec (ADDRESS ** top, ADDRESS ** last, const char *phrase,
   *last = cur;
 }
 
-ADDRESS *rfc822_parse_adrlist (ADDRESS * top, const char *s)
+address_t *rfc822_parse_adrlist (address_t * top, const char *s)
 {
   int ws_pending;
   const char *begin, *ps;
   char comment[STRING], phrase[STRING];
   size_t phraselen = 0, commentlen = 0;
-  ADDRESS *cur, *last = NULL;
+  address_t *cur, *last = NULL;
 
   RFC822Error = 0;
 
@@ -452,7 +452,7 @@ ADDRESS *rfc822_parse_adrlist (ADDRESS * top, const char *s)
   return top;
 }
 
-void rfc822_qualify (ADDRESS * addr, const char *host)
+void rfc822_qualify (address_t * addr, const char *host)
 {
   char *p;
 
@@ -489,7 +489,7 @@ rfc822_cat (char *buf, size_t buflen, const char *value, const char *specials)
     m_strcpy(buf, buflen, value);
 }
 
-void rfc822_write_address_single (char *buf, size_t buflen, ADDRESS * addr,
+void rfc822_write_address_single (char *buf, size_t buflen, address_t * addr,
                                   int display)
 {
   size_t len;
@@ -595,7 +595,7 @@ done:
 }
 
 /* note: it is assumed that `buf' is nul terminated! */
-void rfc822_write_address (char *buf, size_t buflen, ADDRESS * addr,
+void rfc822_write_address (char *buf, size_t buflen, address_t * addr,
                            int display)
 {
   char *pbuf = buf;
@@ -648,9 +648,9 @@ done:
 }
 
 /* this should be rfc822_cpy_adr */
-ADDRESS *rfc822_cpy_adr_real (ADDRESS * addr)
+address_t *rfc822_cpy_adr_real (address_t * addr)
 {
-  ADDRESS *p = rfc822_new_address ();
+  address_t *p = rfc822_new_address ();
 
   p->personal = m_strdup(addr->personal);
   p->mailbox = m_strdup(addr->mailbox);
@@ -659,9 +659,9 @@ ADDRESS *rfc822_cpy_adr_real (ADDRESS * addr)
 }
 
 /* this should be rfc822_cpy_adrlist */
-ADDRESS *rfc822_cpy_adr (ADDRESS * addr)
+address_t *rfc822_cpy_adr (address_t * addr)
 {
-  ADDRESS *top = NULL, *last = NULL;
+  address_t *top = NULL, *last = NULL;
 
   for (; addr; addr = addr->next) {
     if (last) {
@@ -675,9 +675,9 @@ ADDRESS *rfc822_cpy_adr (ADDRESS * addr)
 }
 
 /* append list 'b' to list 'a' and return the last element in the new list */
-ADDRESS *rfc822_append (ADDRESS ** a, ADDRESS * b)
+address_t *rfc822_append (address_t ** a, address_t * b)
 {
-  ADDRESS *tmp = *a;
+  address_t *tmp = *a;
 
   while (tmp && tmp->next)
     tmp = tmp->next;