[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
remove no-longer-needed forward decls from regcomp.c
From: |
Paul Eggert |
Subject: |
remove no-longer-needed forward decls from regcomp.c |
Date: |
Sat, 20 Aug 2005 17:31:20 -0700 |
User-agent: |
Gnus/5.1007 (Gnus v5.10.7) Emacs/21.4 (gnu/linux) |
I installed this and filed glibc bug 1224.
2005-08-20 Paul Eggert <address@hidden>
* srclist.txt: Add glibc bug 1224.
* lib/regcomp.c:
(init_word_char, create_initial_state, duplicate_node_closure):
(fetch_token, peek_token_bracket, build_range_exp):
(build_collating_symbol): Remove forward decls; no longer needed
now that we use prototypes.
--- config/srclist.txt 20 Aug 2005 22:26:51 -0000 1.74
+++ config/srclist.txt 21 Aug 2005 00:28:44 -0000
@@ -98,6 +98,7 @@ $LIBCSRC/stdlib/getsubopt.c lib gpl
# http://sources.redhat.com/bugzilla/show_bug.cgi?id=1217
# http://sources.redhat.com/bugzilla/show_bug.cgi?id=1220
# http://sources.redhat.com/bugzilla/show_bug.cgi?id=1223
+# http://sources.redhat.com/bugzilla/show_bug.cgi?id=1224
#$LIBCSRC/posix/regcomp.c lib gpl
#
$LIBCSRC/posix/regex.c lib gpl
--- lib/regcomp.c 20 Aug 2005 22:26:51 -0000 1.5
+++ lib/regcomp.c 21 Aug 2005 00:28:44 -0000
@@ -23,7 +23,6 @@ static void re_compile_fastmap_iter (reg
const re_dfastate_t *init_state,
char *fastmap);
static reg_errcode_t init_dfa (re_dfa_t *dfa, int pat_len);
-static void init_word_char (re_dfa_t *dfa);
#ifdef RE_ENABLE_I18N
static void free_charset (re_charset_t *cset);
#endif /* RE_ENABLE_I18N */
@@ -46,9 +45,6 @@ static bin_tree_t *lower_subexp (reg_err
static reg_errcode_t calc_first (void *extra, bin_tree_t *node);
static reg_errcode_t calc_next (void *extra, bin_tree_t *node);
static reg_errcode_t link_nfa_nodes (void *extra, bin_tree_t *node);
-static reg_errcode_t duplicate_node_closure (re_dfa_t *dfa, int top_org_node,
- int top_clone_node, int root_node,
- unsigned int constraint);
static int duplicate_node (re_dfa_t *dfa, int org_idx, unsigned int
constraint);
static int search_duplicated_node (re_dfa_t *dfa, int org_node,
unsigned int constraint);
@@ -58,12 +54,8 @@ static reg_errcode_t calc_eclosure_iter
static reg_errcode_t calc_inveclosure (re_dfa_t *dfa);
static int fetch_number (re_string_t *input, re_token_t *token,
reg_syntax_t syntax);
-static void fetch_token (re_token_t *result, re_string_t *input,
- reg_syntax_t syntax);
static int peek_token (re_token_t *token, re_string_t *input,
reg_syntax_t syntax);
-static int peek_token_bracket (re_token_t *token, re_string_t *input,
- reg_syntax_t syntax);
static bin_tree_t *parse (re_string_t *regexp, regex_t *preg,
reg_syntax_t syntax, reg_errcode_t *err);
static bin_tree_t *parse_reg_exp (re_string_t *regexp, regex_t *preg,
@@ -93,24 +85,6 @@ static reg_errcode_t parse_bracket_eleme
static reg_errcode_t parse_bracket_symbol (bracket_elem_t *elem,
re_string_t *regexp,
re_token_t *token);
-#ifndef _LIBC
-# ifdef RE_ENABLE_I18N
-static reg_errcode_t build_range_exp (re_bitset_ptr_t sbcset,
- re_charset_t *mbcset, int *range_alloc,
- bracket_elem_t *start_elem,
- bracket_elem_t *end_elem);
-static reg_errcode_t build_collating_symbol (re_bitset_ptr_t sbcset,
- re_charset_t *mbcset,
- int *coll_sym_alloc,
- const unsigned char *name);
-# else /* not RE_ENABLE_I18N */
-static reg_errcode_t build_range_exp (re_bitset_ptr_t sbcset,
- bracket_elem_t *start_elem,
- bracket_elem_t *end_elem);
-static reg_errcode_t build_collating_symbol (re_bitset_ptr_t sbcset,
- const unsigned char *name);
-# endif /* not RE_ENABLE_I18N */
-#endif /* not _LIBC */
#ifdef RE_ENABLE_I18N
static reg_errcode_t build_equiv_class (re_bitset_ptr_t sbcset,
re_charset_t *mbcset,
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- remove no-longer-needed forward decls from regcomp.c,
Paul Eggert <=