[prev in list] [next in list] [prev in thread] [next in thread] 

List:       gnulib-bug
Subject:    function prototypes in non-gnulib regex code
From:       Paul Eggert <eggert () CS ! UCLA ! EDU>
Date:       2005-08-31 20:28:47
Message-ID: 87mzmxn94w.fsf () penguin ! cs ! ucla ! edu
[Download RAW message or body]

I installed this and filed glibc bug 1280:

2005-08-31  Paul Eggert  <eggert@cs.ucla.edu>

	* 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.

--- lib/regcomp.c	31 Aug 2005 19:38:13 -0000	1.11
+++ lib/regcomp.c	31 Aug 2005 20:05:30 -0000
@@ -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, 
 
   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, 
 
   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, 
 
   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, 
 
   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);
--- lib/regexec.c	31 Aug 2005 19:55:30 -0000	1.11
+++ lib/regexec.c	31 Aug 2005 20:05:30 -0000
@@ -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_cont
    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, 
 
 # 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)
--- config/srclist.txt.~1.91.~	2005-08-31 12:55:29.000000000 -0700
+++ config/srclist.txt	2005-08-31 13:24:32.000000000 -0700
@@ -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



[prev in list] [next in list] [prev in thread] [next in thread]