Added some explanatory comment to the last item of the enums (and

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

diff --git a/gedcom/encoding.c b/gedcom/encoding.c
index 0c7af44d652b855ed6e71912b430e0484bc7ac4a..152da3007e7978ecc2e4dbbb929eb83b554bc37d 100644 (file)
--- a/gedcom/encoding.c
+++ b/gedcom/encoding.c
@@ -30,7 +30,6 @@
 #include "gedcom_internal.h"
 #include "encoding.h"
 
-#define INTERNAL_ENCODING "UTF8"
 #define ENCODING_CONF_FILE "gedcom.enc"
 #define GCONV_SEARCH_PATH "GCONV_PATH"
 #define MAXBUF 255
@@ -81,7 +80,7 @@ char* get_encoding(char* gedcom_n, ENCODING enc)
   datum = tfind(&search_node, &encoding_mapping, node_compare);
   free(buffer);
   if (datum == NULL) {
-    gedcom_error(_("No encoding found for '%s'"), gedcom_n);
+    gedcom_error(_("No encoding defined for '%s'"), gedcom_n);
     return NULL;
   }
   else {
@@ -118,8 +117,7 @@ void init_encodings()
                GCONV_SEARCH_PATH, gconv_path, PKGDATADIR);
       }
       if (putenv(new_gconv_path) != 0) {
-       gedcom_warning(_("Failed updating environment variable %s"),
-                      GCONV_SEARCH_PATH);
+       gedcom_warning(_("Failed updating conversion module path"));
       }
     }
     
@@ -135,6 +133,7 @@ void init_encodings()
                     ENCODING_CONF_FILE);
     }
     else {
+      line_no = 1;
       while (fgets(buffer, sizeof(buffer), in) != NULL) {
        if (buffer[strlen(buffer) - 1] != '\n') {
          gedcom_error(_("Line too long in encoding configuration file '%s'"),