X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=gom%2Fassociation.c;h=9398bbc49182929cb32efc2d7fe1cf536a825736;hb=3155d964e15a3c49121c01d2808e5a846779b812;hp=2a5bf39c1a403b3ab22052844bceff805616b389;hpb=082066d0c776403b70c366f9a7d1333c7a9fac15;p=gedcom-parse.git

diff --git a/gom/association.c b/gom/association.c
index 2a5bf39..9398bbc 100644
--- a/gom/association.c
+++ b/gom/association.c
@@ -40,17 +40,13 @@ Gedcom_ctxt sub_assoc_start(_ELT_PARAMS_)
   if (!ctxt)
     NO_CONTEXT;
   else {
-    struct association *assoc;
-    assoc = (struct association *)malloc(sizeof(struct association));
-    if (! assoc)
-      MEMORY_ERROR;
-    else {
-      memset (assoc, 0, sizeof(struct association));
+    struct association *assoc = SUB_MAKEFUNC(association)();
+    if (assoc) {
       assoc->to = GEDCOM_XREF_PTR(parsed_value);
       
       switch (ctxt->ctxt_type) {
 	case REC_INDI:
-	  individual_add_association(ctxt, assoc);
+	  ADDFUNC2(individual,association)(ctxt, assoc);
 	default:
 	  UNEXPECTED_CONTEXT(ctxt->ctxt_type);
       }
@@ -61,7 +57,13 @@ Gedcom_ctxt sub_assoc_start(_ELT_PARAMS_)
   return (Gedcom_ctxt)result;
 }
 
-STRING_CB(association, sub_assoc_rela_start, relation)
+DEFINE_SUB_MAKEFUNC(association)
+     
+DEFINE_STRING_CB(association, sub_assoc_rela_start, relation)
+
+DEFINE_ADDFUNC2(association, note_sub, note)
+DEFINE_ADDFUNC2(association, source_citation, citation)
+DEFINE_ADDFUNC2(association, user_data, extra)
      
 Gedcom_ctxt sub_assoc_type_start(_ELT_PARAMS_)
 {
@@ -95,35 +97,27 @@ void association_subscribe()
 			      def_elt_end);
 }
 
-void association_add_note(Gom_ctxt ctxt, struct note_sub* note)
-{
-  struct association *assoc = SAFE_CTXT_CAST(association, ctxt);
-  if (assoc)
-    LINK_CHAIN_ELT(note_sub, assoc->note, note);
-}
-
-void association_add_citation(Gom_ctxt ctxt, struct source_citation* cit)
+void UNREFALLFUNC(association)(struct association *obj)
 {
-  struct association *assoc = SAFE_CTXT_CAST(association, ctxt);
-  if (assoc)
-    LINK_CHAIN_ELT(source_citation, assoc->citation, cit);
-}
-
-void association_add_user_data(Gom_ctxt ctxt, struct user_data* data)
-{
-  struct association *obj = SAFE_CTXT_CAST(association, ctxt);
-  if (obj)
-    LINK_CHAIN_ELT(user_data, obj->extra, data);
+  if (obj) {
+    struct association* runner;
+    for (runner = obj; runner; runner = runner->next) {
+      unref_xref_value(runner->to);
+      UNREFALLFUNC(source_citation)(runner->citation);
+      UNREFALLFUNC(note_sub)(runner->note);
+      UNREFALLFUNC(user_data)(runner->extra);
+    }
+  }
 }
 
-void association_cleanup(struct association* assoc)
+void CLEANFUNC(association)(struct association* assoc)
 {
   if (assoc) {
     SAFE_FREE(assoc->type);
     SAFE_FREE(assoc->relation);
-    DESTROY_CHAIN_ELTS(note_sub, assoc->note, note_sub_cleanup);
-    DESTROY_CHAIN_ELTS(source_citation, assoc->citation, citation_cleanup);
-    DESTROY_CHAIN_ELTS(user_data, assoc->extra, user_data_cleanup);
+    DESTROY_CHAIN_ELTS(note_sub, assoc->note);
+    DESTROY_CHAIN_ELTS(source_citation, assoc->citation);
+    DESTROY_CHAIN_ELTS(user_data, assoc->extra);
   }
 }