diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2000-11-24 23:39:37 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2000-11-24 23:39:37 +0000 |
| commit | 9c0592ab3b82691480fff3732239d5892d367df9 (patch) | |
| tree | cce17bc0b06043c7cc31f953dc0817f6436b60f6 /iconv | |
| parent | 2debc8c54bf6e752554f212be7e3d50524d2b867 (diff) | |
| download | glibc-9c0592ab3b82691480fff3732239d5892d367df9.tar.gz | |
Update.
* test-skeleton.c: Mark local functions as static to avoid warnings.
2000-11-23 H.J. Lu <hjl@gnu.org>
* rt/tst-aio6.c (do_test): Use pipe instead of STDIN_FILENO to
support the background job.
Fix a typo.
2000-11-24 Ulrich Drepper <drepper@redhat.com>
has same names but lower cost.
Diffstat (limited to 'iconv')
| -rw-r--r-- | iconv/gconv_conf.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/iconv/gconv_conf.c b/iconv/gconv_conf.c index 15a59072f3..15e930360f 100644 --- a/iconv/gconv_conf.c +++ b/iconv/gconv_conf.c @@ -202,12 +202,14 @@ insert_module (struct gconv_module *newp, int tobefreed) || (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; - } + newp->left = root->left; + newp->right = root->right; + newp->same = root->same; + *rootp = newp; - if (tobefreed) + free (root); + } + else if (tobefreed) free (newp); return; } |