Definition of SUB_MAKEFUNC.

[gedcom-parse.git] / gom / source_event.c

diff --git a/gom/source_event.c b/gom/source_event.c
index ce2f873a2944ecea1bd9602bb65e38dd1211e4d3..02882dc113c024250bb5b7f1702beb010ad2efb8 100644 (file)
--- a/gom/source_event.c
+++ b/gom/source_event.c
@@ -38,12 +38,8 @@ Gedcom_ctxt sub_sour_even_start(_ELT_PARAMS_)
   if (! ctxt)
     NO_CONTEXT;
   else {
-    struct source_event *evt
-      = (struct source_event *)malloc(sizeof(struct source_event));
-    if (! evt)
-      MEMORY_ERROR;
-    else {
-      memset (evt, 0, sizeof(struct source_event));
+    struct source_event *evt = SUB_MAKEFUNC(source_event)();
+    if (evt) {
       evt->recorded_events = strdup(GEDCOM_STRING(parsed_value));
 
       if (! evt->recorded_events) {
@@ -53,7 +49,7 @@ Gedcom_ctxt sub_sour_even_start(_ELT_PARAMS_)
       else {
        switch (ctxt->ctxt_type) {
          case ELT_SOUR_DATA:
-           source_add_event(ctxt, evt); break;
+           ADDFUNC2(source,source_event)(ctxt, evt); break;
          default:
            UNEXPECTED_CONTEXT(ctxt->ctxt_type);
        }
@@ -65,8 +61,12 @@ Gedcom_ctxt sub_sour_even_start(_ELT_PARAMS_)
   return (Gedcom_ctxt)result;
 }
 
-DATE_CB(source_event, sub_sour_even_date_start, date_period)
-STRING_CB(source_event, sub_sour_even_plac_start, jurisdiction)
+DEFINE_SUB_MAKEFUNC(source_event)
+     
+DEFINE_DATE_CB(source_event, sub_sour_even_date_start, date_period)
+DEFINE_STRING_CB(source_event, sub_sour_even_plac_start, jurisdiction)
+
+DEFINE_ADDFUNC2(source_event, user_data, extra)
      
 void source_event_subscribe()
 {
@@ -78,20 +78,13 @@ void source_event_subscribe()
                              sub_sour_even_plac_start, def_elt_end);
 }
 
-void source_event_add_user_data(Gom_ctxt ctxt, struct user_data* data)
-{
-  struct source_event *obj = SAFE_CTXT_CAST(source_event, ctxt);
-  if (obj)
-    LINK_CHAIN_ELT(user_data, obj->extra, data);
-}
-
-void source_event_cleanup(struct source_event* evt)
+void CLEANFUNC(source_event)(struct source_event* evt)
 {
   if (evt) {
     SAFE_FREE(evt->recorded_events);
     SAFE_FREE(evt->date_period);
     SAFE_FREE(evt->jurisdiction);
-    DESTROY_CHAIN_ELTS(user_data, evt->extra, user_data_cleanup);
+    DESTROY_CHAIN_ELTS(user_data, evt->extra);
   }
 }