rename alias functions

diff --git a/alias.c b/alias.c
index 4f41ac28e6706395a30603652764c7468281150c..bcf7b1ba7fecf0d9162b0418305d0fcfb1b01109 100644 (file)
--- a/alias.c
+++ b/alias.c
@@ -38,7 +38,7 @@
 #include "options.h"
 #include "protos.h"
 
-struct Address *mutt_lookup_alias(const char *s)
+struct Address *mutt_alias_lookup(const char *s)
 {
   struct Alias *t = Aliases;
 
@@ -58,7 +58,7 @@ static struct Address *expand_aliases_r(struct Address *a, struct ListHead *expn
   {
     if (!a->group && !a->personal && a->mailbox && strchr(a->mailbox, '@') == NULL)
     {
-      t = mutt_lookup_alias(a->mailbox);
+      t = mutt_alias_lookup(a->mailbox);
 
       if (t)
       {
@@ -275,7 +275,7 @@ int check_alias_name(const char *s, char *dest, size_t destlen)
   return rc;
 }
 
-void mutt_create_alias(struct Envelope *cur, struct Address *iaddr)
+void mutt_alias_create(struct Envelope *cur, struct Address *iaddr)
 {
   struct Alias *new = NULL, *t = NULL;
   char buf[LONG_STRING], tmp[LONG_STRING], prompt[SHORT_STRING], *pc = NULL;
@@ -312,7 +312,7 @@ retry_name:
     return;
 
   /* check to see if the user already has an alias defined */
-  if (mutt_lookup_alias(buf))
+  if (mutt_alias_lookup(buf))
   {
     mutt_error(_("You already have an alias defined with that name!"));
     return;
@@ -346,7 +346,7 @@ retry_name:
   {
     if (mutt_get_field(_("Address: "), buf, sizeof(buf), 0) != 0 || !buf[0])
     {
-      mutt_free_alias(&new);
+      mutt_alias_free(&new);
       return;
     }
 
@@ -367,7 +367,7 @@ retry_name:
 
   if (mutt_get_field(_("Personal name: "), buf, sizeof(buf), 0) != 0)
   {
-    mutt_free_alias(&new);
+    mutt_alias_free(&new);
     return;
   }
   new->addr->personal = mutt_str_strdup(buf);
@@ -377,7 +377,7 @@ retry_name:
   snprintf(prompt, sizeof(prompt), _("[%s = %s] Accept?"), new->name, buf);
   if (mutt_yesorno(prompt, MUTT_YES) != MUTT_YES)
   {
-    mutt_free_alias(&new);
+    mutt_alias_free(&new);
     return;
   }
 
@@ -583,7 +583,7 @@ int mutt_alias_complete(char *s, size_t buflen)
         Aliases = a_cur->next;
 
       a_cur->next = NULL;
-      mutt_free_alias(&a_cur);
+      mutt_alias_free(&a_cur);
 
       if (a_list)
         a_cur = a_list;
@@ -673,7 +673,7 @@ bool mutt_addr_is_user(struct Address *addr)
   return false;
 }
 
-void mutt_free_alias(struct Alias **p)
+void mutt_alias_free(struct Alias **p)
 {
   struct Alias *t = NULL;
 

diff --git a/alias.h b/alias.h
index 2732d6941cf5a4e1b9f7043f00decd4eda46162b..69029f80cf3d5ab76c156dc921e78431109a5a6a 100644 (file)
--- a/alias.h
+++ b/alias.h
@@ -41,11 +41,12 @@ struct Alias
   short num;
 };
 
-struct Address *mutt_lookup_alias(const char *s);
+void            mutt_alias_create(struct Envelope *cur, struct Address *iaddr);
+void            mutt_alias_free(struct Alias **p);
+struct Address *mutt_alias_lookup(const char *s);
+
 struct Address *mutt_expand_aliases(struct Address *a);
 void mutt_expand_aliases_env(struct Envelope *env);
 struct Address *mutt_get_address(struct Envelope *env, char **pfxp);
-void mutt_create_alias(struct Envelope *cur, struct Address *iaddr);
-void mutt_free_alias(struct Alias **p);
 
 #endif /* _MUTT_ALIAS_H */

diff --git a/curs_main.c b/curs_main.c
index 58e6fa69ac6ceaca2caa2827aa48f05280c81b41..f924dfc871b948bcb117e830ef95807687f0d67c 100644 (file)
--- a/curs_main.c
+++ b/curs_main.c
@@ -2806,7 +2806,7 @@ int mutt_index_menu(void)
 
       case OP_CREATE_ALIAS:
 
-        mutt_create_alias(Context && Context->vcount ? CURHDR->env : NULL, NULL);
+        mutt_alias_create(Context && Context->vcount ? CURHDR->env : NULL, NULL);
         menu->redraw |= REDRAW_CURRENT;
         break;
 

diff --git a/init.c b/init.c
index 3fb531b5f1990a0b88a646e68af14d7295b39865..94947b620eead2db48c1c3921bc7f20a57cf4e4f 100644 (file)
--- a/init.c
+++ b/init.c
@@ -1660,7 +1660,7 @@ static int parse_unalias(struct Buffer *buf, struct Buffer *s,
         mutt_set_current_menu_redraw_full();
       }
       else
-        mutt_free_alias(&Aliases);
+        mutt_alias_free(&Aliases);
       break;
     }
     else
@@ -1681,7 +1681,7 @@ static int parse_unalias(struct Buffer *buf, struct Buffer *s,
           else
             Aliases = tmp->next;
           tmp->next = NULL;
-          mutt_free_alias(&tmp);
+          mutt_alias_free(&tmp);
           break;
         }
         last = tmp;

diff --git a/main.c b/main.c
index fbf1eb621d3db5020269098fa15b8ca9c6c31ec1..f57d6b9d9123508dd2e13c91891b501d3bf46fdb 100644 (file)
--- a/main.c
+++ b/main.c
@@ -596,7 +596,7 @@ int main(int argc, char *argv[], char *envp[])
     struct ListNode *np;
     STAILQ_FOREACH(np, &alias_queries, entries)
     {
-      a = mutt_lookup_alias(np->data);
+      a = mutt_alias_lookup(np->data);
       if (a)
       {
         /* output in machine-readable form */

diff --git a/muttlib.c b/muttlib.c
index dad4466ddde5276f9a4b0014d0025f482e95f5a2..c89ed506f2b643ca3e0bd14c3b309c00d287b058 100644 (file)
--- a/muttlib.c
+++ b/muttlib.c
@@ -210,7 +210,7 @@ char *mutt_expand_path_regex(char *s, size_t slen, int regex)
         struct Header *h = NULL;
         struct Address *alias = NULL;
 
-        alias = mutt_lookup_alias(s + 1);
+        alias = mutt_alias_lookup(s + 1);
         if (alias)
         {
           h = mutt_header_new();

diff --git a/pager.c b/pager.c
index 6f9e3b9e225578ae9777e431840c9333e07252dc..261e621e0059cd8ca74d53c705667099fc7d8ac1 100644 (file)
--- a/pager.c
+++ b/pager.c
@@ -2771,9 +2771,9 @@ int mutt_pager(const char *banner, const char *fname, int flags, struct Pager *e
       case OP_CREATE_ALIAS:
         CHECK_MODE(IsHeader(extra) || IsMsgAttach(extra));
         if (IsMsgAttach(extra))
-          mutt_create_alias(extra->bdy->hdr->env, NULL);
+          mutt_alias_create(extra->bdy->hdr->env, NULL);
         else
-          mutt_create_alias(extra->hdr->env, NULL);
+          mutt_alias_create(extra->hdr->env, NULL);
         break;
 
       case OP_PURGE_MESSAGE:

diff --git a/query.c b/query.c
index 2d0b5a85d3b6878a3ceb3dd4602c1de885db2d2d..83a10477d32856135460efcc5779b25a978d05e7 100644 (file)
--- a/query.c
+++ b/query.c
@@ -441,13 +441,13 @@ static void query_menu(char *buf, size_t buflen, struct Query *results, int retb
               }
             }
 
-            mutt_create_alias(NULL, naddr);
+            mutt_alias_create(NULL, naddr);
             mutt_addr_free(&naddr);
           }
           else
           {
             struct Address *a = result_to_addr(QueryTable[menu->current].data);
-            mutt_create_alias(NULL, a);
+            mutt_alias_create(NULL, a);
             mutt_addr_free(&a);
           }
           break;