32-fyi-berror.patch

[Akim Demaille]

Index: ChangeLog
from  Akim Demaille  <address@hidden>
        
        * src/output.c (pack_vector): Use assert, not berror.
        * src/main.c (berror): Remove, unused.
        
Index: src/main.c
--- src/main.c Thu, 29 Nov 2001 22:30:19 +0100 akim
+++ src/main.c Tue, 04 Dec 2001 13:50:36 +0100 akim
@@ -1,5 +1,5 @@
 /* Top level entry point of bison,
-   Copyright 1984, 1986, 1989, 1992, 1995, 2000
+   Copyright 1984, 1986, 1989, 1992, 1995, 2000, 2001
    Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
@@ -40,7 +40,6 @@
 /* The name this program was run with, for messages.  */
 char *program_name;
 
-extern void berror PARAMS((const char *));
 
 int
 main (int argc, char *argv[])
@@ -123,13 +122,4 @@
 #endif
 
   return complain_message_count ? EXIT_FAILURE : EXIT_SUCCESS;
-}
-
-/* Abort for an internal error denoted by string S.  */
-
-void
-berror (const char *s)
-{
-  fprintf (stderr, _("%s: internal error: %s\n"), program_name, s);
-  abort ();
 }
Index: src/output.c
--- src/output.c Sat, 01 Dec 2001 20:25:51 +0100 akim
+++ src/output.c Tue, 04 Dec 2001 13:50:18 +0100 akim
@@ -103,9 +103,6 @@
 #include "reader.h"
 #include "conflicts.h"
 
-extern void berror PARAMS((const char *));
-
-
 
 static int nvectors;
 static int nentries;
@@ -980,8 +977,8 @@
        }
     }
 
-  berror ("pack_vector");
-  return 0;                    /* JF keep lint happy */
+  assert (!"pack_vector");
+  return 0;
 }