X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=gom%2Faddress.c;h=553fa12cb835d01773f36556efba2fa81c345776;hb=83b1b8c2545fb21b40e2c7cdf7eceb82d3ceda1e;hp=916737a43ac59a7080e4ff07740375a7ceb94fff;hpb=72689522e287ca3b2231e7d8881f0fe5bea48f15;p=gedcom-parse.git

diff --git a/gom/address.c b/gom/address.c
index 916737a..553fa12 100644
--- a/gom/address.c
+++ b/gom/address.c
@@ -41,11 +41,8 @@ Gedcom_ctxt sub_addr_start(_ELT_PARAMS_)
   if (!ctxt)
     NO_CONTEXT;
   else {
-    struct address *addr = (struct address *)malloc(sizeof(struct address));
-    if (!addr)
-      MEMORY_ERROR;
-    else {
-      memset (addr, 0, sizeof(struct address));
+    struct address *addr = SUB_MAKEFUNC(address)();
+    if (addr) {
       switch (ctxt->ctxt_type) {
 	case ELT_HEAD_SOUR_CORP:
 	  ADDFUNC2_NOLIST(header,address)(ctxt, addr); break;
@@ -84,6 +81,10 @@ Gedcom_ctxt sub_addr_cont_start(_ELT_PARAMS_)
   return (Gedcom_ctxt)result;
 }
 
+DEFINE_SUB_MAKEFUNC(address)
+DEFINE_SUB_SETFUNC(address)
+DEFINE_SUB_DELETEFUNC(address)
+
 DEFINE_STRING_END_CB(address, sub_addr_end, full_label)
 DEFINE_STRING_CB(address, sub_addr_adr1_start, line1)
 DEFINE_STRING_CB(address, sub_addr_adr2_start, line2)
@@ -146,6 +147,13 @@ void address_subscribe()
   gedcom_subscribe_to_element(ELT_SUB_PHON, sub_phon_start, def_elt_end);
 }
 
+void UNREFALLFUNC(address)(struct address *address)
+{
+  if (address) {
+    UNREFALLFUNC(user_data)(address->extra);
+  }
+}
+
 void CLEANFUNC(address)(struct address *address)
 {
   if (address) {