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));
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);
+}
+
/* 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
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);
if (gconv_path == NULL || strstr(gconv_path, PKGDATADIR) == NULL) {
- char *new_gconv_path;
if (gconv_path == NULL) {
new_gconv_path = (char *)malloc(strlen(GCONV_SEARCH_PATH)
+ strlen(PKGDATADIR)
abort();
}
}
+ if (init_called && atexit(cleanup_gconv_path) != 0) {
+ gedcom_warning(_("Could not register path cleanup function"));
+ }
+#endif /* USE_GLIBC_ICONV */
}
void init_encodings()
int open_conv_to_internal(const char* fromcode)
{
+ iconv_t new_cd_to_internal;
const char *encoding = get_encoding(fromcode, the_enc);
- if (cd_to_internal != (iconv_t) -1)
- iconv_close(cd_to_internal);
if (encoding == NULL) {
- cd_to_internal = (iconv_t) -1;
+ new_cd_to_internal = (iconv_t) -1;
}
else {
memset(conv_buf, 0, sizeof(conv_buf));
conv_buf_size = 0;
- cd_to_internal = iconv_open(INTERNAL_ENCODING, encoding);
- if (cd_to_internal == (iconv_t) -1) {
+ new_cd_to_internal = iconv_open(INTERNAL_ENCODING, encoding);
+ if (new_cd_to_internal == (iconv_t) -1) {
gedcom_error(_("Error opening conversion context for encoding %s: %s"),
encoding, strerror(errno));
}
}
- return (cd_to_internal != (iconv_t) -1);
+ if (new_cd_to_internal != (iconv_t) -1) {
+ if (cd_to_internal != (iconv_t) -1)
+ iconv_close(cd_to_internal);
+ cd_to_internal = new_cd_to_internal;
+ }
+ return (new_cd_to_internal != (iconv_t) -1);
}
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,