mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-10 07:10:06 +00:00
2533775393
2003-06-13 Ulrich Drepper <drepper@redhat.com> Fixing gcc 3.3 warnings, part II. * argp/argp-help.c (hol_entry_long_iterate): Always inline. * elf/dl-load.c (cache_rpath): Don't inline. * iconvdata/cns11642l2.h: Always inline all functions. * iconvdata/iso-ir-165.h: Likewise. * locale/Makefile (aux): Add coll-lookup. * locale/coll-lookup.c: New file. * locale/coll-lookup.h (collidx_table_lookup): Do not define here. (collseq_table_lookup): Likewise. * locale/weightwc.h: Adjust collidx_table_lookup calls for name change. * posix/fnmatch_loop.c: Adjust collseq_table_lookup calls for name change. * posix/regcomp.c: Likewise. * posix/regexec.c: Likewise. * locale/programs/3level.h (*_get): Always inline. * locale/programs/locfile.h: Move definition of handle_copy to... * locale/programs/locfile.c: ...here. * locale/programs/ld-collate.c (obstack_int32_grow): Always inline. (obstack_int32_grow_fast): Likewise. (utf8_encode): Likewise. (find_element): Avoid aliasing problems. (insert_value): Likewise. (collate_read): Likewise. * nss/getent.c (print_hosts): Don't inline (print_networks): Likewise. (print_shadow): Likewise. (build_doc): Likewise. * nss/nss_files/files-parse.c [ENTDATA] (parser_stclass): Don't inline. * posix/regcomp.c (re_set_fastmap): Always inline. (seek_collating_symbol_entry): Likewise. (lookup_collation_sequence_value): Likewise. (build_range_exp): Likewise. (build_collating_symbol): Likewise. * posix/regexec.c (acquire_init_state_context): Don't inline. (clean_state_log_if_need): Likewise. * resolv/res_send.c (eConsIovec): Rewrite to not return struct and adjust all callers. (evConsTime): Likewise. (evAddTime): Likewise. (evSubTime): Likewise. (evNowTime): Likewise. (evTimeSpec): Removed. (__libc_res_nsend): Avoid aliasing problem. * sysdeps/unix/sysv/linux/ifreq.h: Move old_siocgifconf definition to.. * sysdeps/unix/sysv/linux/ifreq.c: ...here. * sysdeps/unix/sysv/linux/i386/dl-procinfo.h (_dl_string_hwcap): Always inline. (_dl_string_platform): Likewise. * wctype/wchar-lookup.h (wctype_table_lookup): Always inline. (wcwidth_table_lookup): Likewise. (wctrans_table_lookup): Likewise. * sysdeps/unix/sysv/linux/sys/epoll.h: Include <stdint.h>.
88 lines
2.3 KiB
C
88 lines
2.3 KiB
C
/* Access functions for CNS 11643, plane 2 handling.
|
|
Copyright (C) 1998, 1999, 2001, 2003 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
|
|
|
|
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 <stdint.h>
|
|
#include <gconv.h>
|
|
|
|
/* Table for CNS 11643, plane 2 to UCS4 conversion. */
|
|
extern const uint16_t __cns11643l2_to_ucs4_tab[];
|
|
|
|
|
|
static inline uint32_t
|
|
__attribute ((always_inline))
|
|
cns11643l2_to_ucs4 (const unsigned char **s, size_t avail,
|
|
unsigned char offset)
|
|
{
|
|
unsigned char ch = *(*s);
|
|
unsigned char ch2;
|
|
int idx;
|
|
|
|
if (ch < offset || (ch - offset) <= 0x20 || (ch - offset) > 0x7d)
|
|
return __UNKNOWN_10646_CHAR;
|
|
|
|
if (avail < 2)
|
|
return 0;
|
|
|
|
ch2 = (*s)[1];
|
|
if ((ch2 - offset) <= 0x20 || (ch2 - offset) >= 0x7f)
|
|
return __UNKNOWN_10646_CHAR;
|
|
|
|
idx = (ch - 0x21 - offset) * 94 + (ch2 - 0x21 - offset);
|
|
if (idx > 0x1de1)
|
|
return __UNKNOWN_10646_CHAR;
|
|
|
|
(*s) += 2;
|
|
|
|
return __cns11643l2_to_ucs4_tab[idx] ?: ((*s) -= 2, __UNKNOWN_10646_CHAR);
|
|
}
|
|
|
|
|
|
/* The table which contains the CNS 11643 level 2 mappings. */
|
|
extern const char __cns11643_from_ucs4p0_tab[][3];
|
|
|
|
|
|
static inline size_t
|
|
__attribute ((always_inline))
|
|
ucs4_to_cns11643l2 (uint32_t wch, unsigned char *s, size_t avail)
|
|
{
|
|
unsigned int ch = (unsigned int) wch;
|
|
const char *cp = NULL;
|
|
|
|
if (ch >= 0x4e07 && ch <= 0x9fa4)
|
|
{
|
|
cp = __cns11643_from_ucs4p0_tab[ch - 0x3400];
|
|
if (cp[0] == '\2')
|
|
++cp;
|
|
else
|
|
cp = NULL;
|
|
}
|
|
|
|
if (cp == NULL)
|
|
return __UNKNOWN_10646_CHAR;
|
|
|
|
if (avail < 2)
|
|
return 0;
|
|
|
|
s[0] = cp[0];
|
|
s[1] = cp[1];
|
|
|
|
return 2;
|
|
}
|