prepare documentation of the APIs

[apps/madmutt.git] / alias.c

diff --git a/alias.c b/alias.c
index 68afc25..c511fd7 100644 (file)
--- a/alias.c
+++ b/alias.c
@@ -272,7 +272,7 @@ void mutt_create_alias(ENVELOPE *cur, address_t *iadr)
     new->addr->personal = m_strdup(buf);
 
     buf[0] = '\0';
-    rfc822_write_address(buf, sizeof(buf), new->addr, 1);
+    rfc822_addrcat(buf, sizeof(buf), new->addr, 1);
     snprintf(prompt, sizeof(prompt), _("[%s = %s] Accept?"), new->name, buf);
     if (mutt_yesorno(prompt, M_YES) != M_YES) {
         alias_list_wipe(&new);
@@ -298,7 +298,7 @@ void mutt_create_alias(ENVELOPE *cur, address_t *iadr)
         }
 
         buf[0] = '\0';
-        rfc822_write_address(buf, sizeof(buf), new->addr, 0);
+        rfc822_addrcat(buf, sizeof(buf), new->addr, 0);
         write_safe_address(rc, buf);
         m_fclose(&rc);
         mutt_message _("Alias added.");
@@ -355,9 +355,7 @@ static address_t *mutt_expand_aliases_r(address_t *a, string_list_t **expn)
 
     if (option(OPTUSEDOMAIN)) {
         /* now qualify all local addresses */
-        const char *fqdn = mutt_fqdn(1);
-        if (fqdn)
-            rfc822_qualify(head, fqdn);
+        rfc822_qualify(head, mutt_fqdn(1));
     }
 
     return head;
@@ -499,7 +497,7 @@ static const format_t *alias_format_str (char *dest, size_t destlen, char op,
     break;
   case 'r':
     adr[0] = '\0';
-    rfc822_write_address(adr, sizeof(adr), alias->addr, 1);
+    rfc822_addrcat(adr, sizeof(adr), alias->addr, 1);
     snprintf(tmp, sizeof(tmp), "%%%ss", fmt);
     snprintf(dest, destlen, tmp, adr);
     break;
@@ -659,14 +657,14 @@ new_aliases:
   for (i = 0; i < menu->max; i++) {
     if (AliasTable[i]->tagged) {
       mutt_addrlist_to_local (AliasTable[i]->addr);
-      rfc822_write_address (buf, buflen, AliasTable[i]->addr, 0);
+      rfc822_addrcat(buf, buflen, AliasTable[i]->addr, 0);
       t = -1;
     }
   }
 
   if (t != -1) {
     mutt_addrlist_to_local (AliasTable[t]->addr);
-    rfc822_write_address (buf, buflen, AliasTable[t]->addr, 0);
+    rfc822_addrcat(buf, buflen, AliasTable[t]->addr, 0);
   }
 
   mutt_menuDestroy (&menu);