Fri Jan 10 11:29:24 2014 UTC ()

Use format strings.


(joerg)

diff -r1.1.1.3 -r1.2 src/gnu/dist/groff/src/devices/grohtml/post-html.cpp
diff -r1.2 -r1.3 src/gnu/dist/groff/src/roff/troff/node.cpp

--- src/gnu/dist/groff/src/devices/grohtml/Attic/post-html.cpp 2006/02/06 18:14:50	1.1.1.3
+++ src/gnu/dist/groff/src/devices/grohtml/Attic/post-html.cpp 2014/01/10 11:29:24	1.2

 @@ -1,14 +1,14 @@
-/*	$NetBSD: post-html.cpp,v 1.1.1.3 2006/02/06 18:14:50 wiz Exp $	*/
+/*	$NetBSD: post-html.cpp,v 1.2 2014/01/10 11:29:24 joerg Exp $	*/
 // -*- C++ -*-
 /* Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005
  * Free Software Foundation, Inc.
+ *
  *  Gaius Mulley (gaius@glam.ac.uk) wrote post-html.cpp
  *  but it owes a huge amount of ideas and raw code from
  *  James Clark (jjc@jclark.com) grops/ps.cpp.
  */
 /*
 This file is part of groff.
 @@ -1579,27 +1579,27 @@ void header_desc::write_headings (FILE *
       do {
 	g = headers.get_data();
 	fputs("<a href=\"", f);
 	if (multiple_files && (! header_filename.is_empty())) {
 	  text_glob *fn = header_filename.get_data();
 	  fputs(fn->text_string, f);
+	}
 	fputs("#", f);
 	if (simple_anchors) {
 	  string buffer(ANCHOR_TEMPLATE);
 	  buffer += as_string(h);
 	  buffer += '\0';
-	  fprintf(f, buffer.contents());
+	  fprintf(f, "%s", buffer.contents());
 	} else
 	  fputs(g->text_string, f);
 	h++;
 	fputs("\">", f);
 	fputs(g->text_string, f);
         fputs("</a><br>\n", f);
 	headers.move_right();
 	if (multiple_files && (! header_filename.is_empty()))
 	  header_filename.move_right();
       } while (! headers.is_equal_to_head());
       fputs("\n", f);
+    }
+  }

--- src/gnu/dist/groff/src/roff/troff/Attic/node.cpp 2012/01/06 15:16:03	1.2
+++ src/gnu/dist/groff/src/roff/troff/Attic/node.cpp 2014/01/10 11:29:24	1.3

 @@ -1,14 +1,14 @@
-/*	$NetBSD: node.cpp,v 1.2 2012/01/06 15:16:03 joerg Exp $	*/
+/*	$NetBSD: node.cpp,v 1.3 2014/01/10 11:29:24 joerg Exp $	*/
 // -*- C++ -*-
 /* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2001, 2002, 2003, 2004, 2005
    Free Software Foundation, Inc.
      Written by James Clark (jjc@jclark.com)
 This file is part of groff.
 groff is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
 Software Foundation; either version 2, or (at your option) any later
 version.
 @@ -2149,27 +2149,27 @@ void glyph_node::ascii_print(ascii_outpu
   if (c != 0)
     ascii->outc(c);
   else
     ascii->outs(ci->nm.contents());
+}
 void glyph_node::debug_node()
+{
   unsigned char c = ci->get_ascii_code();
   fprintf(stderr, "{ %s [", type());
   if (c)
     fprintf(stderr, "%c", c);
   else
-    fprintf(stderr, ci->nm.contents());
+    fprintf(stderr, "%s", ci->nm.contents());
   if (push_state)
     fprintf(stderr, " <push_state>");
   if (state)
     state->display_state();
   fprintf(stderr, " nest level %d", div_nest_level);
   fprintf(stderr, "]}\n");
   fflush(stderr);
+}
 ligature_node::ligature_node(charinfo *c, tfont *t, color *gc, color *fc,
 			     node *gn1, node *gn2, statem *s,
 			     int pop, node *x)
 : glyph_node(c, t, gc, fc, s, pop, x), n1(gn1), n2(gn2)