mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-30 16:50:07 +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>.
116 lines
2.9 KiB
C
116 lines
2.9 KiB
C
/* Copyright (C) 1996-2000, 2001, 2003 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Written by Ulrich Drepper, <drepper@cygnus.com>.
|
|
|
|
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. */
|
|
|
|
/* Find index of weight. */
|
|
static inline int32_t
|
|
__attribute ((always_inline))
|
|
findidx (const wint_t **cpp)
|
|
{
|
|
int32_t i;
|
|
const wint_t *cp;
|
|
wint_t ch;
|
|
|
|
ch = *(*cpp)++;
|
|
i = __collidx_table_lookup ((const char *) table, ch);
|
|
|
|
if (i >= 0)
|
|
/* This is an index into the weight table. Cool. */
|
|
return i;
|
|
|
|
/* Oh well, more than one sequence starting with this byte.
|
|
Search for the correct one. */
|
|
cp = &extra[-i];
|
|
while (1)
|
|
{
|
|
size_t nhere;
|
|
const wint_t *usrc = *cpp;
|
|
|
|
/* The first thing is the index. */
|
|
i = *cp++;
|
|
|
|
/* Next is the length of the byte sequence. These are always
|
|
short byte sequences so there is no reason to call any
|
|
function (even if they are inlined). */
|
|
nhere = *cp++;
|
|
|
|
if (i >= 0)
|
|
{
|
|
/* It is a single character. If it matches we found our
|
|
index. Note that at the end of each list there is an
|
|
entry of length zero which represents the single byte
|
|
sequence. The first (and here only) byte was tested
|
|
already. */
|
|
size_t cnt;
|
|
|
|
for (cnt = 0; cnt < nhere; ++cnt)
|
|
if (cp[cnt] != usrc[cnt])
|
|
break;
|
|
|
|
if (cnt == nhere)
|
|
{
|
|
/* Found it. */
|
|
*cpp += nhere;
|
|
return i;
|
|
}
|
|
|
|
/* Up to the next entry. */
|
|
cp += nhere;
|
|
}
|
|
else
|
|
{
|
|
/* This is a range of characters. First decide whether the
|
|
current byte sequence lies in the range. */
|
|
size_t cnt;
|
|
size_t offset;
|
|
|
|
for (cnt = 0; cnt < nhere - 1; ++cnt)
|
|
if (cp[cnt] != usrc[cnt])
|
|
break;
|
|
|
|
if (cnt < nhere - 1)
|
|
{
|
|
cp += 2 * nhere;
|
|
continue;
|
|
}
|
|
|
|
if (cp[nhere - 1] > usrc[nhere -1])
|
|
{
|
|
cp += 2 * nhere;
|
|
continue;
|
|
}
|
|
|
|
if (cp[2 * nhere - 1] < usrc[nhere -1])
|
|
{
|
|
cp += 2 * nhere;
|
|
continue;
|
|
}
|
|
|
|
/* This range matches the next characters. Now find
|
|
the offset in the indirect table. */
|
|
offset = usrc[nhere - 1] - cp[nhere - 1];
|
|
*cpp += nhere;
|
|
|
|
return indirect[-i + offset];
|
|
}
|
|
}
|
|
|
|
/* NOTREACHED */
|
|
return 0x43219876;
|
|
}
|