From e34b0f2902588bbbfaf55829692e32c3c7134b74 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Mon, 24 Nov 1997 02:08:40 +0000 Subject: Update. 1997-11-24 03:01 Ulrich Drepper * elf/dl-support.c: Call __libc_init_secure to make sure __libc_enable_secure is defined early. * sysdeps/generic/enbl-secure.c: Change function name to __libc_init_secure and make it global instead of a constructor. * iconv/gconv.c: Fix lots of bugs. * iconv/gconv.h: Likewise. * iconv/gconv_builtin.h: Likewise. * iconv/gconv_close.c: Likewise. * iconv/gconv_conf.c: Likewise. * iconv/gconv_db.c: Likewise. * iconv/gconv_dl.c: Likewise. * iconv/gconv_open.c: Likewise. * iconv/gconv_simple.c: Likewise. * iconv/iconv.c: Likewise. * iconv/iconv_close.c: Likewise. * iconv/iconv_open.c: Likewise. * wcsmbs/Makefile (routines): Add wmemrtowcs and wmemrtombs. * wcsmbs/wchar.h: Add prototypes for wmemrtowcs and wmemrtombs. * wcsmbs/wmemrtombs.c: New file. * wcsmbs/wmemrtowcs.c: New file. --- iconv/gconv_simple.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'iconv/gconv_simple.c') diff --git a/iconv/gconv_simple.c b/iconv/gconv_simple.c index 582c6f5a27..f769795273 100644 --- a/iconv/gconv_simple.c +++ b/iconv/gconv_simple.c @@ -117,7 +117,7 @@ __gconv_transform_ucs4_utf8 (struct gconv_step *step, do { const char *newinbuf = inbuf; - size_t actually = __wcsnrtombs (&data->outbuf[data->outbufavail], + size_t actually = __wmemrtombs (&data->outbuf[data->outbufavail], (const wchar_t **) &newinbuf, *inlen / sizeof (wchar_t), data->outbufsize - data->outbufavail, @@ -206,7 +206,7 @@ __gconv_transform_utf8_ucs4 (struct gconv_step *step, do { const char *newinbuf = inbuf; - size_t actually = __mbsnrtowcs ((wchar_t *) &data->outbuf[data->outbufavail], + size_t actually = __wmemrtowcs ((wchar_t *) &data->outbuf[data->outbufavail], &newinbuf, *inlen, ((data->outbufsize - data->outbufavail) -- cgit v1.2.3