free(n);
}
-struct xref_node *make_xref_node()
+void clear_xref_node(struct xref_node *xr)
{
- struct xref_node *xr = (struct xref_node *)malloc(sizeof(struct xref_node));
xr->xref.type = XREF_NONE;
- xr->xref.string = NULL;
+ /* Make sure that the 'string' member always contains a valid string */
+ if (!xr->xref.string)
+ xr->xref.string = strdup("");
xr->xref.object = NULL;
xr->defined_type = XREF_NONE;
xr->used_type = XREF_NONE;
xr->defined_line = -1;
xr->used_line = -1;
+}
+
+struct xref_node *make_xref_node()
+{
+ struct xref_node *xr = (struct xref_node *)malloc(sizeof(struct xref_node));
+ xr->xref.string = NULL;
+ clear_xref_node(xr);
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);
}
}
}
- 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)
{
char *key = strdup(raw_value);
xr = make_xref_node();
xr->xref.type = xref_type;
+ free(xr->xref.string);
xr->xref.string = strdup(raw_value);
hash_alloc_insert(xrefs, key, xr);
}
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],
xr->defined_line);
- return NULL;
- }
-
- if ((ctxt == XREF_USED && xr->used_type != xref_type)
- || (ctxt == XREF_DEFINED &&
- (xr->used_type != XREF_NONE && xr->used_type != xref_type))) {
+ clear_xref_node(xr);
+ }
+ else if ((ctxt == XREF_USED && xr->used_type != xref_type)
+ || (ctxt == XREF_DEFINED &&
+ (xr->used_type != XREF_NONE && xr->used_type != xref_type))) {
gedcom_error(_("Cross-reference %s previously used as pointer to %s, "
"on line %d"),
xr->xref.string, xref_type_str[xr->used_type], xr->used_line);
- return NULL;
+ clear_xref_node(xr);
}
return &(xr->xref);