X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=gedcom%2Finterface.c;h=d22f8e6755c572a2a560b0d9ab91b7cc7228caad;hb=c2279cc3a34d2af7067e771e0c0b9698602c3fab;hp=7556667a253200a4b58ed9d7fab4f0f7f326ec0b;hpb=610f424e2c0eb060719d84ffa05d55264d7af1d3;p=gedcom-parse.git diff --git a/gedcom/interface.c b/gedcom/interface.c index 7556667..d22f8e6 100644 --- a/gedcom/interface.c +++ b/gedcom/interface.c @@ -32,6 +32,8 @@ static Gedcom_def_cb default_cb = NULL; void gedcom_set_default_callback(Gedcom_def_cb func) { + if (default_cb) + gedcom_error(_("Internal error: Duplicate registration for default callback")); default_cb = func; } @@ -39,6 +41,8 @@ void gedcom_subscribe_to_record(Gedcom_rec rec, Gedcom_rec_start_cb cb_start, Gedcom_rec_end_cb cb_end) { + if (record_start_callback[rec] || record_end_callback[rec]) + gedcom_error(_("Internal error: Duplicate registration for record type %d"), rec); if (cb_start) { record_start_callback[rec] = cb_start; record_end_callback[rec] = cb_end; @@ -49,6 +53,8 @@ void gedcom_subscribe_to_element(Gedcom_elt elt, Gedcom_elt_start_cb cb_start, Gedcom_elt_end_cb cb_end) { + if (element_start_callback[elt] || element_end_callback[elt]) + gedcom_error(_("Internal error: Duplicate registration for element type %d"), elt); if (cb_start) { element_start_callback[elt] = cb_start; element_end_callback[elt] = cb_end; @@ -96,12 +102,12 @@ void end_element(Gedcom_elt elt, Gedcom_ctxt parent, Gedcom_ctxt self, (*cb)(elt, parent, self, parsed_value); } -char* val_type_str[] = { N_("null value"), - N_("character string"), - N_("date"), - N_("cross-reference") }; +const char* val_type_str[] = { N_("null value"), + N_("character string"), + N_("date"), + N_("cross-reference") }; -void gedcom_cast_error(char* file, int line, +void gedcom_cast_error(const char* file, int line, Gedcom_val_type tried_type, Gedcom_val_type real_type) {