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

diff --git a/gom/address.c b/gom/address.c
index 916737a..58d1175 100644
--- a/gom/address.c
+++ b/gom/address.c
@@ -41,12 +41,10 @@ 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));
-      switch (ctxt->ctxt_type) {
+    struct address *addr = SUB_MAKEFUNC(address)();
+    if (addr) {
+      int type = ctxt_type(ctxt);
+      switch (type) {
 	case ELT_HEAD_SOUR_CORP:
 	  ADDFUNC2_NOLIST(header,address)(ctxt, addr); break;
 	case ELT_SUB_FAM_EVT:
@@ -63,7 +61,7 @@ Gedcom_ctxt sub_addr_start(_ELT_PARAMS_)
 	case REC_SUBM:
 	  ADDFUNC2_NOLIST(submitter,address)(ctxt, addr); break;
 	default:
-	  UNEXPECTED_CONTEXT(ctxt->ctxt_type);
+	  UNEXPECTED_CONTEXT(type);
       }
       result = MAKE_GOM_CTXT(elt, address, addr);
     }
@@ -79,11 +77,15 @@ Gedcom_ctxt sub_addr_cont_start(_ELT_PARAMS_)
   if (! ctxt)
     NO_CONTEXT;
   else {
-    result = make_gom_ctxt(elt, ctxt->ctxt_type, ctxt->ctxt_ptr);
+    result = dup_gom_ctxt(ctxt, elt);
   }
   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)
@@ -103,7 +105,8 @@ Gedcom_ctxt sub_phon_start(_ELT_PARAMS_)
     NO_CONTEXT;
   else {
     char *str = GEDCOM_STRING(parsed_value);
-    switch (ctxt->ctxt_type) {
+    int type = ctxt_type(ctxt);
+    switch (type) {
       case ELT_HEAD_SOUR_CORP:
 	header_add_phone(ctxt, str); break;
       case ELT_SUB_FAM_EVT:
@@ -119,9 +122,9 @@ Gedcom_ctxt sub_phon_start(_ELT_PARAMS_)
       case REC_SUBM:
 	submitter_add_phone(ctxt, str); break;
       default:
-	UNEXPECTED_CONTEXT(ctxt->ctxt_type);
+	UNEXPECTED_CONTEXT(type);
     }
-    result = make_gom_ctxt(elt, ctxt->obj_type, ctxt->ctxt_ptr);
+    result = dup_gom_ctxt(ctxt, elt);
   }
   return (Gedcom_ctxt)result;
 }
@@ -146,6 +149,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) {