X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=gom%2Fnote_sub.c;h=2ff76db751e6eca2b62c999a446037e6e877d837;hb=c47dba6b4de7529b354b79cf7f76c5fbb695d027;hp=5af12ca621fe3f83c92329b80f7568cdb0392bdc;hpb=72689522e287ca3b2231e7d8881f0fe5bea48f15;p=gedcom-parse.git diff --git a/gom/note_sub.c b/gom/note_sub.c index 5af12ca..2ff76db 100644 --- a/gom/note_sub.c +++ b/gom/note_sub.c @@ -52,11 +52,8 @@ Gedcom_ctxt sub_note_start(_ELT_PARAMS_) if (! ctxt) NO_CONTEXT; else { - struct note_sub *note = (struct note_sub *)malloc(sizeof(struct note_sub)); - if (! note) - MEMORY_ERROR; - else { - memset (note, 0, sizeof(struct note_sub)); + struct note_sub *note = SUB_MAKEFUNC(note_sub)(); + if (note) { if (GEDCOM_IS_XREF_PTR(parsed_value)) note->reference = GEDCOM_XREF_PTR(parsed_value); @@ -113,6 +110,8 @@ Gedcom_ctxt sub_note_start(_ELT_PARAMS_) return (Gedcom_ctxt)result; } +DEFINE_SUB_MAKEFUNC(note_sub) + DEFINE_STRING_END_CB(note_sub, sub_note_end, text) DEFINE_ADDFUNC2(note_sub, source_citation, citation) @@ -123,6 +122,18 @@ void note_sub_subscribe() gedcom_subscribe_to_element(ELT_SUB_NOTE, sub_note_start, sub_note_end); } +void UNREFALLFUNC(note_sub)(struct note_sub* obj) +{ + if (obj) { + struct note_sub* runner; + for (runner = obj; runner; runner = runner->next) { + unref_xref_value(runner->reference); + UNREFALLFUNC(source_citation)(runner->citation); + UNREFALLFUNC(user_data)(runner->extra); + } + } +} + void CLEANFUNC(note_sub)(struct note_sub* note) { if (note) {