diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2004-12-22 20:10:10 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2004-12-22 20:10:10 +0000 |
| commit | a334319f6530564d22e775935d9c91663623a1b4 (patch) | |
| tree | b5877475619e4c938e98757d518bb1e9cbead751 /wcsmbs/wcsnrtombs.c | |
| parent | 0ecb606cb6cf65de1d9fc8a919bceb4be476c602 (diff) | |
| download | glibc-a334319f6530564d22e775935d9c91663623a1b4.tar.gz | |
(CFLAGS-tst-align.c): Add -mpreferred-stack-boundary=4.
Diffstat (limited to 'wcsmbs/wcsnrtombs.c')
| -rw-r--r-- | wcsmbs/wcsnrtombs.c | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/wcsmbs/wcsnrtombs.c b/wcsmbs/wcsnrtombs.c index 171fc3c227..0ff26d6671 100644 --- a/wcsmbs/wcsnrtombs.c +++ b/wcsmbs/wcsnrtombs.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,14 +17,13 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -#include <assert.h> #include <dlfcn.h> #include <errno.h> #include <gconv.h> #include <wchar.h> #include <wcsmbsload.h> -#include <sysdep.h> +#include <assert.h> #ifndef EILSEQ # define EILSEQ EINVAL @@ -68,11 +67,6 @@ __wcsnrtombs (dst, src, nwc, 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) @@ -88,9 +82,10 @@ __wcsnrtombs (dst, src, nwc, 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; @@ -109,12 +104,13 @@ __wcsnrtombs (dst, src, nwc, len, ps) of the string. */ 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; |