ADDRESS -> address_t

[apps/madmutt.git] / alias.c

diff --git a/alias.c b/alias.c
index 835d55a..aec85d6 100644 (file)
--- a/alias.c
+++ b/alias.c
@@ -42,7 +42,7 @@ static struct mapping_t AliasHelp[] = {
   {NULL, OP_NULL}
 };
 
-ADDRESS *mutt_lookup_alias (const char *s)
+address_t *mutt_lookup_alias (const char *s)
 {
   ALIAS *t = Aliases;
 
@@ -52,9 +52,9 @@ ADDRESS *mutt_lookup_alias (const char *s)
   return (NULL);                /* no such alias */
 }
 
-static ADDRESS *mutt_expand_aliases_r (ADDRESS * a, LIST ** expn)
+static address_t *mutt_expand_aliases_r (address_t * a, LIST ** expn)
 {
-  ADDRESS *head = NULL, *last = NULL, *t, *w;
+  address_t *head = NULL, *last = NULL, *t, *w;
   LIST *u;
   char i;
   const char *fqdn;
@@ -124,9 +124,9 @@ static ADDRESS *mutt_expand_aliases_r (ADDRESS * a, LIST ** expn)
   return (head);
 }
 
-ADDRESS *mutt_expand_aliases (ADDRESS * a)
+address_t *mutt_expand_aliases (address_t * a)
 {
-  ADDRESS *t;
+  address_t *t;
   LIST *expn = NULL;            /* previously expanded aliases to avoid loops */
 
   t = mutt_expand_aliases_r (a, &expn);
@@ -176,9 +176,9 @@ static void write_safe_address (FILE * fp, char *s)
   }
 }
 
-ADDRESS *mutt_get_address (ENVELOPE * env, const char **pfxp)
+address_t *mutt_get_address (ENVELOPE * env, const char **pfxp)
 {
-  ADDRESS *adr;
+  address_t *adr;
   const char *pfx = NULL;
 
   if (mutt_addr_is_user (env->from)) {
@@ -206,14 +206,14 @@ ADDRESS *mutt_get_address (ENVELOPE * env, const char **pfxp)
   return adr;
 }
 
-void mutt_create_alias (ENVELOPE * cur, ADDRESS * iadr)
+void mutt_create_alias (ENVELOPE * cur, address_t * iadr)
 {
   ALIAS *new, *t;
   char buf[LONG_STRING], prompt[SHORT_STRING], *pc;
   char *err = NULL;
   char fixed[LONG_STRING];
   FILE *rc;
-  ADDRESS *adr = NULL;
+  address_t *adr = NULL;
 
   if (cur) {
     adr = mutt_get_address (cur, NULL);
@@ -369,10 +369,10 @@ int mutt_check_alias_name (const char *s, char *d)
  * This routine looks to see if the user has an alias defined for the given
  * address.
  */
-ADDRESS *alias_reverse_lookup (ADDRESS * a)
+address_t *alias_reverse_lookup (address_t * a)
 {
   ALIAS *t = Aliases;
-  ADDRESS *ap;
+  address_t *ap;
 
   if (!a || !a->mailbox)
     return NULL;
@@ -495,7 +495,7 @@ static int string_is_address (const char *str, const char *u, const char *d)
 }
 
 /* returns TRUE if the given address belongs to the user. */
-int mutt_addr_is_user (ADDRESS * addr)
+int mutt_addr_is_user (address_t * addr)
 {
   /* NULL address is assumed to be the user. */
   if (!addr) {
@@ -605,8 +605,8 @@ static int alias_SortAlias (const void *a, const void *b)
 
 static int alias_SortAddress (const void *a, const void *b)
 {
-  ADDRESS *pa = (*(ALIAS **) a)->addr;
-  ADDRESS *pb = (*(ALIAS **) b)->addr;
+  address_t *pa = (*(ALIAS **) a)->addr;
+  address_t *pb = (*(ALIAS **) b)->addr;
   int r;
 
   if (pa == pb)