diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2001-07-22 17:29:40 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2001-07-22 17:29:40 +0000 |
| commit | 2c4223669598910462717212b583ef0be08dc2bb (patch) | |
| tree | b82d2f68c5640eba457e24ebe124175f627794de /iconv | |
| parent | 2abe0b543fed5e0f86f967192253cc558a08df2e (diff) | |
| download | glibc-2c4223669598910462717212b583ef0be08dc2bb.tar glibc-2c4223669598910462717212b583ef0be08dc2bb.tar.gz glibc-2c4223669598910462717212b583ef0be08dc2bb.tar.bz2 glibc-2c4223669598910462717212b583ef0be08dc2bb.zip | |
(struct builtin_map): Remove init and end elements. (BUILTIN_TRANSFORMATION): Remove Init and End parameters. (__gconv_get_builtin_trans): Initialize __init_fct and __end_fct to NULL.
Diffstat (limited to 'iconv')
| -rw-r--r-- | iconv/gconv_builtin.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/iconv/gconv_builtin.c b/iconv/gconv_builtin.c index 20fb8c676f..45bd4e7e00 100644 --- a/iconv/gconv_builtin.c +++ b/iconv/gconv_builtin.c @@ -1,5 +1,5 @@ /* Table for builtin transformation mapping. - Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation, Inc. + Copyright (C) 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. @@ -31,8 +31,6 @@ static struct builtin_map { const char *name; __gconv_fct fct; - __gconv_init_fct init; - __gconv_end_fct end; int min_needed_from; int max_needed_from; @@ -41,13 +39,11 @@ static struct builtin_map } map[] = { -#define BUILTIN_TRANSFORMATION(From, To, Cost, Name, Fct, Init, End, MinF, \ - MaxF, MinT, MaxT) \ +#define BUILTIN_TRANSFORMATION(From, To, Cost, Name, Fct, MinF, MaxF, \ + MinT, MaxT) \ { \ .name = Name, \ .fct = Fct, \ - .init = Init, \ - .end = End, \ \ .min_needed_from = MinF, \ .max_needed_from = MaxF, \ @@ -73,8 +69,8 @@ __gconv_get_builtin_trans (const char *name, struct __gconv_step *step) assert (cnt < sizeof (map) / sizeof (map[0])); step->__fct = map[cnt].fct; - step->__init_fct = map[cnt].init; - step->__end_fct = map[cnt].end; + step->__init_fct = NULL; + step->__end_fct = NULL; step->__shlib_handle = NULL; step->__modname = NULL; |