Use Gedcom_val for the xref in the record start callback too.

[gedcom-parse.git] / gedcom / interface.h

diff --git a/gedcom/interface.h b/gedcom/interface.h
index 7e4474860211c3e00cdd381c82fdaae80ff68dc8..2e716c45c3693e2ba92582d5b5a62c189b614c48 100644 (file)
--- a/gedcom/interface.h
+++ b/gedcom/interface.h
@@ -26,7 +26,8 @@
 
 #include "gedcom.h"
 
-Gedcom_ctxt start_record(Gedcom_rec rec, int level, char *xref, char *tag);
+Gedcom_ctxt start_record(Gedcom_rec rec,
+                        int level, Gedcom_val xref, char *tag);
 void        end_record(Gedcom_rec rec, Gedcom_ctxt self);
 
 Gedcom_ctxt start_element(Gedcom_elt elt, Gedcom_ctxt parent,
@@ -40,9 +41,17 @@ extern Gedcom_val_struct val;
 #define GEDCOM_MAKE(VALUE, TYPE, MEMBER) \
    (val.type = TYPE, val.value.MEMBER = VALUE, &val)
 
+#define GEDCOM_MAKE_NULL() \
+   GEDCOM_MAKE(NULL, GV_NULL, string_val)
+
 #define GEDCOM_MAKE_STRING(STRING) \
    GEDCOM_MAKE(STRING, GV_CHAR_PTR, string_val)
 
+#define GEDCOM_MAKE_NULL_OR_STRING(STRING) \
+   (STRING == NULL ? \
+    GEDCOM_MAKE_NULL() : \
+    GEDCOM_MAKE_STRING(STRING)) \
+
 #define GEDCOM_MAKE_DATE(DATE) \
    GEDCOM_MAKE(DATE, GV_DATE_VALUE, date_val)