aboutsummaryrefslogtreecommitdiff
path: root/locale/coll-lookup.h
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2003-06-13 21:05:42 +0000
committerUlrich Drepper <drepper@redhat.com>2003-06-13 21:05:42 +0000
commit2533775393adba65535482cf3a6277774231677d (patch)
tree136df37bbdf4b2793575e4853fa0ce3521ada388 /locale/coll-lookup.h
parent309695129a603c3dd0541d1dc542b83d30445c84 (diff)
downloadglibc-2533775393adba65535482cf3a6277774231677d.tar
glibc-2533775393adba65535482cf3a6277774231677d.tar.gz
glibc-2533775393adba65535482cf3a6277774231677d.tar.bz2
glibc-2533775393adba65535482cf3a6277774231677d.zip
Update.
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>.
Diffstat (limited to 'locale/coll-lookup.h')
-rw-r--r--locale/coll-lookup.h83
1 files changed, 5 insertions, 78 deletions
diff --git a/locale/coll-lookup.h b/locale/coll-lookup.h
index 6a396fa878..3fe6bafb71 100644
--- a/locale/coll-lookup.h
+++ b/locale/coll-lookup.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 Free Software Foundation, Inc.
+/* Copyright (C) 2000, 2003 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Bruno Haible <haible@clisp.cons.org>, 2000.
@@ -17,85 +17,12 @@
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
-/* Word tables are accessed by cutting wc in three blocks of bits:
- - the high 32-q-p bits,
- - the next q bits,
- - the next p bits.
-
- +------------------+-----+-----+
- wc = + 32-q-p | q | p |
- +------------------+-----+-----+
-
- p and q are variable. For 16-bit Unicode it is sufficient to
- choose p and q such that q+p <= 16.
-
- The table contains the following uint32_t words:
- - q+p,
- - s = upper exclusive bound for wc >> (q+p),
- - p,
- - 2^q-1,
- - 2^p-1,
- - 1st-level table: s offsets, pointing into the 2nd-level table,
- - 2nd-level table: k*2^q offsets, pointing into the 3rd-level table,
- - 3rd-level table: j*2^p words, each containing 32 bits of data.
-*/
-
#include <stdint.h>
/* Lookup in a table of int32_t, with default value 0. */
-static inline int32_t
-collidx_table_lookup (const char *table, uint32_t wc)
-{
- uint32_t shift1 = ((const uint32_t *) table)[0];
- uint32_t index1 = wc >> shift1;
- uint32_t bound = ((const uint32_t *) table)[1];
- if (index1 < bound)
- {
- uint32_t lookup1 = ((const uint32_t *) table)[5 + index1];
- if (lookup1 != 0)
- {
- uint32_t shift2 = ((const uint32_t *) table)[2];
- uint32_t mask2 = ((const uint32_t *) table)[3];
- uint32_t index2 = (wc >> shift2) & mask2;
- uint32_t lookup2 = ((const uint32_t *)(table + lookup1))[index2];
- if (lookup2 != 0)
- {
- uint32_t mask3 = ((const uint32_t *) table)[4];
- uint32_t index3 = wc & mask3;
- int32_t lookup3 = ((const int32_t *)(table + lookup2))[index3];
-
- return lookup3;
- }
- }
- }
- return 0;
-}
+extern int32_t __collidx_table_lookup (const char *table, uint32_t wc)
+ internal_function;
/* Lookup in a table of uint32_t, with default value 0xffffffff. */
-static inline uint32_t
-collseq_table_lookup (const char *table, uint32_t wc)
-{
- uint32_t shift1 = ((const uint32_t *) table)[0];
- uint32_t index1 = wc >> shift1;
- uint32_t bound = ((const uint32_t *) table)[1];
- if (index1 < bound)
- {
- uint32_t lookup1 = ((const uint32_t *) table)[5 + index1];
- if (lookup1 != 0)
- {
- uint32_t shift2 = ((const uint32_t *) table)[2];
- uint32_t mask2 = ((const uint32_t *) table)[3];
- uint32_t index2 = (wc >> shift2) & mask2;
- uint32_t lookup2 = ((const uint32_t *)(table + lookup1))[index2];
- if (lookup2 != 0)
- {
- uint32_t mask3 = ((const uint32_t *) table)[4];
- uint32_t index3 = wc & mask3;
- uint32_t lookup3 = ((const uint32_t *)(table + lookup2))[index3];
-
- return lookup3;
- }
- }
- }
- return ~((uint32_t) 0);
-}
+extern uint32_t __collseq_table_lookup (const char *table, uint32_t wc)
+ internal_function;