diff options
author | Ulrich Drepper <drepper@redhat.com> | 2003-06-13 21:05:42 +0000 |
---|---|---|
committer | Ulrich Drepper <drepper@redhat.com> | 2003-06-13 21:05:42 +0000 |
commit | 2533775393adba65535482cf3a6277774231677d (patch) | |
tree | 136df37bbdf4b2793575e4853fa0ce3521ada388 /posix/regexec.c | |
parent | 309695129a603c3dd0541d1dc542b83d30445c84 (diff) | |
download | glibc-2533775393adba65535482cf3a6277774231677d.zip glibc-2533775393adba65535482cf3a6277774231677d.tar.gz glibc-2533775393adba65535482cf3a6277774231677d.tar.bz2 |
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 'posix/regexec.c')
-rw-r--r-- | posix/regexec.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/posix/regexec.c b/posix/regexec.c index 9ade27a..277c935 100644 --- a/posix/regexec.c +++ b/posix/regexec.c @@ -50,10 +50,10 @@ static int re_search_stub (struct re_pattern_buffer *bufp, int ret_len); static unsigned re_copy_regs (struct re_registers *regs, regmatch_t *pmatch, int nregs, int regs_allocated); -static inline re_dfastate_t *acquire_init_state_context (reg_errcode_t *err, - const regex_t *preg, - const re_match_context_t *mctx, - int idx); +static re_dfastate_t *acquire_init_state_context (reg_errcode_t *err, + const regex_t *preg, + const re_match_context_t *mctx, + int idx); static reg_errcode_t prune_impossible_nodes (const regex_t *preg, re_match_context_t *mctx); static int check_matching (const regex_t *preg, re_match_context_t *mctx, @@ -906,7 +906,7 @@ prune_impossible_nodes (preg, mctx) We must select appropriate initial state depending on the context, since initial states may have constraints like "\<", "^", etc.. */ -static inline re_dfastate_t * +static re_dfastate_t * acquire_init_state_context (err, preg, mctx, idx) reg_errcode_t *err; const regex_t *preg; @@ -1507,7 +1507,7 @@ sift_states_backward (preg, mctx, sctx) /* Helper functions. */ -static inline reg_errcode_t +static reg_errcode_t clean_state_log_if_need (mctx, next_state_log_idx) re_match_context_t *mctx; int next_state_log_idx; @@ -3528,7 +3528,7 @@ check_node_accept_bytes (preg, node_idx, input, str_idx) if (elem_len <= char_len) { collseqwc = _NL_CURRENT (LC_COLLATE, _NL_COLLATE_COLLSEQWC); - in_collseq = collseq_table_lookup (collseqwc, wc); + in_collseq = __collseq_table_lookup (collseqwc, wc); } else in_collseq = find_collation_sequence_value (pin, elem_len); |