X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=gedcom%2Finterface.h;h=6eb0ed60ee46e5776ad1141a34d771c6aedf228a;hb=8c92a223c34fbd674f26520fb990c64a7b2f9147;hp=7e4474860211c3e00cdd381c82fdaae80ff68dc8;hpb=35f77ce6bd3ccc27047eda0b3ef8d74c7a86c3d7;p=gedcom-parse.git diff --git a/gedcom/interface.h b/gedcom/interface.h index 7e44748..6eb0ed6 100644 --- a/gedcom/interface.h +++ b/gedcom/interface.h @@ -1,5 +1,5 @@ /* Header for interface.c - Copyright (C) 2001 The Genes Development Team + Copyright (C) 2001, 2002 The Genes Development Team This file is part of the Gedcom parser library. Contributed by Peter Verthez , 2001. @@ -26,11 +26,12 @@ #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, struct tag_struct tag); void end_record(Gedcom_rec rec, Gedcom_ctxt self); Gedcom_ctxt start_element(Gedcom_elt elt, Gedcom_ctxt parent, - int level, char *tag, char *raw_value, + int level, struct tag_struct tag, char *raw_value, Gedcom_val parsed_value); void end_element(Gedcom_elt elt, Gedcom_ctxt parent, Gedcom_ctxt self, Gedcom_val parsed_value); @@ -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)