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
Make sure compatibility_program is initialized to 0.
[gedcom-parse.git]
/
gedcom
/
interface.c
diff --git
a/gedcom/interface.c
b/gedcom/interface.c
index 061ec4fdad79fe0297abaec8e4439a844f77a4b6..24cf4e646e3f1704e4e7cf485643f948e7db440d 100644
(file)
--- a/
gedcom/interface.c
+++ b/
gedcom/interface.c
@@
-73,11
+73,11
@@
Gedcom_ctxt start_record(Gedcom_rec rec,
return NULL;
}
return NULL;
}
-void end_record(Gedcom_rec rec, Gedcom_ctxt self)
+void end_record(Gedcom_rec rec, Gedcom_ctxt self
, Gedcom_val parsed_value
)
{
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)(rec, self);
+ (*cb)(rec, self
, parsed_value
);
}
Gedcom_ctxt start_element(Gedcom_elt elt, Gedcom_ctxt parent,
}
Gedcom_ctxt start_element(Gedcom_elt elt, Gedcom_ctxt parent,
@@
-102,16
+102,26
@@
void end_element(Gedcom_elt elt, Gedcom_ctxt parent, Gedcom_ctxt self,
(*cb)(elt, 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") };
+const char* val_type_str[] = { N_("null value"),
+ N_("character string"),
+ N_("date"),
+ N_("age"),
+ 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)
{
+ int tried_bit=0, real_bit=0;
+ while (tried_type && tried_type % 2 == 0) {
+ tried_bit++;
+ tried_type >>= 1;
+ }
+ while (real_type && real_type % 2 == 0) {
+ real_bit++;
+ real_type >>= 1;
+ }
gedcom_warning
(_("Wrong cast of value in file %s, at line %d: %s instead of %s"),
gedcom_warning
(_("Wrong cast of value in file %s, at line %d: %s instead of %s"),
- file, line, _(val_type_str[tried_
type]), _(val_type_str[real_type
]));
+ file, line, _(val_type_str[tried_
bit]), _(val_type_str[real_bit
]));
}
}