X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=gedcom%2Fencoding.c;h=d484d1c7847054a7cd3fdf0c8d5c4eccf832f5f9;hb=7cbefaec45b82eb0449465da19d38a89f2ff2cf3;hp=36f88f3bca4a0b81ad9db73d31218a3cbe6b81b9;hpb=a14f8b06cbf7f3ca39951e1c7f3d12c4ff5b07cb;p=gedcom-parse.git

diff --git a/gedcom/encoding.c b/gedcom/encoding.c
index 36f88f3..d484d1c 100644
--- a/gedcom/encoding.c
+++ b/gedcom/encoding.c
@@ -41,12 +41,12 @@ static hash_t *encodings = NULL;
 
 const char* charwidth_string[] = { "1", "2_HILO", "2_LOHI" };
 
-hnode_t *node_alloc(void *c __attribute__((unused)))
+hnode_t *node_alloc(void *c UNUSED)
 {
   return (hnode_t *)malloc(sizeof *node_alloc(NULL));
 }
 
-void node_free(hnode_t *n, void *c __attribute__((unused)))
+void node_free(hnode_t *n, void *c UNUSED)
 {
   free((void*)hnode_getkey(n));
   free(hnode_get(n));
@@ -107,20 +107,28 @@ char* get_encoding(const char* gedcom_n, ENCODING enc)
   }
 }
 
-static char *new_gconv_path;
-
 void cleanup_encodings()
 {
   hash_free(encodings);
+}
+
+#ifdef USE_GLIBC_ICONV
+
+static char *new_gconv_path;
+
+void cleanup_gconv_path()
+{
   /* Clean up environment */
   putenv(GCONV_SEARCH_PATH);
   if (new_gconv_path)
-    free(new_gconv_path);
+    free(new_gconv_path);  
 }
 
 /* Let function be called before main() */
 void update_gconv_search_path() __attribute__ ((constructor));
 
+#endif /* USE_GLIBC_ICONV */
+
 /* Note:
 
    The environment variable GCONV_PATH has to be adjusted before the very
@@ -142,6 +150,7 @@ void update_gconv_search_path() __attribute__ ((constructor));
 
 void update_gconv_search_path()
 {
+#ifdef USE_GLIBC_ICONV
   char *gconv_path;
   /* Add gedcom data directory to gconv search path */
   gconv_path = getenv(GCONV_SEARCH_PATH);
@@ -171,6 +180,10 @@ void update_gconv_search_path()
       abort();
     }
   }
+  if (init_called && atexit(cleanup_gconv_path) != 0) {
+    gedcom_warning(_("Could not register path cleanup function"));
+  }    
+#endif /* USE_GLIBC_ICONV */
 }
 
 void init_encodings()
@@ -261,10 +274,13 @@ int open_conv_to_internal(const char* fromcode)
 
 void close_conv_to_internal()
 {
-  if (iconv_close(cd_to_internal) != 0) {
-    gedcom_warning(_("Error closing conversion context: %s"), strerror(errno));
+  if (cd_to_internal != (iconv_t) -1) {
+    if (iconv_close(cd_to_internal) != 0) {
+      gedcom_warning(_("Error closing conversion context: %s"),
+		     strerror(errno));
+    }
+    cd_to_internal = (iconv_t) -1;
   }
-  cd_to_internal = (iconv_t) -1;
 }
 
 char* to_internal(const char* str, size_t len,
@@ -273,7 +289,7 @@ char* to_internal(const char* str, size_t len,
   size_t res;
   size_t outsize = out_len;
   char *wrptr = output_buffer;
-  char *rdptr = conv_buf;
+  ICONV_CONST char *rdptr = (ICONV_CONST char*) conv_buf;
   char *retval = output_buffer;
   /* set up input buffer (concatenate to what was left previous time) */
   /* can't use strcpy, because possible null bytes from unicode */