X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=gom%2Ffamily_link.c;h=cb5435be90781d1f18c3726236479e3da24319de;hb=c47dba6b4de7529b354b79cf7f76c5fbb695d027;hp=1ab6d4b668b23e7ebd6ff05bd33ec499c6972290;hpb=082066d0c776403b70c366f9a7d1333c7a9fac15;p=gedcom-parse.git

diff --git a/gom/family_link.c b/gom/family_link.c
index 1ab6d4b..cb5435b 100644
--- a/gom/family_link.c
+++ b/gom/family_link.c
@@ -39,17 +39,13 @@ Gedcom_ctxt sub_fam_link_start(_ELT_PARAMS_)
   if (! ctxt)
     NO_CONTEXT;
   else {
-    struct family_link *link
-      = (struct family_link *)malloc(sizeof(struct family_link));
-    if (! link)
-      MEMORY_ERROR;
-    else {
-      memset (link, 0, sizeof(struct family_link));
+    struct family_link *link = SUB_MAKEFUNC(family_link)();
+    if (link) {
       link->family = GEDCOM_XREF_PTR(parsed_value);
       
       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 +83,11 @@ Gedcom_ctxt sub_fam_link_pedi_start(_ELT_PARAMS_)
   return (Gedcom_ctxt)result;
 }
 
+DEFINE_SUB_MAKEFUNC(family_link)
+     
+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 +98,42 @@ void family_link_subscribe()
 			      def_elt_end);
 }
 
-void family_link_add_note(Gom_ctxt ctxt, struct note_sub* note)
+void UNREFALLFUNC(pedigree)(struct pedigree* obj)
 {
-  struct family_link *link = SAFE_CTXT_CAST(family_link, ctxt);
-  if (link)
-    LINK_CHAIN_ELT(note_sub, link->note, note);
+  if (obj) {
+    struct pedigree* runner;
+    for (runner = obj; runner; runner = runner->next) {
+      UNREFALLFUNC(user_data)(runner->extra);
+    }
+  }
 }
 
-void family_link_add_user_data(Gom_ctxt ctxt, struct user_data* data)
+void CLEANFUNC(pedigree)(struct pedigree* ped)
 {
-  struct family_link *obj = SAFE_CTXT_CAST(family_link, ctxt);
-  if (obj)
-    LINK_CHAIN_ELT(user_data, obj->extra, data);
+  if (ped) {
+    SAFE_FREE(ped->pedigree);
+  }
 }
 
-void pedigree_cleanup(struct pedigree* ped)
+void UNREFALLFUNC(family_link)(struct family_link* obj)
 {
-  if (ped) {
-    SAFE_FREE(ped->pedigree);
+  if (obj) {
+    struct family_link* runner;
+    for (runner = obj; runner; runner = runner->next) {
+      unref_xref_value(runner->family);
+      UNREFALLFUNC(pedigree)(runner->pedigree);
+      UNREFALLFUNC(note_sub)(runner->note);
+      UNREFALLFUNC(user_data)(runner->extra);
+    }
   }
 }
 
-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);
   }
 }