* configure.in: Remove alpha-dec-osf*, no longer necessary now that

[binutils.git] / gdb / regex.c

diff --git a/gdb/regex.c b/gdb/regex.c
index 45c34780f6c21a76be9c60d173a5c1f72bdc89da..75bf4e9fc2345ccabc3d9c8798a6028e09ee11b7 100644 (file)
--- a/gdb/regex.c
+++ b/gdb/regex.c
@@ -1,25 +1,19 @@
 /* Extended regular expression matching and search library.
    Copyright (C) 1985, 1989 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 1, or (at your option)
-   any later version.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
 
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-
-   In other words, you are welcome to use, share and improve this program.
-   You are forbidden to forbid anyone else to use, share and improve
-   what you give them.   Help stamp out software-hoarding!  */
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
 
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 /* To test, compile with -Dtest.
  This Dtestable feature turns this into a self-contained program
@@ -38,14 +32,6 @@
 
 #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__
 #define alloca __builtin_alloca
@@ -82,7 +68,7 @@ init_syntax_once ()
    if (done)
      return;
 
-   bzero (re_syntax_table, sizeof re_syntax_table);
+   memset (re_syntax_table, '\0', sizeof re_syntax_table);
 
    for (c = 'a'; c <= 'z'; c++)
      re_syntax_table[c] = Sword;
@@ -128,6 +114,7 @@ static int obscure_syntax = 0;
 
 int
 re_set_syntax (syntax)
+     int syntax;
 {
   int ret;
 
@@ -183,7 +170,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)
@@ -417,7 +404,7 @@ re_compile_pattern (pattern, size, bufp)
 
          PATPUSH ((1 << BYTEWIDTH) / BYTEWIDTH);
          /* Clear the whole map */
-         bzero (b, (1 << BYTEWIDTH) / BYTEWIDTH);
+         memset (b, '\0', (1 << BYTEWIDTH) / BYTEWIDTH);
          /* Read in characters and ranges, setting map bits */
          while (1)
            {
@@ -665,7 +652,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;
@@ -682,7 +669,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;
@@ -712,13 +699,13 @@ 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];
   unsigned char **stackp = stackb;
 
-  bzero (fastmap, (1 << BYTEWIDTH));
+  memset (fastmap, '\0', (1 << BYTEWIDTH));
   bufp->fastmap_accurate = 1;
   bufp->can_be_null = 0;
       
@@ -1021,7 +1008,7 @@ re_match (pbufp, string, size, pos, regs)
 
 int re_max_failures = 2000;
 
-static int bcmp_translate();
+static int memcmp_translate();
 /* Match the pattern described by PBUFP
    against data which is the virtual concatenation of STRING1 and STRING2.
    SIZE1 and SIZE2 are the sizes of the two data strings.
@@ -1229,7 +1216,7 @@ re_match_2 (pbufp, string1, size1, string2, size2, pos, regs, mstop)
                if (mcnt > dend2 - d2)
                  mcnt = dend2 - d2;
                /* Compare that many; failure if mismatch, else skip them. */
-               if (translate ? bcmp_translate (d, d2, mcnt, translate) : bcmp (d, d2, mcnt))
+               if (translate ? memcmp_translate (d, d2, mcnt, translate) : memcmp (d, d2, mcnt))
                  goto fail;
                d += mcnt, d2 += mcnt;
              }
@@ -1306,7 +1293,7 @@ re_match_2 (pbufp, string1, size1, string2, size2, pos, regs, mstop)
                return -2;
              stackx = (unsigned char **) alloca (2 * (stacke - stackb)
                                         * sizeof (char *));
-             bcopy (stackb, stackx, (stacke - stackb) * sizeof (char *));
+             memcpy (stackx, stackb, (stacke - stackb) * sizeof (char *));
              stackp = stackx + (stackp - stackb);
              stacke = stackx + 2 * (stacke - stackb);
              stackb = stackx;
@@ -1386,7 +1373,7 @@ re_match_2 (pbufp, string1, size1, string2, size2, pos, regs, mstop)
              unsigned char **stackx
                = (unsigned char **) alloca (2 * (stacke - stackb)
                                             * sizeof (char *));
-             bcopy (stackb, stackx, (stacke - stackb) * sizeof (char *));
+             memcpy (stackx, stackb, (stacke - stackb) * sizeof (char *));
              stackp = stackx + (stackp - stackb);
              stacke = stackx + 2 * (stacke - stackb);
              stackb = stackx;
@@ -1547,7 +1534,7 @@ re_match_2 (pbufp, string1, size1, string2, size2, pos, regs, mstop)
 }
 
 static int
-bcmp_translate (s1, s2, len, translate)
+memcmp_translate (s1, s2, len, translate)
      unsigned char *s1, *s2;
      register int len;
      unsigned char *translate;