X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=gom%2Fassociation.c;h=2d9cc2d56fafd2faf3f2b9e7caf2244d765bb6f1;hb=763e8737b5118c5f23dca84a3290c2d805bbefe6;hp=7c7ec68abb890ff01639354219d582dcae3bf3f7;hpb=7ae7ece158a1d930a77806f591b1d16b2cde581f;p=gedcom-parse.git diff --git a/gom/association.c b/gom/association.c index 7c7ec68..2d9cc2d 100644 --- a/gom/association.c +++ b/gom/association.c @@ -40,12 +40,8 @@ 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) { @@ -61,6 +57,8 @@ Gedcom_ctxt sub_assoc_start(_ELT_PARAMS_) return (Gedcom_ctxt)result; } +DEFINE_SUB_MAKEFUNC(association) + DEFINE_STRING_CB(association, sub_assoc_rela_start, relation) DEFINE_ADDFUNC2(association, note_sub, note)