diff options
Diffstat (limited to 'wcsmbs/wcsrtombs.c')
| -rw-r--r-- | wcsmbs/wcsrtombs.c | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/wcsmbs/wcsrtombs.c b/wcsmbs/wcsrtombs.c index 5973fd9303..8b444ed8a2 100644 --- a/wcsmbs/wcsrtombs.c +++ b/wcsmbs/wcsrtombs.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996-2000, 2002, 2003, 2005 Free Software Foundation, Inc. +/* Copyright (C) 1996-2000, 2002, 2003 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@gnu.org>, 1996. @@ -17,7 +17,6 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -#include <assert.h> #include <dlfcn.h> #include <errno.h> #include <stdlib.h> @@ -25,7 +24,7 @@ #include <wchar.h> #include <wcsmbsload.h> -#include <sysdep.h> +#include <assert.h> #ifndef EILSEQ # define EILSEQ EINVAL @@ -60,11 +59,6 @@ __wcsrtombs (dst, src, len, ps) /* Get the structure with the function pointers. */ tomb = fcts->tomb; - __gconv_fct fct = tomb->__fct; -#ifdef PTR_DEMANGLE - if (tomb->__shlib_handle != NULL) - PTR_DEMANGLE (fct); -#endif /* We have to handle DST == NULL special. */ if (dst == NULL) @@ -85,9 +79,10 @@ __wcsrtombs (dst, src, len, ps) { data.__outbuf = buf; - status = DL_CALL_FCT (fct, (tomb, &data, &inbuf, - (const unsigned char *) srcend, NULL, - &dummy, 0, 1)); + status = DL_CALL_FCT (tomb->__fct, + (tomb, &data, &inbuf, + (const unsigned char *) srcend, NULL, + &dummy, 0, 1)); /* Count the number of bytes. */ result += data.__outbuf - buf; @@ -110,12 +105,13 @@ __wcsrtombs (dst, src, len, ps) const wchar_t *srcend = *src + __wcsnlen (*src, len) + 1; size_t dummy; - data.__outbuf = (unsigned char *) dst; - data.__outbufend = (unsigned char *) dst + len; + data.__outbuf = dst; + data.__outbufend = dst + len; - status = DL_CALL_FCT (fct, (tomb, &data, (const unsigned char **) src, - (const unsigned char *) srcend, NULL, - &dummy, 0, 1)); + status = DL_CALL_FCT (tomb->__fct, + (tomb, &data, (const unsigned char **) src, + (const unsigned char *) srcend, NULL, + &dummy, 0, 1)); /* Count the number of bytes. */ result = data.__outbuf - (unsigned char *) dst; |