Revert "introduced a GCC-like -Werror=type"

[bison.git] / src / print_graph.c

diff --git a/src/print_graph.c b/src/print_graph.c
index 68d7eb015f9e504bfd92a813dbe9ede2c841baaf..4847c4cc7224b0faefdef47c547ec60bd59b5840 100644 (file)
--- a/src/print_graph.c
+++ b/src/print_graph.c
@@ -20,8 +20,6 @@
 #include <config.h>
 #include "system.h"
 
-#include <quotearg.h>
-
 #include "LR0.h"
 #include "closure.h"
 #include "complain.h"
@@ -56,7 +54,7 @@ print_core (struct obstack *oout, state *s)
       snritems = nitemset;
     }
 
-  obstack_fgrow1 (oout, "%d", s->number);
+  obstack_printf (oout, "%d", s->number);
   for (i = 0; i < snritems; i++)
     {
       item_number *sp;
@@ -70,15 +68,15 @@ print_core (struct obstack *oout, state *s)
 
       r = item_number_as_rule_number (*sp);
 
-      obstack_fgrow1 (oout, "\n%s -> ", rules[r].lhs->tag);
+      obstack_printf (oout, "\n%s -> ", rules[r].lhs->tag);
 
       for (sp = rules[r].rhs; sp < sp1; sp++)
-        obstack_fgrow1 (oout, "%s ", symbols[*sp]->tag);
+        obstack_printf (oout, "%s ", symbols[*sp]->tag);
 
       obstack_1grow (oout, '.');
 
       for (/* Nothing */; *sp >= 0; ++sp)
-        obstack_fgrow1 (oout, " %s", symbols[*sp]->tag);
+        obstack_printf (oout, " %s", symbols[*sp]->tag);
 
       /* Experimental feature: display the lookahead tokens. */
       if (report_flag & report_lookahead_tokens
@@ -97,7 +95,7 @@ print_core (struct obstack *oout, state *s)
               obstack_sgrow (oout, "[");
               BITSET_FOR_EACH (biter, reds->lookahead_tokens[redno], k, 0)
                 {
-                  obstack_fgrow2 (oout, "%s%s", sep, symbols[k]->tag);
+                  obstack_printf (oout, "%s%s", sep, symbols[k]->tag);
                   sep = ", ";
                 }
               obstack_sgrow (oout, "]");
@@ -135,7 +133,7 @@ print_actions (state const *s, FILE *fgraph)
            : "dashed");
 
         if (TRANSITION_IS_ERROR (trans, i)
-            && strcmp (symbols[sym]->tag, "error") != 0)
+            && STRNEQ (symbols[sym]->tag, "error"))
           abort ();
         output_edge (s->number, s1->number,
                      TRANSITION_IS_ERROR (trans, i) ? NULL : symbols[sym]->tag,
@@ -157,8 +155,7 @@ print_state (state *s, FILE *fgraph)
   /* A node's label contains its items.  */
   obstack_init (&node_obstack);
   print_core (&node_obstack, s);
-  obstack_1grow (&node_obstack, '\0');
-  output_node (s->number, obstack_finish (&node_obstack), fgraph);
+  output_node (s->number, obstack_finish0 (&node_obstack), fgraph);
   obstack_free (&node_obstack, 0);
 
   /* Output the edges.  */