From aae06c11a0ed3e751b7acb926f87b7a7c9f7ef9b Mon Sep 17 00:00:00 2001
From: Peter Verthez <Peter.Verthez@advalvas.be>
Date: Wed, 27 Mar 2002 20:06:46 +0000
Subject: [PATCH] Make the use of gedcom_init mandatory.

---
 gedcom/multilex.c | 38 +++++++++++++++++++++++---------------
 1 file changed, 23 insertions(+), 15 deletions(-)

diff --git a/gedcom/multilex.c b/gedcom/multilex.c
index 727c179..96af295 100644
--- a/gedcom/multilex.c
+++ b/gedcom/multilex.c
@@ -105,8 +105,11 @@ int determine_encoding(FILE* f)
   }
 }
 
+static int init_called = 0;
+
 void gedcom_init()
 {
+  init_called = 1;
   update_gconv_search_path();
 }
 
@@ -123,24 +126,29 @@ int gedcom_parse_file(char* file_name)
   bind_textdomain_codeset(PACKAGE, INTERNAL_ENCODING);
   textdomain(PACKAGE);
 
-  line_no = 1;
-  file = fopen(file_name, "r");
-  if (!file) {
-    gedcom_error(_("Could not open file '%s'"), file_name);
+  if (!init_called) {
+    gedcom_error(_("Internal error: GEDCOM parser not initialized"));
   }
   else {
-    init_encodings();
-    enc = determine_encoding(file);
-    
-    if (lexer_init(enc, file)) {
-      line_no = 1;
-      make_xref_table();
-      result = gedcom_parse();
-      if (result == 0)
-	result = check_xref_table();
+    line_no = 1;
+    file = fopen(file_name, "r");
+    if (!file) {
+      gedcom_error(_("Could not open file '%s'"), file_name);
+    }
+    else {
+      init_encodings();
+      enc = determine_encoding(file);
+      
+      if (lexer_init(enc, file)) {
+	line_no = 1;
+	make_xref_table();
+	result = gedcom_parse();
+	if (result == 0)
+	  result = check_xref_table();
+      }
+      lexer_close();
+      fclose(file);
     }
-    lexer_close();
-    fclose(file);
   }
 
   textdomain(save_textdom);
-- 
2.30.2