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 /iconv/gconv.c | |
| parent | 0ecb606cb6cf65de1d9fc8a919bceb4be476c602 (diff) | |
| download | glibc-a334319f6530564d22e775935d9c91663623a1b4.tar glibc-a334319f6530564d22e775935d9c91663623a1b4.tar.gz glibc-a334319f6530564d22e775935d9c91663623a1b4.tar.bz2 glibc-a334319f6530564d22e775935d9c91663623a1b4.zip | |
(CFLAGS-tst-align.c): Add -mpreferred-stack-boundary=4.
Diffstat (limited to 'iconv/gconv.c')
| -rw-r--r-- | iconv/gconv.c | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/iconv/gconv.c b/iconv/gconv.c index cd43d3d6fb..f3f49b7db3 100644 --- a/iconv/gconv.c +++ b/iconv/gconv.c @@ -1,6 +1,6 @@ /* Convert characters in input buffer using conversion descriptor to output buffer. - Copyright (C) 1997-2001, 2005 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. @@ -20,13 +20,10 @@ 02111-1307 USA. */ #include <assert.h> +#include <gconv_int.h> +#include <sys/param.h> #include <dlfcn.h> #include <stddef.h> -#include <sys/param.h> - -#include <gconv_int.h> -#include <sysdep.h> - int internal_function @@ -48,15 +45,9 @@ __gconv (__gconv_t cd, const unsigned char **inbuf, cd->__data[last_step].__outbuf = outbuf != NULL ? *outbuf : NULL; cd->__data[last_step].__outbufend = outbufend; - __gconv_fct fct = cd->__steps->__fct; -#ifdef PTR_DEMANGLE - if (cd->__steps->__shlib_handle != NULL) - PTR_DEMANGLE (fct); -#endif - if (inbuf == NULL || *inbuf == NULL) /* We just flush. */ - result = DL_CALL_FCT (fct, + result = DL_CALL_FCT (cd->__steps->__fct, (cd->__steps, cd->__data, NULL, NULL, NULL, irreversible, cd->__data[last_step].__outbuf == NULL ? 2 : 1, 0)); @@ -69,7 +60,7 @@ __gconv (__gconv_t cd, const unsigned char **inbuf, do { last_start = *inbuf; - result = DL_CALL_FCT (fct, + result = DL_CALL_FCT (cd->__steps->__fct, (cd->__steps, cd->__data, inbuf, inbufend, NULL, irreversible, 0, 0)); } |