From 0d9f67937f0c9329c35c2c0d15848ab8316dc520 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sat, 4 Apr 1998 07:25:25 +0000 Subject: Update. 1998-04-03 23:17 Ulrich Drepper * iconv/gconv.c: Rewrite of the low-level of gconv. * iconv/gconv.h: Likewise. * iconv/gconv_builtin.h: Likewise. * iconv/gconv_close.c: Likewise. * iconv/gconv_db.: Likewise. * iconv/gconv_dl.c: Likewise. * iconv/gconv_int.h: Likewise. * iconv/gconv_open.c: Likewise. * iconv/gconv_simple.c: Likewise. * iconvdata/8bit-gap.c: Adapt for rewrite. * iconvdata/8bit-generic.c: Likewise. * iconvdata/euckr.c: Likewise. * iconvdata/iso646.c: Likewise. * iconvdata/iso6937.c: Likewise. * iconvdata/iso8859-1.c: Likewise. * iconvdata/johab.c: Likewise. * iconvdata/sjis.c: Likewise. * iconvdata/t61.c: Likewise. * iconvdata/uhc.c: Likewise. --- iconvdata/johab.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'iconvdata/johab.c') diff --git a/iconvdata/johab.c b/iconvdata/johab.c index 3acd5fcad7..bde56ce1d3 100644 --- a/iconvdata/johab.c +++ b/iconvdata/johab.c @@ -239,7 +239,7 @@ johab_from_ucs4 (wchar_t ch, unsigned char *cp) int -gconv_init (struct gconv_step *step, struct gconv_step_data *data) +gconv_init (struct gconv_step *step) { /* Determine which direction. */ struct johab_data *new_data; @@ -260,7 +260,7 @@ gconv_init (struct gconv_step *step, struct gconv_step_data *data) != NULL)) { new_data->dir = dir; - data->data = new_data; + step->data = new_data; result = GCONV_OK; } @@ -269,7 +269,7 @@ gconv_init (struct gconv_step *step, struct gconv_step_data *data) void -gconv_end (struct gconv_step_data *data) +gconv_end (struct gconv_step *data) { free (data->data); } @@ -308,7 +308,7 @@ gconv (struct gconv_step *step, struct gconv_step_data *data, } else { - enum direction dir = ((struct johab_data *) data->data)->dir; + enum direction dir = ((struct johab_data *) step->data)->dir; do_write = 0; -- cgit v1.2.3