From: Paul Eggert Date: Tue, 23 Aug 2005 18:55:44 +0000 (+0000) Subject: * config/srclist.txt: Add glibc bug 1231. X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=576ad3853e771fde0041056dcdbffb6702db7dc0;p=pspp * config/srclist.txt: Add glibc bug 1231. * lib/regex_internal.c (re_string_skip_chars, register_state): (calc_state_hash): Remove forward decls; no longer needed now that we use prototypes. * lib/regexec.c (acquire_init_state_context, check_halt_node_context): (proceed_next_node, pop_fail_stack, sub_epsilon_src_nodes): (clean_state_log_if_needed): Likewise. --- diff --git a/config/ChangeLog b/config/ChangeLog index 8d48dd2c74..3bd132b488 100644 --- a/config/ChangeLog +++ b/config/ChangeLog @@ -1,3 +1,7 @@ +2005-08-23 Paul Eggert + + * srclist.txt: Add glibc bug 1231. + 2005-08-20 Paul Eggert * srclist.txt: Add glibc bugs 1220-1227. diff --git a/config/srclist.txt b/config/srclist.txt index 438e126d4b..d0668391b9 100644 --- a/config/srclist.txt +++ b/config/srclist.txt @@ -1,4 +1,4 @@ -# $Id: srclist.txt,v 1.78 2005-08-21 05:01:20 eggert Exp $ +# $Id: srclist.txt,v 1.79 2005-08-23 18:55:44 eggert Exp $ # Files for which we are not the source. See ./srclistvars.sh for the # variable definitions. @@ -112,6 +112,7 @@ $LIBCSRC/posix/regex.c lib gpl # http://sources.redhat.com/bugzilla/show_bug.cgi?id=1218 # http://sources.redhat.com/bugzilla/show_bug.cgi?id=1220 # http://sources.redhat.com/bugzilla/show_bug.cgi?id=1226 +# http://sources.redhat.com/bugzilla/show_bug.cgi?id=1231 #$LIBCSRC/posix/regex_internal.c lib gpl # # http://sources.redhat.com/bugzilla/show_bug.cgi?id=1054 @@ -122,6 +123,7 @@ $LIBCSRC/posix/regex.c lib gpl # http://sources.redhat.com/bugzilla/show_bug.cgi?id=1220 # http://sources.redhat.com/bugzilla/show_bug.cgi?id=1225 # http://sources.redhat.com/bugzilla/show_bug.cgi?id=1227 +# http://sources.redhat.com/bugzilla/show_bug.cgi?id=1231 #$LIBCSRC/posix/regexec.c lib gpl # # c89 changes $LIBCSRC/string/strdup.c lib gpl diff --git a/lib/ChangeLog b/lib/ChangeLog index d0a87cf3a5..36e00fb4b1 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,12 @@ +2005-08-23 Paul Eggert + + * regex_internal.c (re_string_skip_chars, register_state): + (calc_state_hash): + Remove forward decls; no longer needed now that we use prototypes. + * regexec.c (acquire_init_state_context, check_halt_node_context): + (proceed_next_node, pop_fail_stack, sub_epsilon_src_nodes): + (clean_state_log_if_needed): Likewise. + 2005-08-20 Paul Eggert Fix problems reported by Sam Steingold in diff --git a/lib/regex_internal.c b/lib/regex_internal.c index 46fe046e48..385de6ffc2 100644 --- a/lib/regex_internal.c +++ b/lib/regex_internal.c @@ -21,12 +21,6 @@ static void re_string_construct_common (const char *str, int len, re_string_t *pstr, RE_TRANSLATE_TYPE trans, int icase, const re_dfa_t *dfa) internal_function; -#ifdef RE_ENABLE_I18N -static int re_string_skip_chars (re_string_t *pstr, int new_raw_idx, - wint_t *last_wc) internal_function; -#endif /* RE_ENABLE_I18N */ -static reg_errcode_t register_state (re_dfa_t *dfa, re_dfastate_t *newstate, - unsigned int hash) internal_function; static re_dfastate_t *create_ci_newstate (re_dfa_t *dfa, const re_node_set *nodes, unsigned int hash) internal_function; @@ -34,8 +28,6 @@ static re_dfastate_t *create_cd_newstate (re_dfa_t *dfa, const re_node_set *nodes, unsigned int context, unsigned int hash) internal_function; -static inline unsigned int calc_state_hash (const re_node_set *nodes, - unsigned int context) internal_function; /* Functions for string operation. */ diff --git a/lib/regexec.c b/lib/regexec.c index 4f6c50c898..969d6b1b55 100644 --- a/lib/regexec.c +++ b/lib/regexec.c @@ -51,32 +51,21 @@ static int re_search_stub (struct re_pattern_buffer *bufp, int ret_len) internal_function; static unsigned re_copy_regs (struct re_registers *regs, regmatch_t *pmatch, int nregs, int regs_allocated) internal_function; -static inline re_dfastate_t *acquire_init_state_context - (reg_errcode_t *err, const re_match_context_t *mctx, int idx) - __attribute ((always_inline)) internal_function; static reg_errcode_t prune_impossible_nodes (re_match_context_t *mctx) internal_function; static int check_matching (re_match_context_t *mctx, int fl_longest_match, int *p_match_first) internal_function; -static int check_halt_node_context (const re_dfa_t *dfa, int node, - unsigned int context) internal_function; static int check_halt_state_context (const re_match_context_t *mctx, const re_dfastate_t *state, int idx) internal_function; static void update_regs (re_dfa_t *dfa, regmatch_t *pmatch, regmatch_t *prev_idx_match, int cur_node, int cur_idx, int nmatch) internal_function; -static int proceed_next_node (const re_match_context_t *mctx, - int nregs, regmatch_t *regs, - int *pidx, int node, re_node_set *eps_via_nodes, - struct re_fail_stack_t *fs) internal_function; static reg_errcode_t push_fail_stack (struct re_fail_stack_t *fs, int str_idx, int dest_node, int nregs, regmatch_t *regs, re_node_set *eps_via_nodes) internal_function; -static int pop_fail_stack (struct re_fail_stack_t *fs, int *pidx, int nregs, - regmatch_t *regs, re_node_set *eps_via_nodes) internal_function; static reg_errcode_t set_regs (const regex_t *preg, const re_match_context_t *mctx, size_t nmatch, regmatch_t *pmatch, @@ -100,9 +89,6 @@ static reg_errcode_t update_cur_sifted_state (re_match_context_t *mctx, static reg_errcode_t add_epsilon_src_nodes (re_dfa_t *dfa, re_node_set *dest_nodes, const re_node_set *candidates) internal_function; -static reg_errcode_t sub_epsilon_src_nodes (re_dfa_t *dfa, int node, - re_node_set *dest_nodes, - const re_node_set *and_nodes) internal_function; static int check_dst_limits (re_match_context_t *mctx, re_node_set *limits, int dst_node, int dst_idx, int src_node, int src_idx) internal_function; @@ -122,8 +108,6 @@ static reg_errcode_t check_subexp_limits (re_dfa_t *dfa, static reg_errcode_t sift_states_bkref (re_match_context_t *mctx, re_sift_context_t *sctx, int str_idx, const re_node_set *candidates) internal_function; -static reg_errcode_t clean_state_log_if_needed (re_match_context_t *mctx, - int next_state_log_idx) internal_function; static reg_errcode_t merge_state_array (re_dfa_t *dfa, re_dfastate_t **dst, re_dfastate_t **src, int num) internal_function; static re_dfastate_t *find_recover_state (reg_errcode_t *err, @@ -996,7 +980,7 @@ prune_impossible_nodes (re_match_context_t *mctx) since initial states may have constraints like "\<", "^", etc.. */ static inline re_dfastate_t * -internal_function +__attribute ((always_inline)) internal_function acquire_init_state_context (reg_errcode_t *err, const re_match_context_t *mctx, int idx) {