aboutsummaryrefslogtreecommitdiff
path: root/wcsmbs
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2002-12-02 22:39:58 +0000
committerUlrich Drepper <drepper@redhat.com>2002-12-02 22:39:58 +0000
commitf9ad060c7acbfd46d0a207c2da40999f8e6d4420 (patch)
tree6806c7540ab407d418a0d6d9650c9b818b24e32f /wcsmbs
parentbfa934e76ae3cac505610447071984b4bc4c49f5 (diff)
downloadglibc-f9ad060c7acbfd46d0a207c2da40999f8e6d4420.tar
glibc-f9ad060c7acbfd46d0a207c2da40999f8e6d4420.tar.gz
glibc-f9ad060c7acbfd46d0a207c2da40999f8e6d4420.tar.bz2
glibc-f9ad060c7acbfd46d0a207c2da40999f8e6d4420.zip
Update.
2002-11-30 Bruno Haible <bruno@clisp.org> * iconv/gconv.h (__gconv_btowc_fct): New typedef. (struct __gconv_step): New field __btowc_fct. * wcsmbs/btowc.c (__btowc): Use the __btowc_fct shortcut if possible. * iconv/gconv_int.h (__BUILTIN_TRANSFORM): Renamed from __BUILTIN_TRANS. (__gconv_btwoc_ascii): New declaration. * iconv/gconv_simple.c (BUILTIN_TRANSFORMATION): Add BtowcFct argument. (__gconv_btwoc_ascii): New function. * iconv/gconv_builtin.h: Add BtowcFct argument to all BUILTIN_TRANSFORMATION invocations. * iconv/gconv_conf.c (BUILTIN_TRANSFORMATION): Add BtowcFct argument. * iconv/iconvconfig.c (BUILTIN_TRANSFORMATION): Likewise. * iconv/gconv_builtin.c (map): New field btowc_fct. (BUILTIN_TRANSFORMATION): Add BtowcFct argument. Use it to initialize btowc_fct field. (__gconv_get_builtin_trans): Initialize __btowc_fct field. * iconv/gconv_cache.c (find_module): Initialize __btowc_fct field. * iconv/gconv_db.c (gen_steps, increment_counter): Likewise. * wcsmbs/wcsmbsload.c (to_wc, to_mb): Likewise. * iconv/skeleton.c: Document STORE_REST and FROM_ONEBYTE. (gconv_init): Initialize __btowc_fct field. Undefine EXTRA_LOOP_ARGS and FROM_ONEBYTE at the end. * iconv/loop.c: Document ONEBYTE_BODY. (gconv_btowc, FROM_ONEBYTE): Define if ONEBYTE_BODY is defined. Undefine ONEBYTE_BODY at the end. * iconvdata/8bit-generic.c (ONEBYTE_BODY): New macro. * iconvdata/8bit-gap.c (NONNUL): New macro. (BODY for FROM_LOOP): Use it. (ONEBYTE_BODY): New macro. * iconvdata/isiri-3342.c (HAS_HOLES): Set to 1. (NONNUL): New macro. * iconvdata/ansi_x3.110.c (ONEBYTE_BODY): New macro. * iconvdata/armscii-8.c (ONEBYTE_BODY): New macro. * iconvdata/cp1255.c (ONEBYTE_BODY): New macro. * iconvdata/cp1258.c (ONEBYTE_BODY): New macro. * iconvdata/tcvn5712-1.c (ONEBYTE_BODY): New macro. * iconvdata/big5.c (ONEBYTE_BODY): New macro. * iconvdata/big5hkscs.c (ONEBYTE_BODY): New macro. * iconvdata/euc-cn.c (ONEBYTE_BODY): New macro. * iconvdata/euc-jp.c (ONEBYTE_BODY): New macro. * iconvdata/euc-jisx0213.c (ONEBYTE_BODY): New macro. * iconvdata/euc-kr.c (ONEBYTE_BODY): New macro. * iconvdata/euc-tw.c (ONEBYTE_BODY): New macro. * iconvdata/gbk.c (ONEBYTE_BODY): New macro. * iconvdata/gb18030.c (ONEBYTE_BODY): New macro. * iconvdata/ibm932.c: Include <stdbool.h>. (TRUE, FALSE): Remove macros. (BODY for FROM_LOOP): Remove unused variable rp1. (ONEBYTE_BODY): New macro. (BODY for TO_LOOP): Use bool. * iconvdata/ibm932.h (__ibm932sb_to_ucs4_idx): Remove array. * iconvdata/ibm943.c: Include <stdbool.h>. (TRUE, FALSE): Remove macros. (BODY for FROM_LOOP): Remove unused variable rp1. (ONEBYTE_BODY): New macro. (BODY for TO_LOOP): Use bool. * iconvdata/ibm943.h (__ibm943sb_to_ucs4_idx): Remove array. * iconvdata/iso8859-1.c (ONEBYTE_BODY): New macro. * iconvdata/iso_6937-2.c (ONEBYTE_BODY): New macro. * iconvdata/iso_6937.c (ONEBYTE_BODY): New macro. * iconvdata/johab.c (ONEBYTE_BODY): New macro. * iconvdata/sjis.c (ONEBYTE_BODY): New macro. * iconvdata/shift_jisx0213.c (ONEBYTE_BODY): New macro. * iconvdata/t.61.c (ONEBYTE_BODY): New macro. * iconvdata/uhc.c (ONEBYTE_BODY): New macro. * iconvdata/gbbig5.c: Tweak comment.
Diffstat (limited to 'wcsmbs')
-rw-r--r--wcsmbs/btowc.c69
-rw-r--r--wcsmbs/wcsmbsload.c5
2 files changed, 45 insertions, 29 deletions
diff --git a/wcsmbs/btowc.c b/wcsmbs/btowc.c
index ca75e281e6..1ba0221403 100644
--- a/wcsmbs/btowc.c
+++ b/wcsmbs/btowc.c
@@ -30,12 +30,6 @@ wint_t
__btowc (c)
int c;
{
- wchar_t result;
- struct __gconv_step_data data;
- unsigned char inbuf[1];
- const unsigned char *inptr = inbuf;
- size_t dummy;
- int status;
const struct gconv_fcts *fcts;
/* If the parameter does not fit into one byte or it is the EOF value
@@ -43,32 +37,51 @@ __btowc (c)
if (c < SCHAR_MIN || c > UCHAR_MAX || c == EOF)
return WEOF;
- /* Tell where we want the result. */
- data.__outbuf = (unsigned char *) &result;
- data.__outbufend = data.__outbuf + sizeof (wchar_t);
- data.__invocation_counter = 0;
- data.__internal_use = 1;
- data.__flags = __GCONV_IS_LAST;
- data.__statep = &data.__state;
- data.__trans = NULL;
-
- /* Make sure we start in the initial state. */
- memset (&data.__state, '\0', sizeof (mbstate_t));
-
/* Get the conversion functions. */
fcts = get_gconv_fcts (_NL_CURRENT_DATA (LC_CTYPE));
- /* Create the input string. */
- inbuf[0] = c;
+ if (__builtin_expect (fcts->towc_nsteps == 1, 1)
+ && __builtin_expect (fcts->towc->__btowc_fct != NULL, 1))
+ {
+ /* Use the shortcut function. */
+ return DL_CALL_FCT (fcts->towc->__btowc_fct,
+ (fcts->towc, (unsigned char) c));
+ }
+ else
+ {
+ /* Fall back to the slow but generic method. */
+ wchar_t result;
+ struct __gconv_step_data data;
+ unsigned char inbuf[1];
+ const unsigned char *inptr = inbuf;
+ size_t dummy;
+ int status;
+
+ /* Tell where we want the result. */
+ data.__outbuf = (unsigned char *) &result;
+ data.__outbufend = data.__outbuf + sizeof (wchar_t);
+ data.__invocation_counter = 0;
+ data.__internal_use = 1;
+ data.__flags = __GCONV_IS_LAST;
+ data.__statep = &data.__state;
+ data.__trans = NULL;
+
+ /* Make sure we start in the initial state. */
+ memset (&data.__state, '\0', sizeof (mbstate_t));
+
+ /* Create the input string. */
+ inbuf[0] = c;
+
+ status = DL_CALL_FCT (fcts->towc->__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));
- /* The conversion failed. */
- if (status != __GCONV_OK && status != __GCONV_FULL_OUTPUT
- && status != __GCONV_EMPTY_INPUT)
- result = WEOF;
+ if (status != __GCONV_OK && status != __GCONV_FULL_OUTPUT
+ && status != __GCONV_EMPTY_INPUT)
+ /* The conversion failed. */
+ result = WEOF;
- return result;
+ return result;
+ }
}
weak_alias (__btowc, btowc)
diff --git a/wcsmbs/wcsmbsload.c b/wcsmbs/wcsmbsload.c
index bf23d25cac..2fea6c38b3 100644
--- a/wcsmbs/wcsmbsload.c
+++ b/wcsmbs/wcsmbsload.c
@@ -37,6 +37,7 @@ static struct __gconv_step to_wc =
.__from_name = (char *) "ANSI_X3.4-1968//TRANSLIT",
.__to_name = (char *) "INTERNAL",
.__fct = __gconv_transform_ascii_internal,
+ .__btowc_fct = __gconv_btwoc_ascii,
.__init_fct = NULL,
.__end_fct = NULL,
.__min_needed_from = 1,
@@ -55,6 +56,7 @@ static struct __gconv_step to_mb =
.__from_name = (char *) "INTERNAL",
.__to_name = (char *) "ANSI_X3.4-1968//TRANSLIT",
.__fct = __gconv_transform_internal_ascii,
+ .__btowc_fct = NULL,
.__init_fct = NULL,
.__end_fct = NULL,
.__min_needed_from = 4,
@@ -225,7 +227,8 @@ __wcsmbs_clone_conv (struct gconv_fcts *copy)
/* Copy the data. */
*copy = *orig;
- /* Now increment the usage counters. */
+ /* Now increment the usage counters.
+ Note: This assumes copy->towc_nsteps == 1 and copy->tomb_nsteps == 1. */
if (copy->towc->__shlib_handle != NULL)
++copy->towc->__counter;
if (copy->tomb->__shlib_handle != NULL)