X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=gedcom%2Fgedcom_internal.h;h=804959a66915500691d8b4d0bf982fb9718e6e91;hb=d2dbc2834cae06a5de0dec22c0e7a530b7dd1589;hp=abd80913302d2cbaae819e6245979adc9f7e754f;hpb=8c92a223c34fbd674f26520fb990c64a7b2f9147;p=gedcom-parse.git

diff --git a/gedcom/gedcom_internal.h b/gedcom/gedcom_internal.h
index abd8091..804959a 100644
--- a/gedcom/gedcom_internal.h
+++ b/gedcom/gedcom_internal.h
@@ -28,15 +28,12 @@
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>
-#ifdef WITH_DMALLOC
-#include <dmalloc.h>
-#endif
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
 #include <libintl.h>
 
-#define _(string) gettext(string)
+#define _(string) dgettext(PACKAGE, string)
 #define N_(string) (string)
 
 #define MAXGEDCLEVEL    99
@@ -45,22 +42,36 @@
 #define MAXSTDTAGLEN    4
 #define MAXGEDCPTRLEN   22
 #define GEDCOMTAGOFFSET 257
-#define INTERNAL_ENCODING "UTF8"
+#define INTERNAL_ENCODING "UTF-8"
 
 #define GEDCOM_INTERNAL 1
 
+#ifdef __GNUC__
+#define UNUSED __attribute__((unused))
+#else
+#define UNUSED
+#endif
+
 struct tag_struct {
   char *string;
   int value;
 };
 
-int        gedcom_error(char* s, ...);
-int        gedcom_warning(char* s, ...);
-int        gedcom_message(char* s, ...);
-int        gedcom_debug_print(char* s, ...);
+typedef enum _PARSE_STATE {
+  STATE_NORMAL,
+  STATE_INITIAL,
+  STATE_EXPECT_TAG
+} ParseState;
+
+int  gedcom_parse();
+int  gedcom_lex();
+int  gedcom_check_token(const char* str, ParseState state, int check_token);
+
+void gedcom_mem_error(const char *filename, int line);
 
-int        gedcom_parse();
-int        gedcom_lex();
+#define MEMORY_ERROR gedcom_mem_error(__FILE__, __LINE__)
+#define VALUE_IF_MISSING "-" 
 
 extern int line_no;
+extern int init_called;
 #endif /* __GEDCOM_INTERNAL_H */