* src/output.c (pack_vector): Use assert, not berror.

* src/main.c (berror): Remove, unused.

diff --git a/ChangeLog b/ChangeLog
index 752742b175aded89910efeab214771785050ac5c..da1a94c18fa7ac72dda7c67343f3793caae163db 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-12-05  Akim Demaille  <akim@epita.fr>
+
+       * src/output.c (pack_vector): Use assert, not berror.
+       * src/main.c (berror): Remove, unused.
+
 2001-12-05  Akim Demaille  <akim@epita.fr>
 
        New experimental feature: if --verbose --trace output all the

diff --git a/src/main.c b/src/main.c
index 76caf7a0242b58b0e6c4d360b26aa609d0001f75..1a3911d2ce63f3de91bedc43287e889ee51a382c 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -41,8 +41,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[])
 {
@@ -126,12 +124,3 @@ main (int argc, char *argv[])
 
   return complain_message_count ? EXIT_FAILURE : EXIT_SUCCESS;
 }
-\f
-/* 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 ();
-}

diff --git a/src/output.c b/src/output.c
index c8bd5fc635be60e475643ceeaa8dbb033fa55f4f..fa01bbd8c459092172f4fe460ffaf5072f8bce59 100644 (file)
--- a/src/output.c
+++ b/src/output.c
@@ -104,7 +104,6 @@
 #include "conflicts.h"
 #include "muscle_tab.h"
 
-extern void berror PARAMS((const char *));
 
 static int nvectors;
 static int nentries;
@@ -789,8 +788,8 @@ pack_vector (int vector)
        }
     }
 
-  berror ("pack_vector");
-  return 0;                    /* JF keep lint happy */
+  assert (!"pack_vector");
+  return 0;
 }
 
 
@@ -988,7 +987,7 @@ output_master_parser (void)
       else
        skeleton = skeleton_find ("BISON_SIMPLE", BISON_SIMPLE);
     }
-  muscle_insert ("skeleton", skeleton);    
+  muscle_insert ("skeleton", skeleton);
   output_parser (skeleton, &table_obstack);
 }