X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-mime%2Fmime.h;h=90f8c6894405a34b788977f3e62afb0db6c45f3e;hp=1cf264ae2043d68e37132903297641304a8e07be;hb=c5d1c5652337aba93824f370f5164827a2d46017;hpb=ab12fea9d01b3b9bc53081ae4ccc046243f1cb9f

diff --git a/lib-mime/mime.h b/lib-mime/mime.h
index 1cf264a..90f8c68 100644
--- a/lib-mime/mime.h
+++ b/lib-mime/mime.h
@@ -31,6 +31,9 @@
 
 #include <stdlib.h>
 
+#include <lib-lib/mem.h>
+#include <lib-lib/list.h>
+
 /* Content-Type */
 enum {
     TYPEOTHER,
@@ -87,39 +90,35 @@ extern const char *BodyEncodings[];
 /*                Standard for ARPA Internet Text Messages                  */
 /****************************************************************************/
 
-/* possible values for RFC822Error */
-enum {
-    ERR_MEMORY = 1,
-    ERR_MISMATCH_PAREN,
-    ERR_MISMATCH_QUOTE,
-    ERR_BAD_ROUTE,
-    ERR_BAD_ROUTE_ADDR,
-    ERR_BAD_ADDR_SPEC
-};
-
 typedef struct address_t {
     char *personal;               /* real name of address */
     char *mailbox;                /* mailbox and host address */
     int group;                    /* group mailbox? */
     struct address_t *next;
-} ADDRESS;
-
-void rfc822_free_address(ADDRESS **);
-void rfc822_qualify(ADDRESS *, const char *);
-ADDRESS *rfc822_parse_adrlist(ADDRESS *, const char *s);
-ADDRESS *rfc822_cpy_adr(ADDRESS * addr);
-ADDRESS *rfc822_cpy_adr_real(ADDRESS * addr);
-ADDRESS *rfc822_append(ADDRESS ** a, ADDRESS * b);
-void rfc822_write_address(char *, size_t, ADDRESS *, int);
-void rfc822_write_address_single(char *, size_t, ADDRESS *, int);
+} address_t;
+
+DO_INIT(address_t, address);
+void address_wipe(address_t *);
+
+DO_NEW(address_t, address);
+DO_DELETE(address_t, address);
+DO_SLIST(address_t, address);
+
+
+address_t *address_dup(address_t *addr);
+address_t *address_list_dup(address_t *addr);
+void rfc822_qualify(address_t *, const char *);
+
+address_t *rfc822_parse_adrlist(address_t *, const char *s);
+
+void rfc822_write_address(char *, size_t, address_t *, int);
+void rfc822_write_address_single(char *, size_t, address_t *, int);
 void rfc822_cat(char *, size_t, const char *, const char *);
 
 extern int RFC822Error;
-extern const char *RFC822Errors[];
 extern const char RFC822Specials[];
 
 #define rfc822_error(x) RFC822Errors[x]
-#define rfc822_new_address() calloc(1,sizeof(ADDRESS))
 
 /****************************************************************************/
 /* RFC 2231                                                                 */