X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=gedcom%2Finterface.c;h=8b42b213f013fc533ba32e10507ebad3cbc5245f;hb=3d1822cb295202993c11564f7dd64442d8b67d2f;hp=0522f05db636c8ce7323cb7761fd7881d711ccc3;hpb=fffe9618ff8a5cfcac207f231b531615dfb0e38f;p=gedcom-parse.git

diff --git a/gedcom/interface.c b/gedcom/interface.c
index 0522f05..8b42b21 100644
--- a/gedcom/interface.c
+++ b/gedcom/interface.c
@@ -32,8 +32,9 @@ static Gedcom_def_cb       default_cb                         = NULL;
 
 void gedcom_set_default_callback(Gedcom_def_cb func)
 {
-  if (default_cb)
+  if (default_cb) {
     gedcom_error(_("Internal error: Duplicate registration for default callback"));
+  }
   default_cb = func;
 }
 
@@ -73,11 +74,11 @@ Gedcom_ctxt start_record(Gedcom_rec rec,
     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)
-    (*cb)(rec, self);
+    (*cb)(rec, self, parsed_value);
 }
 
 Gedcom_ctxt start_element(Gedcom_elt elt, Gedcom_ctxt parent, 
@@ -102,16 +103,26 @@ 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_("age"),
+			       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"),
-     file, line, _(val_type_str[tried_type]), _(val_type_str[real_type]));
+     file, line, _(val_type_str[tried_bit]), _(val_type_str[real_bit]));
 }