X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=gom%2Fheader.c;h=c5360012f37b1acc42cc6ec19f7f8b52cbfbcb41;hb=f8536669a2c38054a067bfe1596f90744b6c58da;hp=130d06e06ad110614d8082ec228d7e6f76dbf7ee;hpb=e5f86c3d527897be1f7e7135ffdfc023831aaebd;p=gedcom-parse.git diff --git a/gom/header.c b/gom/header.c index 130d06e..c536001 100644 --- a/gom/header.c +++ b/gom/header.c @@ -60,7 +60,8 @@ STRING_CB(header, head_char_vers_start, charset.version) STRING_CB(header, head_lang_start, language) NULL_CB(header, head_plac_start) STRING_CB(header, head_plac_form_start, place_hierarchy) -STRING_CB(header, head_note_start, note) +NULL_CB(header, head_note_start) /* the end callback will fill the value */ +STRING_END_CB(header, head_note_end, note) void header_add_address(Gom_ctxt ctxt, struct address* addr) { @@ -83,18 +84,6 @@ void header_add_phone(Gom_ctxt ctxt, const char* phone) } } -void header_add_to_note(NL_TYPE type, Gom_ctxt ctxt, const char* str) -{ - struct header *head = SAFE_CTXT_CAST(header, ctxt); - if (head) { - char *newvalue = concat_strings(type, head->note, str); - if (newvalue) - head->note = newvalue; - else - MEMORY_ERROR; - } -} - void header_add_user_data(Gom_ctxt ctxt, struct user_data* data) { struct header *head = SAFE_CTXT_CAST(header, ctxt); @@ -138,7 +127,7 @@ void header_subscribe() gedcom_subscribe_to_element(ELT_HEAD_PLAC, head_plac_start, def_elt_end); gedcom_subscribe_to_element(ELT_HEAD_PLAC_FORM, head_plac_form_start, def_elt_end); - gedcom_subscribe_to_element(ELT_HEAD_NOTE, head_note_start, def_elt_end); + gedcom_subscribe_to_element(ELT_HEAD_NOTE, head_note_start, head_note_end); } void header_cleanup()