From 8c4796197c60fc8aa380d8995f0d744faf4d8c4a Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Thu, 17 Dec 1998 20:59:54 +0000 Subject: 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. --- iconv/gconv_int.h | 1 + 1 file changed, 1 insertion(+) (limited to 'iconv/gconv_int.h') diff --git a/iconv/gconv_int.h b/iconv/gconv_int.h index f0239195c9..bc67b0b050 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; -- cgit v1.2.3