* lib/regcomp.c (re_comp) [defined _REGEX_RE_COMP || defined _LIBC]:

(seek_collating_symbol_entry) [defined _LIBC]:
(lookup_collation_sequence_value) [defined _LIBC]:
(build_range_exp, build_collating_symbol) [defined _LIBC]:
Use prototypes rather than old-style function definitions.
* lib/regexec.c (re_exec) [defined _REGEX_RE_COMP || defined _LIBC]:
(transit_state_sb) [0]:
(find_collation_sequence_value) [defined _LIBC]: Likewise.
* config/srclist.txt: Add glibc bug 1280.

diff --git a/config/ChangeLog b/config/ChangeLog
index 8a6bb3f9f3025adcc56a79fb2bebaa7390d0da98..1834fab3b5be7e042436bf77c1b44a6a01f8a0b3 100644 (file)
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,6 +1,6 @@
 2005-08-31  Paul Eggert  <eggert@cs.ucla.edu>
 
-       * srclist.txt: Add glibc bug 1273, 1277, 1278.
+       * srclist.txt: Add glibc bugs 1273, 1278-1280.
 
 2005-08-25  Paul Eggert  <eggert@cs.ucla.edu>
 

diff --git a/config/srclist.txt b/config/srclist.txt
index 8a410d9100e600a3c2d41d6a461f667dca5a2257..12aa016029a36c7a256dd9c0aa03a8383a4054b0 100644 (file)
--- a/config/srclist.txt
+++ b/config/srclist.txt
@@ -1,4 +1,4 @@
-# $Id: srclist.txt,v 1.91 2005-08-31 19:55:29 eggert Exp $
+# $Id: srclist.txt,v 1.92 2005-08-31 20:27:56 eggert Exp $
 # Files for which we are not the source.  See ./srclistvars.sh for the
 # variable definitions.
 
@@ -104,6 +104,7 @@ $LIBCSRC/stdlib/getsubopt.c         lib gpl
 # http://sources.redhat.com/bugzilla/show_bug.cgi?id=1241
 # http://sources.redhat.com/bugzilla/show_bug.cgi?id=1273
 # http://sources.redhat.com/bugzilla/show_bug.cgi?id=1278
+# http://sources.redhat.com/bugzilla/show_bug.cgi?id=1280
 #$LIBCSRC/posix/regcomp.c              lib gpl
 #
 # http://sources.redhat.com/bugzilla/show_bug.cgi?id=1238
@@ -148,6 +149,7 @@ $LIBCSRC/stdlib/getsubopt.c         lib gpl
 # http://sources.redhat.com/bugzilla/show_bug.cgi?id=1245
 # http://sources.redhat.com/bugzilla/show_bug.cgi?id=1278
 # http://sources.redhat.com/bugzilla/show_bug.cgi?id=1279
+# http://sources.redhat.com/bugzilla/show_bug.cgi?id=1280
 #$LIBCSRC/posix/regexec.c              lib gpl
 #
 # c89 changes $LIBCSRC/string/strdup.c         lib gpl

diff --git a/lib/ChangeLog b/lib/ChangeLog
index bc743978ca665e19b4e2cd0c0e8ef4169ac76e43..f886b7ecdf230c3ea65ed9b357f3f36c96a22dc0 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,5 +1,14 @@
 2005-08-31  Paul Eggert  <eggert@cs.ucla.edu>
 
+       * regcomp.c (re_comp) [defined _REGEX_RE_COMP || defined _LIBC]:
+       (seek_collating_symbol_entry) [defined _LIBC]:
+       (lookup_collation_sequence_value) [defined _LIBC]:
+       (build_range_exp, build_collating_symbol) [defined _LIBC]:
+       Use prototypes rather than old-style function definitions.
+       * regexec.c (re_exec) [defined _REGEX_RE_COMP || defined _LIBC]:
+       (transit_state_sb) [0]:
+       (find_collation_sequence_value) [defined _LIBC]: Likewise.
+
        * regexec.c (re_search_internal): Simplify update of rm_so and
        rm_eo.
 

diff --git a/lib/regcomp.c b/lib/regcomp.c
index 76defc2495f019b5baa10504d586001cc7e3c7a8..a121a75fbdd67219aba5e6787ca29707c00f4a4b 100644 (file)
--- a/lib/regcomp.c
+++ b/lib/regcomp.c
@@ -639,8 +639,7 @@ char *
    regcomp/regexec above without link errors.  */
 weak_function
 # endif
-re_comp (s)
-     const char *s;
+re_comp (const char *s)
 {
   reg_errcode_t ret;
   char *fastmap;
@@ -2692,9 +2691,7 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token,
 
   auto inline int32_t
   __attribute ((always_inline))
-  seek_collating_symbol_entry (name, name_len)
-        const unsigned char *name;
-        size_t name_len;
+  seek_collating_symbol_entry (const unsigned char *name, size_t name_len)
     {
       int32_t hash = elem_hash ((const char *) name, name_len);
       int32_t elem = hash % table_size;
@@ -2725,8 +2722,7 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token,
 
   auto inline unsigned int
   __attribute ((always_inline))
-  lookup_collation_sequence_value (br_elem)
-        bracket_elem_t *br_elem;
+  lookup_collation_sequence_value (bracket_elem_t *br_elem)
     {
       if (br_elem->type == SB_CHAR)
        {
@@ -2793,11 +2789,9 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token,
 
   auto inline reg_errcode_t
   __attribute ((always_inline))
-  build_range_exp (sbcset, mbcset, range_alloc, start_elem, end_elem)
-        re_charset_t *mbcset;
-        int *range_alloc;
-        re_bitset_ptr_t sbcset;
-        bracket_elem_t *start_elem, *end_elem;
+  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)
     {
       unsigned int ch;
       uint32_t start_collseq;
@@ -2876,11 +2870,8 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token,
 
   auto inline reg_errcode_t
   __attribute ((always_inline))
-  build_collating_symbol (sbcset, mbcset, coll_sym_alloc, name)
-        re_charset_t *mbcset;
-        int *coll_sym_alloc;
-        re_bitset_ptr_t sbcset;
-        const unsigned char *name;
+  build_collating_symbol (re_bitset_ptr_t sbcset, re_charset_t *mbcset,
+                         int *coll_sym_alloc, const unsigned char *name)
     {
       int32_t elem, idx;
       size_t name_len = strlen ((const char *) name);

diff --git a/lib/regexec.c b/lib/regexec.c
index eba36c2758249c5ec8ea42be82e7f68b8d29c1a0..0767e6dfd9b0febc50cbc48476ba782297fa69af 100644 (file)
--- a/lib/regexec.c
+++ b/lib/regexec.c
@@ -558,8 +558,7 @@ int
 # ifdef _LIBC
 weak_function
 # endif
-re_exec (s)
-     const char *s;
+re_exec (const char *s)
 {
   return 0 == regexec (&re_comp_buf, s, 0, NULL, 0);
 }
@@ -2395,10 +2394,8 @@ check_subexp_matching_top (re_match_context_t *mctx, re_node_set *cur_nodes,
    accepting the current input byte.  */
 
 static re_dfastate_t *
-transit_state_sb (err, mctx, state)
-     reg_errcode_t *err;
-     re_match_context_t *mctx;
-     re_dfastate_t *state;
+transit_state_sb (reg_errcode_t *err, re_match_context_t *mctx,
+                 re_dfastate_t *state)
 {
   re_dfa_t *const dfa = mctx->dfa;
   re_node_set next_nodes;
@@ -3886,9 +3883,7 @@ check_node_accept_bytes (re_dfa_t *dfa, int node_idx,
 
 # ifdef _LIBC
 static unsigned int
-find_collation_sequence_value (mbs, mbs_len)
-    const unsigned char *mbs;
-    size_t mbs_len;
+find_collation_sequence_value (const unsigned char *mbs, size_t mbs_len)
 {
   uint32_t nrules = _NL_CURRENT_WORD (LC_COLLATE, _NL_COLLATE_NRULES);
   if (nrules == 0)