X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=gom%2Faddress.c;h=58d11758b41b284ac1467dd6bd916afcd9c684cb;hb=60162324857b1e8d84b8346d99f8b7dce07d0d40;hp=b0d49a06f42cc556ae4326c92098c7c4fc37db56;hpb=327069289a45ed1e91d8bfc07d7d89cfbad057d6;p=gedcom-parse.git

diff --git a/gom/address.c b/gom/address.c
index b0d49a0..58d1175 100644
--- a/gom/address.c
+++ b/gom/address.c
@@ -43,7 +43,8 @@ Gedcom_ctxt sub_addr_start(_ELT_PARAMS_)
   else {
     struct address *addr = SUB_MAKEFUNC(address)();
     if (addr) {
-      switch (ctxt->ctxt_type) {
+      int type = ctxt_type(ctxt);
+      switch (type) {
 	case ELT_HEAD_SOUR_CORP:
 	  ADDFUNC2_NOLIST(header,address)(ctxt, addr); break;
 	case ELT_SUB_FAM_EVT:
@@ -60,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);
     }
@@ -76,13 +77,13 @@ 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_ADDFUNC(address)
+DEFINE_SUB_SETFUNC(address)
 DEFINE_SUB_DELETEFUNC(address)
 
 DEFINE_STRING_END_CB(address, sub_addr_end, full_label)
@@ -104,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:
@@ -120,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;
 }