X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=gom%2Ffamily_link.c;h=39a2140c865b452b3f213231b947ad28a3f6c3fb;hb=72689522e287ca3b2231e7d8881f0fe5bea48f15;hp=1ab6d4b668b23e7ebd6ff05bd33ec499c6972290;hpb=4946f8418bfa1c41bb410995dbc9c5ac272c4c74;p=gedcom-parse.git

diff --git a/gom/family_link.c b/gom/family_link.c
index 1ab6d4b..39a2140 100644
--- a/gom/family_link.c
+++ b/gom/family_link.c
@@ -49,7 +49,7 @@ Gedcom_ctxt sub_fam_link_start(_ELT_PARAMS_)
       
       switch (ctxt->ctxt_type) {
 	case REC_INDI:
-	  individual_add_family_link(ctxt, elt, link); break;
+	  ADDFUNC2(individual,family_link)(ctxt, elt, link); break;
 	default:
 	  UNEXPECTED_CONTEXT(ctxt->ctxt_type);
       }
@@ -87,6 +87,9 @@ Gedcom_ctxt sub_fam_link_pedi_start(_ELT_PARAMS_)
   return (Gedcom_ctxt)result;
 }
 
+DEFINE_ADDFUNC2(family_link, note_sub, note)
+DEFINE_ADDFUNC2(family_link, user_data, extra)
+
 void family_link_subscribe()
 {
   gedcom_subscribe_to_element(ELT_SUB_FAMC, sub_fam_link_start,
@@ -97,33 +100,19 @@ void family_link_subscribe()
 			      def_elt_end);
 }
 
-void family_link_add_note(Gom_ctxt ctxt, struct note_sub* note)
-{
-  struct family_link *link = SAFE_CTXT_CAST(family_link, ctxt);
-  if (link)
-    LINK_CHAIN_ELT(note_sub, link->note, note);
-}
-
-void family_link_add_user_data(Gom_ctxt ctxt, struct user_data* data)
-{
-  struct family_link *obj = SAFE_CTXT_CAST(family_link, ctxt);
-  if (obj)
-    LINK_CHAIN_ELT(user_data, obj->extra, data);
-}
-
-void pedigree_cleanup(struct pedigree* ped)
+void CLEANFUNC(pedigree)(struct pedigree* ped)
 {
   if (ped) {
     SAFE_FREE(ped->pedigree);
   }
 }
 
-void family_link_cleanup(struct family_link *link)
+void CLEANFUNC(family_link)(struct family_link *link)
 {
   if (link) {
-    DESTROY_CHAIN_ELTS(pedigree, link->pedigree, pedigree_cleanup);
-    DESTROY_CHAIN_ELTS(note_sub, link->note, note_sub_cleanup);
-    DESTROY_CHAIN_ELTS(user_data, link->extra, user_data_cleanup);
+    DESTROY_CHAIN_ELTS(pedigree, link->pedigree);
+    DESTROY_CHAIN_ELTS(note_sub, link->note);
+    DESTROY_CHAIN_ELTS(user_data, link->extra);
   }
 }