diff options
Diffstat (limited to 'iconv')
| -rw-r--r-- | iconv/gconv_conf.c | 6 | ||||
| -rw-r--r-- | iconv/gconv_db.c | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/iconv/gconv_conf.c b/iconv/gconv_conf.c index b7e7692c89..d36a751a8c 100644 --- a/iconv/gconv_conf.c +++ b/iconv/gconv_conf.c @@ -1,5 +1,5 @@ /* Handle configuration data. - Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation, Inc. + Copyright (C) 1997,98,99,2000,2001 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. @@ -506,7 +506,7 @@ __gconv_get_path (void) result[n].len = 0; } - __gconv_path_elem = result ?: &empty_path_elem; + __gconv_path_elem = result ?: (struct path_elem *) &empty_path_elem; if (cwd != NULL) free (cwd); @@ -552,7 +552,7 @@ __gconv_read_conf (void) { struct gconv_alias fake_alias; - fake_alias.fromname = builtin_modules[cnt].from_string; + fake_alias.fromname = (char *) builtin_modules[cnt].from_string; if (__tfind (&fake_alias, &__gconv_alias_db, __gconv_alias_compare) != NULL) diff --git a/iconv/gconv_db.c b/iconv/gconv_db.c index d003981d3e..c4ebc4f096 100644 --- a/iconv/gconv_db.c +++ b/iconv/gconv_db.c @@ -1,5 +1,5 @@ /* Provide access to the collection of available transformation modules. - Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation, Inc. + Copyright (C) 1997,98,99,2000,2001 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. @@ -225,7 +225,7 @@ gen_steps (struct derivation_step *best, const char *toset, { result[step_cnt].__from_name = (step_cnt == 0 ? __strdup (fromset) - : current->last->result_set); + : (char *)current->last->result_set); result[step_cnt].__to_name = (step_cnt + 1 == *nsteps ? __strdup (current->result_set) : result[step_cnt + 1].__from_name); @@ -644,11 +644,11 @@ __gconv_find_transform (const char *toset, const char *fromset, struct gconv_alias key; struct gconv_alias **found; - key.fromname = fromset; + key.fromname = (char *) fromset; found = __tfind (&key, &__gconv_alias_db, __gconv_alias_compare); fromset_expand = found != NULL ? (*found)->toname : NULL; - key.fromname = toset; + key.fromname = (char *) toset; found = __tfind (&key, &__gconv_alias_db, __gconv_alias_compare); toset_expand = found != NULL ? (*found)->toname : NULL; } |