* src/LR0.c (allocate_itemsets): kernel_size contains ints, not

size_ts.

diff --git a/ChangeLog b/ChangeLog
index 9bca596c0ffd88515c4131d0f6cd9f1dd9b98aab..22be68e6aed77d5d920b08f9f809c473ae804ad3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2001-11-26  Akim Demaille  <akim@epita.fr>
+
+       * src/LR0.c (allocate_itemsets): kernel_size contains ints, not
+       size_ts.
+
+2001-11-26  Akim Demaille  <akim@epita.fr>
+
+       * src/complain.c, src/complain.h (error): Remove, provided by
+       lib/error.[ch].
+
 2001-11-26  Akim Demaille  <akim@epita.fr>
 
        * src/reader.c (read_declarations): Don't abort on tok_illegal,

diff --git a/src/LR0.c b/src/LR0.c
index d7edc283e8c1e7762c7508219eb0e5cec14bd42d..06ee51f6d3940e8cae26c63132a902306d60ecd2 100644 (file)
--- a/src/LR0.c
+++ b/src/LR0.c
@@ -94,7 +94,7 @@ allocate_itemsets (void)
     }
 
   shift_symbol = symbol_count;
-  kernel_size = XCALLOC (size_t, nsyms);
+  kernel_size = XCALLOC (int, nsyms);
 }
 
 

diff --git a/src/complain.c b/src/complain.c
index 620e726c30bae4cb13fef6b9e117b245894484c5..44dd3933597605734798f10ff1c3790c1829b028 100644 (file)
--- a/src/complain.c
+++ b/src/complain.c
@@ -1,5 +1,5 @@
 /* Declaration for error-reporting function for Bison.
-   Copyright 2000 Free Software Foundation, Inc.
+   Copyright 2000, 2001 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
@@ -248,62 +248,3 @@ fatal (message, va_alist)
   fflush (stderr);
   exit (1);
 }
-\f
-/*------------------------------------------------------------------.
-| A severe error has occurred, we cannot proceed. Exit with STATUS, |
-| and report the error message of the errno ERRNUM.                 |
-`------------------------------------------------------------------*/
-
-void
-#if defined VA_START && defined __STDC__
-error (int status, int errnum,
-       const char *message, ...)
-#else
-error (status, errnum, message, va_alist)
-     int status;
-     int errnum;
-     char *message;
-     va_dcl
-#endif
-{
-#ifdef VA_START
-  va_list args;
-#endif
-
-  fflush (stdout);
-  if (infile != NULL)
-    fprintf (stderr, "%s:%d: ", infile, lineno);
-  else
-    fprintf (stderr, "%s:", program_name);
-
-  fputs (_("fatal error: "), stderr);
-
-#ifdef VA_START
-  VA_START (args, message);
-  vfprintf (stderr, message, args);
-  va_end (args);
-#else
-  fprintf (stderr, message, a1, a2, a3, a4, a5, a6, a7, a8);
-#endif
-
-  if (errnum)
-    {
-#if defined HAVE_STRERROR_R || _LIBC
-      char errbuf[1024];
-# if HAVE_WORKING_STRERROR_R || _LIBC
-      fprintf (stderr, ": %s", __strerror_r (errnum, errbuf, sizeof errbuf));
-# else
-      /* Don't use __strerror_r's return value because on some systems
-        (at least DEC UNIX 4.0[A-D]) strerror_r returns `int'.  */
-      __strerror_r (errnum, errbuf, sizeof errbuf);
-      fprintf (stderr, ": %s", errbuf);
-# endif
-#else
-      fprintf (stderr, ": %s", strerror (errnum));
-#endif
-    }
-  putc ('\n', stderr);
-  fflush (stderr);
-  if (status)
-    exit (status);
-}

diff --git a/src/complain.h b/src/complain.h
index 6a973848b8bc46ff150de913a68d3ccbb27b7f8c..29d9f86980bc29080998c2702cf20520a4771c9e 100644 (file)
--- a/src/complain.h
+++ b/src/complain.h
@@ -1,5 +1,5 @@
 /* Declaration for error-reporting function for Bison.
-   Copyright 2000 Free Software Foundation, Inc.
+   Copyright 2000, 2001 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
@@ -40,18 +40,10 @@ extern void complain (const char *format, ...)
 extern void fatal (const char *format, ...)
      __attribute__ ((__format__ (__printf__, 1, 2)));
 
-/* Print a message with `fprintf (stderr, FORMAT, ...)';
-   if ERRNUM is nonzero, follow it with ": " and strerror (ERRNUM).
-   If STATUS is nonzero, terminate the program with `exit (STATUS)'.  */
-
-extern void error (int status, int errnum,
-                  const char *format, ...)
-     __attribute__ ((__format__ (__printf__, 3, 4)));
-
 #else
 void warn ();
 void complain ();
-void error ();
+void fatal ();
 #endif
 
 /* Position in the current input file. */