X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=gedcom%2Fmultilex.c;h=9a57b628d2dc3cdf75a2f6a960c78465f66f4e25;hb=6cb2fba281c993d06b725b0ecb7cbe404f81aff7;hp=75563117c55f8f51f6bbd151491f5e31a40cf1af;hpb=7cbefaec45b82eb0449465da19d38a89f2ff2cf3;p=gedcom-parse.git

diff --git a/gedcom/multilex.c b/gedcom/multilex.c
index 7556311..9a57b62 100644
--- a/gedcom/multilex.c
+++ b/gedcom/multilex.c
@@ -118,10 +118,16 @@ int determine_encoding(FILE* f)
 
 int init_called = 0;
 
-void gedcom_init()
+int gedcom_init()
 {
   init_called = 1;
   update_gconv_search_path();
+  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)
@@ -129,33 +135,6 @@ int gedcom_parse_file(const char* file_name)
   ENCODING enc;
   int result = 1;
   FILE* file;
-  char *locale, *save_locale, *save_textdom;
-
-  locale = setlocale(LC_ALL, NULL);
-  if (! locale) {
-    gedcom_error(_("Could not retrieve locale information"));
-    return result;
-  }
-  
-  save_locale  = strdup(locale);
-  if (! save_locale) {
-    MEMORY_ERROR;
-    return result;
-  }
-  
-  save_textdom = textdomain(NULL);
-  if (!save_textdom) {
-    gedcom_error(_("Could not retrieve locale domain: %s"), strerror(errno));
-    return result;
-  }
-  
-  if (! setlocale(LC_ALL, "")
-      || ! bindtextdomain(PACKAGE, LOCALEDIR)
-      || ! bind_textdomain_codeset(PACKAGE, INTERNAL_ENCODING)
-      || ! textdomain(PACKAGE)) {
-    gedcom_error(_("Could not set locale: %s"), strerror(errno));
-    return result;
-  }
 
   if (!init_called) {
     gedcom_error(_("Internal error: GEDCOM parser not initialized"));
@@ -183,12 +162,6 @@ int gedcom_parse_file(const char* file_name)
     }
   }
 
-  if (! textdomain(save_textdom)
-      || ! setlocale(LC_ALL, save_locale)) {
-    gedcom_error(_("Could not restore locale: %s"), strerror(errno));
-    return result;
-  }
-  free(save_locale);
   return result;
 }
 
@@ -228,6 +201,6 @@ int gedcom_check_version(int major, int minor, int patch)
     return 0;
   else if (patch <= GEDCOM_PARSE_VERSION_PATCH)
     return 1;
-  else {
+  else
     return 0;
 }