aboutsummaryrefslogtreecommitdiff
path: root/wcsmbs/btowc.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2004-12-22 20:10:10 +0000
committerUlrich Drepper <drepper@redhat.com>2004-12-22 20:10:10 +0000
commita334319f6530564d22e775935d9c91663623a1b4 (patch)
treeb5877475619e4c938e98757d518bb1e9cbead751 /wcsmbs/btowc.c
parent0ecb606cb6cf65de1d9fc8a919bceb4be476c602 (diff)
downloadglibc-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 'wcsmbs/btowc.c')
-rw-r--r--wcsmbs/btowc.c30
1 files changed, 7 insertions, 23 deletions
diff --git a/wcsmbs/btowc.c b/wcsmbs/btowc.c
index 6517d4f635..1ba0221403 100644
--- a/wcsmbs/btowc.c
+++ b/wcsmbs/btowc.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996-2000,2002,2005 Free Software Foundation, Inc.
+/* Copyright (C) 1996,1997,1998,1999,2000,2002 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 <ctype.h>
#include <dlfcn.h>
#include <gconv.h>
#include <stdio.h>
@@ -26,8 +25,6 @@
#include <wcsmbsload.h>
#include <limits.h>
-#include <sysdep.h>
-
wint_t
__btowc (c)
@@ -40,24 +37,15 @@ __btowc (c)
if (c < SCHAR_MIN || c > UCHAR_MAX || c == EOF)
return WEOF;
- /* We know that only ASCII compatible encodings are used for the
- locale and that the wide character encoding is ISO 10646. */
- if (isascii (c))
- return (wint_t) c;
-
/* Get the conversion functions. */
fcts = get_gconv_fcts (_NL_CURRENT_DATA (LC_CTYPE));
- __gconv_btowc_fct btowc_fct = fcts->towc->__btowc_fct;
if (__builtin_expect (fcts->towc_nsteps == 1, 1)
- && __builtin_expect (btowc_fct != NULL, 1))
+ && __builtin_expect (fcts->towc->__btowc_fct != NULL, 1))
{
/* Use the shortcut function. */
-#ifdef PTR_DEMANGLE
- if (fcts->towc->__shlib_handle != NULL)
- PTR_DEMANGLE (btowc_fct);
-#endif
- return DL_CALL_FCT (btowc_fct, (fcts->towc, (unsigned char) c));
+ return DL_CALL_FCT (fcts->towc->__btowc_fct,
+ (fcts->towc, (unsigned char) c));
}
else
{
@@ -84,13 +72,9 @@ __btowc (c)
/* Create the input string. */
inbuf[0] = c;
- __gconv_fct fct = fcts->towc->__fct;
-#ifdef PTR_DEMANGLE
- if (fcts->towc->__shlib_handle != NULL)
- PTR_DEMANGLE (fct);
-#endif
- status = DL_CALL_FCT (fct, (fcts->towc, &data, &inptr, inptr + 1,
- NULL, &dummy, 0, 1));
+ status = DL_CALL_FCT (fcts->towc->__fct,
+ (fcts->towc, &data, &inptr, inptr + 1,
+ NULL, &dummy, 0, 1));
if (status != __GCONV_OK && status != __GCONV_FULL_OUTPUT
&& status != __GCONV_EMPTY_INPUT)