aboutsummaryrefslogtreecommitdiff
path: root/iconv/gconv_int.h
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1998-12-17 20:59:54 +0000
committerUlrich Drepper <drepper@redhat.com>1998-12-17 20:59:54 +0000
commit8c4796197c60fc8aa380d8995f0d744faf4d8c4a (patch)
tree8747f959e3e829d8bb70971f7e7017f73696b828 /iconv/gconv_int.h
parentc5b0e13e208bbc4722be3f45283e75d1333b4957 (diff)
downloadglibc-8c4796197c60fc8aa380d8995f0d744faf4d8c4a.zip
glibc-8c4796197c60fc8aa380d8995f0d744faf4d8c4a.tar.gz
glibc-8c4796197c60fc8aa380d8995f0d744faf4d8c4a.tar.bz2
Update.
* iconv/gconv_int.h (gconv_module): Add new element from_regex_mem. * iconv/gconv_conf.c (module_compare): Make s1 and s2 const. (detect_conflict): New function. (add_alias): Call detect_conflict to see whether there is already a module for the new name. (add_module): Make sure there is no alias for the new name. (read_conf_file): Call add_alias with new argument. (__gconv_read_conf): Don't destroy module tree immediately after walking it. We need it to test the internal conversions for conflicts. * iconv/gconv_db.c (find_derivation): Don't allocate memory for regular expression. There is now room in the module descriptor. (free_mem): Don't free memory for regular expression.
Diffstat (limited to 'iconv/gconv_int.h')
-rw-r--r--iconv/gconv_int.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/iconv/gconv_int.h b/iconv/gconv_int.h
index f023919..bc67b0b 100644
--- a/iconv/gconv_int.h
+++ b/iconv/gconv_int.h
@@ -67,6 +67,7 @@ struct gconv_module
const char *from_constpfx;
size_t from_constpfx_len;
const regex_t *from_regex;
+ regex_t from_regex_mem;
const char *to_string;