X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=alias.h;h=244c0a47af7a455ee39fad720d53eed7c58c267a;hp=f20e8af5c45f194b2c8e39b152b01cec2b0b45a2;hb=108f3c7ab59844591f7540347914ea57be5245e2;hpb=ab12fea9d01b3b9bc53081ae4ccc046243f1cb9f

diff --git a/alias.h b/alias.h
index f20e8af..244c0a4 100644
--- a/alias.h
+++ b/alias.h
@@ -9,28 +9,36 @@
 #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 *addr;
-  struct alias *next;
+  address_t *addr;
   short tagged;
   short del;
   short num;
-} ALIAS;
+} alias_t;
 
-void mutt_create_alias (ENVELOPE *, ADDRESS *);
-int mutt_check_alias_name (const char *, char *);
-ADDRESS *mutt_get_address (ENVELOPE *, const char **);
-ADDRESS *mutt_lookup_alias (const char *s);
-ADDRESS *mutt_expand_aliases (ADDRESS *);
-void mutt_expand_aliases_env (ENVELOPE *);
-void mutt_free_alias (ALIAS **);
-ADDRESS *alias_reverse_lookup (ADDRESS *);
-int mutt_alias_complete (char *, size_t);
-int mutt_addr_is_user (ADDRESS *);
-void mutt_alias_menu (char *, size_t, ALIAS *);
+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);
+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 *);
+address_t *alias_reverse_lookup(address_t *);
+int mutt_alias_complete(char *, size_t);
+void mutt_alias_menu(char *, size_t, alias_t *);
 
 #endif /* !_MUTT_ALIAS_H */