PR c/5420:

[pf3gnuchains/gcc-fork.git] / gcc / varray.c

diff --git a/gcc/varray.c b/gcc/varray.c
index 8d65b18..eef2234 100644 (file)
--- a/gcc/varray.c
+++ b/gcc/varray.c
@@ -1,25 +1,26 @@
 /* Virtual array support.
-   Copyright (C) 1998 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
    Contributed by Cygnus Solutions.
 
-   This file is part of GNU CC.
+   This file is part of GCC.
 
-   GNU CC is free software; you can redistribute it and/or modify it
+   GCC 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, or (at your option)
    any later version.
 
-   GNU CC 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.
+   GCC 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 GNU CC; see the file COPYING.  If not, write to the Free
-   the Free Software Foundation, 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   along with GCC; see the file COPYING.  If not, write to the Free
+   the Free Software Foundation, 59 Temple Place - Suite 330, Boston,
+   MA 02111-1307, USA.  */
 
 #include "config.h"
+#include "errors.h"
 #include "system.h"
 #include "rtl.h"
 #include "tree.h"
@@ -40,8 +41,9 @@ varray_init (num_elements, element_size, name)
   varray_type ptr = (varray_type) xcalloc (VARRAY_HDR_SIZE + data_size, 1);
 
   ptr->num_elements = num_elements;
+  ptr->elements_used = 0;
   ptr->element_size = element_size;
-  ptr->name        = name;
+  ptr->name = name;
   return ptr;
 }
 
@@ -60,10 +62,10 @@ varray_grow (va, n)
       size_t old_data_size = old_elements * element_size;
       size_t data_size = n * element_size;
 
-      va = (varray_type) xrealloc ((char *)va, VARRAY_HDR_SIZE + data_size);
+      va = (varray_type) xrealloc ((char *) va, VARRAY_HDR_SIZE + data_size);
       va->num_elements = n;
       if (n > old_elements)
-       bzero (&va->data.c[old_data_size], data_size - old_data_size);
+       memset (&va->data.c[old_data_size], 0, data_size - old_data_size);
     }
 
   return va;
@@ -71,9 +73,9 @@ varray_grow (va, n)
 
 /* Check the bounds of a varray access.  */
 
-#if defined ENABLE_CHECKING && (__GNUC__ > 2 || __GNUC_MINOR__ > 6)
+#if defined ENABLE_CHECKING && (GCC_VERSION >= 2007)
 
-extern void error PVPROTO ((const char *, ...))        ATTRIBUTE_PRINTF_1;
+extern void error PARAMS ((const char *, ...)) ATTRIBUTE_PRINTF_1;
 
 void
 varray_check_failed (va, n, file, line, function)
@@ -83,9 +85,9 @@ varray_check_failed (va, n, file, line, function)
      int line;
      const char *function;
 {
-  error("Virtual array %s[%lu]: element %lu out of bounds",
-       va->name, (unsigned long) va->num_elements, (unsigned long) n);
-  fancy_abort (file, line, function);
+  internal_error ("virtual array %s[%lu]: element %lu out of bounds in %s, at %s:%d",
+                 va->name, (unsigned long) va->num_elements, (unsigned long) n,
+                 function, trim_filename (file), line);
 }
 
 #endif