dlugolecki.net.pl
Dziennik
Polecane
Software
projects
/
gedcom-parse.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't use subdir libcharset if libiconv is used.
[gedcom-parse.git]
/
gedcom
/
interface.c
diff --git
a/gedcom/interface.c
b/gedcom/interface.c
index 74d2e9190931698c9a2a87742cd891a3b0d73591..d22f8e6755c572a2a560b0d9ab91b7cc7228caad 100644
(file)
--- 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)
{
void gedcom_set_default_callback(Gedcom_def_cb func)
{
+ if (default_cb)
+ gedcom_error(_("Internal error: Duplicate registration for default callback"));
default_cb = func;
}
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)
{
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;
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)
{
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;
if (cb_start) {
element_start_callback[elt] = cb_start;
element_end_callback[elt] = cb_end;
@@
-61,7
+67,8
@@
Gedcom_ctxt start_record(Gedcom_rec rec,
{
Gedcom_rec_start_cb cb = record_start_callback[rec];
if (cb != NULL)
{
Gedcom_rec_start_cb cb = record_start_callback[rec];
if (cb != NULL)
- return (*cb)(level, xref, tag.string, raw_value, tag.value, parsed_value);
+ return (*cb)(rec, level, xref, tag.string, raw_value, tag.value,
+ parsed_value);
else
return NULL;
}
else
return NULL;
}
@@
-70,7
+77,7
@@
void end_record(Gedcom_rec rec, Gedcom_ctxt self)
{
Gedcom_rec_end_cb cb = record_end_callback[rec];
if (cb != NULL)
{
Gedcom_rec_end_cb cb = record_end_callback[rec];
if (cb != NULL)
- (*cb)(self);
+ (*cb)(
rec,
self);
}
Gedcom_ctxt start_element(Gedcom_elt elt, Gedcom_ctxt parent,
}
Gedcom_ctxt start_element(Gedcom_elt elt, Gedcom_ctxt parent,
@@
-80,10
+87,10
@@
Gedcom_ctxt start_element(Gedcom_elt elt, Gedcom_ctxt parent,
Gedcom_elt_start_cb cb = element_start_callback[elt];
Gedcom_ctxt ctxt = parent;
if (cb != NULL)
Gedcom_elt_start_cb cb = element_start_callback[elt];
Gedcom_ctxt ctxt = parent;
if (cb != NULL)
- ctxt = (*cb)(parent, level, tag.string, raw_value,
+ ctxt = (*cb)(
elt,
parent, level, tag.string, raw_value,
tag.value, parsed_value);
else if (default_cb != NULL && parent != NULL)
tag.value, parsed_value);
else if (default_cb != NULL && parent != NULL)
- (*default_cb)(parent, level, tag.string, raw_value, tag.value);
+ (*default_cb)(
elt,
parent, level, tag.string, raw_value, tag.value);
return ctxt;
}
return ctxt;
}
@@
-92,15
+99,15
@@
void end_element(Gedcom_elt elt, Gedcom_ctxt parent, Gedcom_ctxt self,
{
Gedcom_elt_end_cb cb = element_end_callback[elt];
if (cb != NULL)
{
Gedcom_elt_end_cb cb = element_end_callback[elt];
if (cb != NULL)
- (*cb)(parent, self, parsed_value);
+ (*cb)(
elt,
parent, self, parsed_value);
}
}
-char* val_type_str[] = { N_("null value"),
- N_("character string"),
- N_("date"),
- N_("cross-reference") };
+c
onst c
har* 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(c
onst c
har* file, int line,
Gedcom_val_type tried_type,
Gedcom_val_type real_type)
{
Gedcom_val_type tried_type,
Gedcom_val_type real_type)
{