formatting cleanups

[deliverable/binutils-gdb.git] / gdb / regex.c

diff --git a/gdb/regex.c b/gdb/regex.c
index a4c9e26b5cb67f83185ab58dcc02fd9ef0d66d21..a945af5cbcf44a73f50e5fca092ce2f909196c36 100644 (file)
--- a/gdb/regex.c
+++ b/gdb/regex.c
@@ -32,13 +32,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #else  /* not emacs */
 
-#ifdef USG
-#ifndef BSTRING
 #define bcopy(s,d,n)   memcpy((d),(s),(n))
 #define bcmp(s1,s2,n)  memcmp((s1),(s2),(n))
 #define bzero(s,n)     memset((s),0,(n))
-#endif
-#endif
 
 /* Make alloca work the best possible way.  */
 #ifdef __GNUC__
@@ -122,6 +118,7 @@ static int obscure_syntax = 0;
 
 int
 re_set_syntax (syntax)
+     int syntax;
 {
   int ret;
 
@@ -177,7 +174,7 @@ re_set_syntax (syntax)
       pending_exact += c; \
   }
 
-static int store_jump (), insert_jump ();
+static void store_jump (), insert_jump ();
 
 char *
 re_compile_pattern (pattern, size, bufp)
@@ -659,7 +656,7 @@ re_compile_pattern (pattern, size, bufp)
 /* Store where `from' points a jump operation to jump to where `to' points.
   `opcode' is the opcode to store. */
 
-static int
+static void
 store_jump (from, opcode, to)
      char *from, *to;
      char opcode;
@@ -676,7 +673,7 @@ store_jump (from, opcode, to)
 
    If you call this function, you must zero out pending_exact.  */
 
-static int
+static void
 insert_jump (op, from, to, current_end)
      char op;
      char *from, *to, *current_end;
@@ -706,7 +703,7 @@ re_compile_fastmap (bufp)
   register char *fastmap = bufp->fastmap;
   register unsigned char *p = pattern;
   register unsigned char *pend = pattern + size;
-  register int j, k;
+  register int j;
   unsigned char *translate = (unsigned char *) bufp->translate;
 
   unsigned char *stackb[NFAILURES];