dlugolecki.net.pl
Dziennik
Polecane
Software
projects
/
gedcom-parse.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
879d3b6
)
Generate the correct cast error message.
author
Peter Verthez
<Peter.Verthez@advalvas.be>
Sat, 25 Jan 2003 18:37:18 +0000
(18:37 +0000)
committer
Peter Verthez
<Peter.Verthez@advalvas.be>
Sat, 25 Jan 2003 18:37:18 +0000
(18:37 +0000)
gedcom/interface.c
patch
|
blob
|
history
diff --git
a/gedcom/interface.c
b/gedcom/interface.c
index ac79bed8c7e45a8e3ddf9377b9a61c50f80cd340..24cf4e646e3f1704e4e7cf485643f948e7db440d 100644
(file)
--- a/
gedcom/interface.c
+++ b/
gedcom/interface.c
@@
-105,13
+105,23
@@
void end_element(Gedcom_elt elt, Gedcom_ctxt parent, Gedcom_ctxt self,
const char* val_type_str[] = { N_("null value"),
N_("character string"),
N_("date"),
const char* val_type_str[] = { N_("null value"),
N_("character string"),
N_("date"),
+ N_("age"),
N_("cross-reference") };
void gedcom_cast_error(const char* file, int line,
Gedcom_val_type tried_type,
Gedcom_val_type real_type)
{
N_("cross-reference") };
void gedcom_cast_error(const char* file, int line,
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
]));
}
}