diff options
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | iconv/gconv_db.c | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index f8afb393a3..e264b026e5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 1998-05-15 Ulrich Drepper <drepper@cygnus.com> + * iconv/gconv_db.c (derivation_lookup): Use __tfind correctly. + * sysdeps/generic/setenv.c (setenv): Remove optimization for overwriting existing values if it fits. diff --git a/iconv/gconv_db.c b/iconv/gconv_db.c index 503c5d0c86..b98cc8f4f2 100644 --- a/iconv/gconv_db.c +++ b/iconv/gconv_db.c @@ -102,15 +102,15 @@ derivation_lookup (const char *fromset, const char *toset, struct gconv_step **handle, size_t *nsteps) { struct known_derivation key = { fromset, toset, NULL, 0 }; - struct known_derivation *result; + struct known_derivation **result; result = __tfind (&key, &known_derivations, derivation_compare); if (result == NULL) return GCONV_NOCONV; - *handle = result->steps; - *nsteps = result->nsteps; + *handle = (*result)->steps; + *nsteps = (*result)->nsteps; /* Please note that we return GCONV_OK even if the last search for this transformation was unsuccessful. */ |