* src/conflicts.c (finalize_conflicts): Rename as...

(free_conflicts): this.

diff --git a/ChangeLog b/ChangeLog
index 3f24b1ffafd7cc6644df215cedd31297e0fd305e..d72d0747cc6c291971401dbdb50125e788294757 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-09-22  Akim Demaille  <akim@epita.fr>
+
+       * src/conflicts.c (finalize_conflicts): Rename as...
+       (free_conflicts): this.
+

 2001-09-22  Akim Demaille  <akim@epita.fr>
 
        * src/gram.c (gram_free): Rename back as...
 2001-09-22  Akim Demaille  <akim@epita.fr>
 
        * src/gram.c (gram_free): Rename back as...

diff --git a/src/conflicts.c b/src/conflicts.c
index 208f791004816bc516c6944d98c8b084c34f2a3f..48d679b7d075694701c84d69d97584cf157f0b3d 100644 (file)
--- a/src/conflicts.c
+++ b/src/conflicts.c
@@ -738,7 +738,7 @@ print_reductions (int state)
 
 
 void
 
 
 void

-finalize_conflicts (void)
+free_conflicts (void)

 {
   XFREE (conflicts);
   XFREE (shiftset);
 {
   XFREE (conflicts);
   XFREE (shiftset);

diff --git a/src/conflicts.h b/src/conflicts.h
index 38e3c8d51010310a42c75ae7e02b39db2024118b..205e42f520fe13a597e4dbba50531213ad12db1c 100644 (file)
--- a/src/conflicts.h
+++ b/src/conflicts.h
@@ -25,7 +25,7 @@
 void initialize_conflicts PARAMS ((void));
 void print_conflicts PARAMS ((void));
 void print_reductions PARAMS ((int));
 void initialize_conflicts PARAMS ((void));
 void print_conflicts PARAMS ((void));
 void print_reductions PARAMS ((int));

-void finalize_conflicts PARAMS ((void));
+void free_conflicts PARAMS ((void));

 
 /* Were there conflicts? */
 extern int any_conflicts;
 
 /* Were there conflicts? */
 extern int any_conflicts;

diff --git a/src/main.c b/src/main.c
index fb62ff2d2b0aeb73fe0e04f58a5e74dbb82bfa82..0e710920a2a73fdb5718b1485ca74d7b4a30abed 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -90,7 +90,7 @@ main (int argc, char *argv[])
   /* Output the tables and the parser to ftable.  In file output.  */
   output ();
 
   /* Output the tables and the parser to ftable.  In file output.  */
   output ();
 

-  finalize_conflicts ();
+  free_conflicts ();

   free_nullable ();
   free_derives ();
 
   free_nullable ();
   free_derives ();