X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=gom%2Fmultimedia_link.c;h=0b1c4eb85de6c9a00adfebbf8b727c600d63f297;hb=763e8737b5118c5f23dca84a3290c2d805bbefe6;hp=f6044ff0b1eee43f764df9c2c91ac7075b8ed172;hpb=082066d0c776403b70c366f9a7d1333c7a9fac15;p=gedcom-parse.git

diff --git a/gom/multimedia_link.c b/gom/multimedia_link.c
index f6044ff..0b1c4eb 100644
--- a/gom/multimedia_link.c
+++ b/gom/multimedia_link.c
@@ -44,12 +44,8 @@ Gedcom_ctxt sub_obje_start(_ELT_PARAMS_)
   if (! ctxt)
     NO_CONTEXT;
   else {
-    struct multimedia_link *mm
-      = (struct multimedia_link *)malloc(sizeof(struct multimedia_link));
-    if (! mm)
-      MEMORY_ERROR;
-    else {
-      memset (mm, 0, sizeof(struct multimedia_link));
+    struct multimedia_link *mm = SUB_MAKEFUNC(multimedia_link)();
+    if (mm) {
       if (GEDCOM_IS_XREF_PTR(parsed_value))
 	mm->reference = GEDCOM_XREF_PTR(parsed_value);
       
@@ -62,17 +58,17 @@ Gedcom_ctxt sub_obje_start(_ELT_PARAMS_)
 	case ELT_SUB_INDIV_GEN:
 	case ELT_SUB_INDIV_ADOP:
 	case ELT_SUB_INDIV_EVEN:
-	  event_add_mm_link(ctxt, mm); break;
+	  ADDFUNC2(event,multimedia_link)(ctxt, mm); break;
 	case ELT_SUB_SOUR:
-	  citation_add_mm_link(ctxt, mm); break;
+	  ADDFUNC2(source_citation,multimedia_link)(ctxt, mm); break;
 	case REC_FAM:
-	  family_add_mm_link(ctxt, mm); break;
+	  ADDFUNC2(family,multimedia_link)(ctxt, mm); break;
 	case REC_INDI:
-	  individual_add_mm_link(ctxt, mm); break;
+	  ADDFUNC2(individual,multimedia_link)(ctxt, mm); break;
 	case REC_SOUR:
-	  source_add_mm_link(ctxt, mm); break;
+	  ADDFUNC2(source,multimedia_link)(ctxt, mm); break;
 	case REC_SUBM:
-	  submitter_add_mm_link(ctxt, mm); break;
+	  ADDFUNC2(submitter,multimedia_link)(ctxt, mm); break;
 	default:
 	  UNEXPECTED_CONTEXT(ctxt->ctxt_type);
       }
@@ -83,9 +79,14 @@ Gedcom_ctxt sub_obje_start(_ELT_PARAMS_)
   return (Gedcom_ctxt)result;
 }
 
-STRING_CB(multimedia_link, sub_obje_form_start, form)
-STRING_CB(multimedia_link, sub_obje_titl_start, title)
-STRING_CB(multimedia_link, sub_obje_file_start, file)
+DEFINE_SUB_MAKEFUNC(multimedia_link)
+     
+DEFINE_STRING_CB(multimedia_link, sub_obje_form_start, form)
+DEFINE_STRING_CB(multimedia_link, sub_obje_titl_start, title)
+DEFINE_STRING_CB(multimedia_link, sub_obje_file_start, file)
+
+DEFINE_ADDFUNC2(multimedia_link, note_sub, note)
+DEFINE_ADDFUNC2(multimedia_link, user_data, extra)
      
 void multimedia_link_subscribe()
 {
@@ -99,28 +100,14 @@ void multimedia_link_subscribe()
 			      sub_obje_file_start, def_elt_end);
 }
 
-void multimedia_link_add_note(Gom_ctxt ctxt, struct note_sub* note)
-{
-  struct multimedia_link *mm = SAFE_CTXT_CAST(multimedia_link, ctxt);
-  if (mm)
-    LINK_CHAIN_ELT(note_sub, mm->note, note);    
-}
-
-void multimedia_link_add_user_data(Gom_ctxt ctxt, struct user_data* data)
-{
-  struct multimedia_link *obj = SAFE_CTXT_CAST(multimedia_link, ctxt);
-  if (obj)
-    LINK_CHAIN_ELT(user_data, obj->extra, data);
-}
-
-void multimedia_link_cleanup(struct multimedia_link* mm)
+void CLEANFUNC(multimedia_link)(struct multimedia_link* mm)
 {
   if (mm) {
     SAFE_FREE(mm->form);
     SAFE_FREE(mm->title);
     SAFE_FREE(mm->file);
-    DESTROY_CHAIN_ELTS(note_sub, mm->note, note_sub_cleanup);
-    DESTROY_CHAIN_ELTS(user_data, mm->extra, user_data_cleanup);
+    DESTROY_CHAIN_ELTS(note_sub, mm->note);
+    DESTROY_CHAIN_ELTS(user_data, mm->extra);
   }
 }