Completed writing of strings and xrefs.

[gedcom-parse.git] / gedcom / multilex.c

diff --git a/gedcom/multilex.c b/gedcom/multilex.c
index ec7c35c45a5ec34bbcce01fed3d8ba92923c3097..e8d514cb67296e2777548eeb0ebf80c1ed733ade 100644 (file)
--- a/gedcom/multilex.c
+++ b/gedcom/multilex.c
@@ -33,7 +33,7 @@ lex_func lf;
 
 #define NEW_MODEL_FILE "new.ged"
 
-int lexer_init(ENCODING enc, FILE* f)
+int lexer_init(Encoding enc, FILE* f)
 {
   if (enc == ONE_BYTE) {
     lf  = &gedcom_1byte_lex;
@@ -118,38 +118,24 @@ int determine_encoding(FILE* f)
 
 int init_called = 0;
 
-void gedcom_init()
+int gedcom_init()
 {
   init_called = 1;
   update_gconv_search_path();
-  setlocale(LC_ALL, "");
+  init_encodings();
+  if (!setlocale(LC_ALL, "")
+      || ! bindtextdomain(PACKAGE, LOCALEDIR)
+      || ! bind_textdomain_codeset(PACKAGE, INTERNAL_ENCODING))
+    return 1;
+  else
+    return 0;
 }
 
 int gedcom_parse_file(const char* file_name)
 {
-  ENCODING enc;
+  Encoding enc;
   int result = 1;
   FILE* file;
-  char *textdom, *save_textdom;
-
-  textdom = textdomain(NULL);
-  if (!textdom) {
-    gedcom_error(_("Could not retrieve text domain: %s"), strerror(errno));
-    return result;
-  }
-  
-  save_textdom = strdup(textdom);
-  if (! save_textdom) {
-    MEMORY_ERROR;
-    return result;
-  }
-  
-  if (! bindtextdomain(PACKAGE, LOCALEDIR)
-      || ! bind_textdomain_codeset(PACKAGE, INTERNAL_ENCODING)
-      || ! textdomain(PACKAGE)) {
-    gedcom_error(_("Could not set text domain: %s"), strerror(errno));
-    return result;
-  }
 
   if (!init_called) {
     gedcom_error(_("Internal error: GEDCOM parser not initialized"));
@@ -161,7 +147,7 @@ int gedcom_parse_file(const char* file_name)
                   file_name, strerror(errno));
     }
     else {
-      init_encodings();
+      line_no = 1;
       enc = determine_encoding(file);
       
       if (lexer_init(enc, file)) {
@@ -177,10 +163,6 @@ int gedcom_parse_file(const char* file_name)
     }
   }
 
-  if (! textdomain(save_textdom)) {
-    gedcom_error(_("Could not restore text domain: %s"), strerror(errno));
-    return result;
-  }
   return result;
 }