mirror of
https://sourceware.org/git/glibc.git
synced 2024-09-20 00:19:57 +00:00
f9ad060c7a
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.
88 lines
2.5 KiB
C
88 lines
2.5 KiB
C
/* Table for builtin transformation mapping.
|
|
Copyright (C) 1997-1999, 2000-2002 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 of the License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, write to the Free
|
|
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
|
02111-1307 USA. */
|
|
|
|
#include <endian.h>
|
|
#include <limits.h>
|
|
#include <string.h>
|
|
|
|
#include <gconv_int.h>
|
|
|
|
#include <assert.h>
|
|
|
|
|
|
static struct builtin_map
|
|
{
|
|
const char *name;
|
|
__gconv_fct fct;
|
|
__gconv_btowc_fct btowc_fct;
|
|
|
|
int min_needed_from;
|
|
int max_needed_from;
|
|
int min_needed_to;
|
|
int max_needed_to;
|
|
|
|
} map[] =
|
|
{
|
|
#define BUILTIN_TRANSFORMATION(From, To, Cost, Name, Fct, BtowcFct, \
|
|
MinF, MaxF, MinT, MaxT) \
|
|
{ \
|
|
.name = Name, \
|
|
.fct = Fct, \
|
|
.btowc_fct = BtowcFct, \
|
|
\
|
|
.min_needed_from = MinF, \
|
|
.max_needed_from = MaxF, \
|
|
.min_needed_to = MinT, \
|
|
.max_needed_to = MaxT \
|
|
},
|
|
#define BUILTIN_ALIAS(From, To)
|
|
|
|
#include <gconv_builtin.h>
|
|
};
|
|
|
|
|
|
void
|
|
internal_function
|
|
__gconv_get_builtin_trans (const char *name, struct __gconv_step *step)
|
|
{
|
|
size_t cnt;
|
|
|
|
for (cnt = 0; cnt < sizeof (map) / sizeof (map[0]); ++cnt)
|
|
if (strcmp (name, map[cnt].name) == 0)
|
|
break;
|
|
|
|
assert (cnt < sizeof (map) / sizeof (map[0]));
|
|
|
|
step->__fct = map[cnt].fct;
|
|
step->__btowc_fct = map[cnt].btowc_fct;
|
|
step->__init_fct = NULL;
|
|
step->__end_fct = NULL;
|
|
step->__shlib_handle = NULL;
|
|
step->__modname = NULL;
|
|
|
|
step->__min_needed_from = map[cnt].min_needed_from;
|
|
step->__max_needed_from = map[cnt].max_needed_from;
|
|
step->__min_needed_to = map[cnt].min_needed_to;
|
|
step->__max_needed_to = map[cnt].max_needed_to;
|
|
|
|
/* None of the builtin converters handles stateful encoding. */
|
|
step->__stateful = 0;
|
|
}
|