X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=alias.h;h=88fb81ddb3d6139caeb66dc2c5ba8a6070fadef1;hb=d4321859bb9ce5b43fbd8303394cf98ae7720a38;hp=59086f5b568919bde82cc584b760d40ab5f5eb2b;hpb=c88f8ebd5e7542e4ee2ac2c24dfd5f358dbb4235;p=apps%2Fmadmutt.git

diff --git a/alias.h b/alias.h
index 59086f5..88fb81d 100644
--- a/alias.h
+++ b/alias.h
@@ -9,28 +9,37 @@
 #ifndef _MUTT_ALIAS_H
 #define _MUTT_ALIAS_H
 
+#include <lib-lib/list.h>
 #include <lib-mime/mime.h>
 
-typedef struct alias {
-  struct alias *self;           /* XXX - ugly hack */
+typedef struct alias_t {
+  struct alias_t *next;
   char *name;
   address_t *addr;
-  struct alias *next;
   short tagged;
   short del;
   short num;
-} ALIAS;
-
-void mutt_create_alias (ENVELOPE *, address_t *);
-int mutt_check_alias_name (const char *, char *);
-address_t *mutt_get_address (ENVELOPE *, const char **);
-address_t *mutt_lookup_alias (const char *s);
-address_t *mutt_expand_aliases (address_t *);
-void mutt_expand_aliases_env (ENVELOPE *);
-void mutt_free_alias (ALIAS **);
-address_t *alias_reverse_lookup (address_t *);
-int mutt_alias_complete (char *, size_t);
-int mutt_addr_is_user (address_t *);
-void mutt_alias_menu (char *, size_t, ALIAS *);
+} alias_t;
+
+DO_INIT(alias_t, alias);
+static inline void alias_wipe(alias_t *a) {
+    address_list_wipe(&a->addr);
+}
+
+DO_NEW(alias_t, alias);
+DO_DELETE(alias_t, alias);
+DO_SLIST(alias_t, alias, alias_delete);
+
+const address_t *alias_lookup(const alias_t *list, const char *s);
+const address_t *alias_reverse_lookup(const alias_t *list, const address_t *);
+
+int mutt_addr_is_user(address_t *);
+address_t *mutt_get_address(ENVELOPE *, const char **);
+void mutt_create_alias(ENVELOPE *, address_t *);
+
+address_t *mutt_expand_aliases(address_t *);
+void mutt_expand_aliases_env(ENVELOPE *);
+int mutt_alias_complete(char *, size_t);
+void mutt_alias_menu(char *, size_t, alias_t *);
 
 #endif /* !_MUTT_ALIAS_H */