use my usual API's for allocation/deallocation right now.

[apps/madmutt.git] / lib-mime / mime.h

diff --git a/lib-mime/mime.h b/lib-mime/mime.h
index 1cf264a..34e1b0f 100644 (file)
--- a/lib-mime/mime.h
+++ b/lib-mime/mime.h
@@ -31,6 +31,8 @@
 
 #include <stdlib.h>
 
+#include <lib-lib/mem.h>
+
 /* Content-Type */
 enum {
     TYPEOTHER,
@@ -102,16 +104,21 @@ typedef struct address_t {
     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);
+
+void rfc822_qualify(address_t *, const char *);
+address_t *rfc822_parse_adrlist(address_t *, const char *s);
+address_t *rfc822_cpy_adr(address_t * addr);
+address_t *rfc822_cpy_adr_real(address_t * addr);
+address_t *rfc822_append(address_t ** a, address_t * b);
+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;
@@ -119,7 +126,6 @@ extern const char *RFC822Errors[];
 extern const char RFC822Specials[];
 
 #define rfc822_error(x) RFC822Errors[x]
-#define rfc822_new_address() calloc(1,sizeof(ADDRESS))
 
 /****************************************************************************/
 /* RFC 2231                                                                 */