diff options
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | iconv/gconv_conf.c | 12 |
2 files changed, 22 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 0f155689dc..612622a022 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2000-11-24 Ulrich Drepper <drepper@redhat.com> + + * iconv/gconv_conf.c (insert_module): Replace old entry if new one + hsa same names but lower cost. + +2000-11-23 Jakub Jelinek <jakub@redhat.com> + + * sysdeps/sparc/sparc32/dl-machine.h: Ifdef out handling for relocs + which never occur during bootstrap. + * sysdeps/sparc/sparc64/dl-machine.h: Likewise. + 2000-11-23 Andreas Jaeger <aj@suse.de> * nss/nss_files/files-hosts.c: Remove getipnodebyname. diff --git a/iconv/gconv_conf.c b/iconv/gconv_conf.c index a9b458130a..15a59072f3 100644 --- a/iconv/gconv_conf.c +++ b/iconv/gconv_conf.c @@ -196,7 +196,17 @@ insert_module (struct gconv_module *newp, int tobefreed) if (root != NULL) { - /* This is a no new conversion. */ + /* This is a no new conversion. But maybe the cost is + better. */ + if (newp->cost_hi < root->cost_hi + || (newp->cost_hi == root->cost_hi + && newp->cost_lo < root->cost_lo)) + { + root->cost_hi = newp->cost_hi; + root->cost_lo = newp->cost_lo; + root->module_name = newp->module_name; + } + if (tobefreed) free (newp); return; |