From 2debc8c54bf6e752554f212be7e3d50524d2b867 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Fri, 24 Nov 2000 21:13:13 +0000 Subject: Update. 2000-11-24 Ulrich Drepper * iconv/gconv_conf.c (insert_module): Replace old entry if new one hsa same names but lower cost. 2000-11-23 Jakub Jelinek * sysdeps/sparc/sparc32/dl-machine.h: Ifdef out handling for relocs which never occur during bootstrap. * sysdeps/sparc/sparc64/dl-machine.h: Likewise. --- iconv/gconv_conf.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'iconv/gconv_conf.c') 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; -- cgit v1.2.3