X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=gedcom%2Fxref.c;h=ee58ad02eb7534891760e22acc341bef250a521d;hb=aa8e5450d4e93e743e848a0ac045e04c94474347;hp=ea3e1fa7ded85cc6cbb8f445175e313aa606d489;hpb=b1a87b467d9c6b38aa4a2b2e4537b0deff9a251e;p=gedcom-parse.git

diff --git a/gedcom/xref.c b/gedcom/xref.c
index ea3e1fa..ee58ad0 100644
--- a/gedcom/xref.c
+++ b/gedcom/xref.c
@@ -83,8 +83,20 @@ struct xref_node *make_xref_node()
   return xr;
 }
 
+void cleanup_xrefs()
+{
+  hash_free(xrefs);
+  xrefs = NULL;
+}
+
 void make_xref_table()
 {
+  if (xrefs)
+    cleanup_xrefs();
+  else
+    /* Only register initially (if xrefs is still NULL) */
+    /* So that it is only registered once */
+    atexit(cleanup_xrefs);
   xrefs = hash_create(HASHCOUNT_T_MAX, NULL, NULL);
   hash_set_allocator(xrefs, xref_alloc, xref_free, NULL);
 }
@@ -111,10 +123,20 @@ int check_xref_table()
     }
   }
   
-  hash_free(xrefs);
   return result;
 }
 
+struct xref_value *gedcom_get_by_xref(char *key)
+{
+  hnode_t *node = hash_lookup(xrefs, key);
+  if (node) {
+    struct xref_node *xr = (struct xref_node *)hnode_get(node);
+    return &(xr->xref);
+  }
+  else
+    return NULL;
+}
+
 struct xref_value *gedcom_parse_xref(char *raw_value,
 				     Xref_ctxt ctxt, Xref_type xref_type)
 {
@@ -142,9 +164,11 @@ struct xref_value *gedcom_parse_xref(char *raw_value,
     xr->used_line = line_no;
   }
   
-  if ((ctxt == XREF_DEFINED && xr->defined_type != xref_type)
+  if ((ctxt == XREF_DEFINED && xr->defined_type != xref_type &&
+       xr->defined_type != XREF_ANY)
       || (ctxt == XREF_USED &&
-	  (xr->defined_type != XREF_NONE && xr->defined_type != xref_type))) {
+	  (xr->defined_type != XREF_NONE && xr->defined_type != xref_type &&
+	   xr->defined_type != XREF_ANY))) {
     gedcom_error(_("Cross-reference %s previously defined as pointer to %s, "
 		   "on line %d"),
 		 xr->xref.string, xref_type_str[xr->defined_type],